Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidy up http gstreamer source element.

Browse Source
This commit is contained in:
John Maguire 2010-04-14 15:42:49 +00:00
parent 747ae61620
commit 4862c41477
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/engines/gstenginepipeline.cpp
View File

@ -20,6 +20,13 @@
#include <QDebug> #include <QDebug>
const char* GstEnginePipeline::kHttpGstreamerSource =
#ifdef Q_OS_DARWIN
"neonhttpsrc";
#else
"souphttpsrc"; // Does not exist on mac/fink.
#endif
GstEnginePipeline::GstEnginePipeline() GstEnginePipeline::GstEnginePipeline()
: QObject(NULL), : QObject(NULL),
valid_(false), valid_(false),
@ -59,20 +66,11 @@ bool GstEnginePipeline::Init(const QUrl &url) {
// audiosink // audiosink
// Source // Source
#ifdef Q_OS_DARWIN
// giosrc from Fink does not support HTTP.
if (url.scheme() == "http") { if (url.scheme() == "http") {
src_ = GstEngine::CreateElement("neonhttpsrc"); src_ = GstEngine::CreateElement(kHttpGstreamerSource);
} else { } else {
src_ = GstEngine::CreateElement("giosrc"); src_ = GstEngine::CreateElement("giosrc");
} }
#else
if (url.scheme() == "http") {
src_ = GstEngine::CreateElement("souphttpsrc");
} else {
src_ = GstEngine::CreateElement("giosrc");
}
#endif
if (!src_) if (!src_)
return false; return false;

2
src/engines/gstenginepipeline.h
View File

@ -81,6 +81,8 @@ class GstEnginePipeline : public QObject {
private: private:
static const int kGstStateTimeoutNanosecs = 10000000; static const int kGstStateTimeoutNanosecs = 10000000;
static const char* kHttpGstreamerSource;
bool valid_; bool valid_;
QString sink_; QString sink_;
QString device_; QString device_;