diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-16 08:42:56 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-29 16:00:09 (GMT) |
| commit | 8c29407a7bf5af9dbcaff1ea7f24951297aa9e5c (patch) | |
| tree | d6df0e0899f417e502bf2eb369dc4310154fd1c4 /src/3rdparty/phonon/gstreamer/mediaobject.cpp | |
| parent | 854df9c08635fd175f6658e66320d8fa2360389a (diff) | |
| download | Qt-8c29407a7bf5af9dbcaff1ea7f24951297aa9e5c.zip Qt-8c29407a7bf5af9dbcaff1ea7f24951297aa9e5c.tar.gz Qt-8c29407a7bf5af9dbcaff1ea7f24951297aa9e5c.tar.bz2 | |
Fix QT_NO_PHONON_ABSTRACTMEDIASTREAM in phonon
Seemed to be missing from gstreamer backend
Reviewed-by: Jens Bache-Wiig
Diffstat (limited to 'src/3rdparty/phonon/gstreamer/mediaobject.cpp')
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/mediaobject.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/gstreamer/mediaobject.cpp b/src/3rdparty/phonon/gstreamer/mediaobject.cpp index 5dcbd42..0b800af 100644 --- a/src/3rdparty/phonon/gstreamer/mediaobject.cpp +++ b/src/3rdparty/phonon/gstreamer/mediaobject.cpp @@ -392,6 +392,7 @@ bool MediaObject::createPipefromURL(const QUrl &url) */ bool MediaObject::createPipefromStream(const MediaSource &source) { +#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM // Remove any existing data source if (m_datasource) { gst_bin_remove(GST_BIN(m_pipeline), m_datasource); @@ -413,6 +414,10 @@ bool MediaObject::createPipefromStream(const MediaSource &source) return false; } return true; +#else //QT_NO_PHONON_ABSTRACTMEDIASTREAM + Q_UNUSED(source); + return false; +#endif } void MediaObject::createPipeline() |