From fc495503e79841b57c8f1a231b1e1559c6e2488a Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 7 Dec 2013 18:55:37 +0000
Subject: cdauio: fixed device path

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3953 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Input/cdaudio/decoder_cdaudio.cpp       | 2 +-
 src/plugins/Input/cdaudio/decodercdaudiofactory.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
index f7308354e..0bd8b4f5e 100644
--- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
+++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
@@ -355,7 +355,7 @@ bool DecoderCDAudio::initialize()
     device_path.remove(QRegExp("#\\d+$"));
 
     track_number = qMax(track_number, 1);
-    QList <CDATrack> tracks = DecoderCDAudio::generateTrackList(QUrl(m_url).path()); //generate track list
+    QList <CDATrack> tracks = DecoderCDAudio::generateTrackList(device_path); //generate track list
     if (tracks.isEmpty())
     {
         qWarning("DecoderCDAudio: initialize failed");
diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
index 74362ea87..64d03ecad 100644
--- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
+++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
@@ -61,10 +61,10 @@ QList<FileInfo *> DecoderCDAudioFactory::createPlayList(const QString &url, bool
 {
     Q_UNUSED(useMetaData);
     QList <FileInfo*> list;
-    QString device_path;
+    QString device_path = url;
     device_path.remove("cdda://");
     device_path.remove(QRegExp("#\\d+$"));
-    QList <CDATrack> tracks = DecoderCDAudio::generateTrackList(QUrl(url).path());
+    QList <CDATrack> tracks = DecoderCDAudio::generateTrackList(device_path);
     foreach(CDATrack t, tracks)
     {
         list << new FileInfo(t.info);
-- 
cgit v1.2.3-13-gbd6f