[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kfile
From:       Kevin Ottens <ervin () kde ! org>
Date:       2011-01-13 7:45:22
Message-ID: 20110113074522.14AF3AC8B3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1214139 by ervin:

Forge the right URL for audiocd:/ to pass the device parameter and then
address the right one.

CCMAIL: 262988


 M  +3 -1      kfileplacesitem.cpp  


--- trunk/KDE/kdelibs/kfile/kfileplacesitem.cpp #1214138:1214139
@@ -26,6 +26,7 @@
 #include <kiconloader.h>
 #include <kdirlister.h>
 #include <klocale.h>
+#include <solid/block.h>
 #include <solid/opticaldisc.h>
 #include <solid/storageaccess.h>
 #include <solid/storagevolume.h>
@@ -175,7 +176,8 @@
             if (m_access) {
                 return QUrl(KUrl(m_access->filePath()));
             } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio)!=0) {
-                return QUrl("audiocd:/");
+                QString device = d.as<Solid::Block>()->device();
+                return QUrl(QString("audiocd:/?device=%1").arg(device));
             } else {
                 return QVariant();
             }
[prev in list] [next in list] [prev in thread] [next in thread]