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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src
From:       Nikolaj Hald Nielsen <nhnFreespirit () gmail ! com>
Date:       2009-07-15 7:02:43
Message-ID: 1247641363.940891.27747.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 996899 by nhnielsen:

Actually make cd tracks playable again. For now it does not keep track of whether cd \
tracks in the playlist actually belongs to the cd currently in the drive.

 M  +8 -7      EngineController.cpp  


--- trunk/extragear/multimedia/amarok/src/EngineController.cpp #996898:996899
@@ -340,7 +340,7 @@
 
     debug() << "URL: " << url.url();
     /// TODO: commented out since audiocd needs porting to new devicelib framework, \
                should not affect other urls
-/*
+
     if ( url.url().startsWith( "audiocd:/" ) )
     {
         //disconnect this signal for now or it will cause a loop that will cause a \
mutex lockup @@ -361,10 +361,12 @@
         //In the case of cds for which we dont have any id, any "unknown" cds will
         //be considdered equal.
 
-        if ( MediaDeviceMonitor::instance()->currentCdId() != discId )
-            return;
 
+        //FIXME:
+        //if ( MediaDeviceMonitor::instance()->currentCdId() != discId )
+        //    return;
 
+
         int trackNumber = parts.at( 1 ).toInt();
 
         debug() << "3.2.1...";
@@ -378,11 +380,10 @@
         connect( m_controller, SIGNAL( titleChanged( int ) ), SLOT( \
slotTitleChanged( int ) ) );  
     }
-*/
-//    else
-//    {
+    else
+    {
         m_media->setCurrentSource( url );
-//    }
+    }
 
     m_nextTrack.clear();
     m_nextUrl.clear();


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