diff options
author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2009-10-01 06:49:23 (GMT) |
---|---|---|
committer | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2009-10-01 06:54:33 (GMT) |
commit | eb26efd476faa6e6986e62de12c24527a5476fd3 (patch) | |
tree | 2e7bf9ad902b29f3c12c64d1f8b62b90f695745a /src/3rdparty | |
parent | 3b8c67a07acd049035ac67c6ff981939f357473c (diff) | |
download | Qt-eb26efd476faa6e6986e62de12c24527a5476fd3.zip Qt-eb26efd476faa6e6986e62de12c24527a5476fd3.tar.gz Qt-eb26efd476faa6e6986e62de12c24527a5476fd3.tar.bz2 |
Fixes: Phonon-gst: use correct URLs for different disk types.
RevBy: Andrew den Exter
Details:
Phonon gstreamer backend used cdda:// URL and corresponding
gst source element regardless of disk type.
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/phonon/gstreamer/mediaobject.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/gstreamer/mediaobject.cpp b/src/3rdparty/phonon/gstreamer/mediaobject.cpp index 13f9734..71cd87f 100644 --- a/src/3rdparty/phonon/gstreamer/mediaobject.cpp +++ b/src/3rdparty/phonon/gstreamer/mediaobject.cpp @@ -904,8 +904,21 @@ void MediaObject::setSource(const MediaSource &source) case MediaSource::Disc: // CD tracks can be specified by setting the url in the following way uri=cdda:4 { - QUrl cdurl(QLatin1String("cdda://")); - if (createPipefromURL(cdurl)) + QUrl url; + switch (source.discType()) { + case Phonon::Cd: + url = QUrl(QLatin1String("cdda://")); + break; + case Phonon::Dvd: + url = QUrl(QLatin1String("dvd://")); + break; + case Phonon::Vcd: + url = QUrl(QLatin1String("vcd://")); + break; + default: + break; + } + if (!url.isEmpty() && createPipefromURL(url)) m_loading = true; else setError(tr("Could not open media source.")); |