Ticket #3379: cddec.diff

playbackbox.cpp

@@ -272 +272 @@
         lcd->switchToTime();
 }
 
-bool PlaybackBoxMusic::onMediaEvent(MythMediaDevice*)
+bool PlaybackBoxMusic::onMediaEvent(MythMediaDevice* pDev)
 {
     return scan_for_cd;
 }

main.cpp

@@ -297 +297 @@
 void runScan(void);
 
 
-void handleMedia(MythMediaDevice *) 
+void handleMedia(MythMediaDevice *pDev) 
 {
+ 
+    // Set the CD/DVD drive on default speed... Although a speed of '1' should
+    // always be sufficiant for both audio and mp3's and the likes....
+    int dvdDriveSpeed = gContext->GetNumSetting("DVDDriveSpeed", 2);
+    pDev->setSpeed(dvdDriveSpeed);
+
     if (gContext->GetNumSetting("AutoPlayCD", 0))
         runMusicPlayback();
     else

cddecoder.cpp

@@ -13 +13 @@
 #include "metadata.h"
 
 #include <mythtv/mythcontext.h>
+#include <mythtv/mythmediamonitor.h>
 
 CdDecoder::CdDecoder(const QString &file, DecoderFactory *d, QIODevice *i, 
                      AudioOutput *o) 
@@ -114 +115 @@
         return FALSE;
     }
 
+    MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
+
+    if (mon != NULL ) {
+        MythMediaDevice *pMedia = mon->GetMedia(devicename);
+        if (mon->ValidateAndLock(pMedia))
+        {
+            // This should move to mythmedia too.....
+            int dvdDriveSpeed = gContext->GetNumSetting("DVDDriveSpeed", 2);
+
+            pMedia->setSpeed(dvdDriveSpeed);
+            mon->Unlock(pMedia);
+        }
+    }
+
     cdda_verbose_set(device, CDDA_MESSAGE_FORGETIT, CDDA_MESSAGE_FORGETIT);
     start = cdda_track_firstsector(device, tracknum);
     end = cdda_track_lastsector(device, tracknum);