From 4862c4147744875267e8c1676ea93ee1c382b5b3 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Wed, 14 Apr 2010 15:42:49 +0000
Subject: [PATCH] Tidy up http gstreamer source element.

---
 src/engines/gstenginepipeline.cpp | 18 ++++++++----------
 src/engines/gstenginepipeline.h   |  2 ++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp
index f487a34cf..9f0bf6789 100644
--- a/src/engines/gstenginepipeline.cpp
+++ b/src/engines/gstenginepipeline.cpp
@@ -20,6 +20,13 @@
 
 #include <QDebug>
 
+const char* GstEnginePipeline::kHttpGstreamerSource =
+#ifdef Q_OS_DARWIN
+    "neonhttpsrc";
+#else
+    "souphttpsrc";  // Does not exist on mac/fink.
+#endif
+
 GstEnginePipeline::GstEnginePipeline()
   : QObject(NULL),
     valid_(false),
@@ -59,20 +66,11 @@ bool GstEnginePipeline::Init(const QUrl &url) {
   //   audiosink
 
   // Source
-  #ifdef Q_OS_DARWIN
-  // giosrc from Fink does not support HTTP.
   if (url.scheme() == "http") {
-    src_ = GstEngine::CreateElement("neonhttpsrc");
+    src_ = GstEngine::CreateElement(kHttpGstreamerSource);
   } else {
     src_ = GstEngine::CreateElement("giosrc");
   }
-  #else
-  if (url.scheme() == "http") {
-    src_ = GstEngine::CreateElement("souphttpsrc");
-  } else {
-    src_ = GstEngine::CreateElement("giosrc");
-  }
-  #endif
   if (!src_)
     return false;
 
diff --git a/src/engines/gstenginepipeline.h b/src/engines/gstenginepipeline.h
index 559e37011..f7af33066 100644
--- a/src/engines/gstenginepipeline.h
+++ b/src/engines/gstenginepipeline.h
@@ -81,6 +81,8 @@ class GstEnginePipeline : public QObject {
  private:
   static const int kGstStateTimeoutNanosecs = 10000000;
 
+  static const char* kHttpGstreamerSource;
+
   bool valid_;
   QString sink_;
   QString device_;