Ticket #9362: 70-mythmusic-cdio-main.diff

mythplugins/mythmusic/mythmusic/databasebox.cpp

@@ -27 +27 @@
 #include "cddecoder.h"
 #include "playlistcontainer.h"
 #include "musicplayer.h"
-#ifndef USING_MINGW
-#include "cddecoder.h"
-#endif
 
 DatabaseBox::DatabaseBox(MythMainWindow *parent,
                          const QString dev, const QString &window_name,
@@ -1276 +1273 @@
 
 void ReadCDThread::run()
 {
-#ifndef USING_MINGW
     // lock all_music and cd_status_changed while running thread
     QMutexLocker locker(getLock());
 
@@ -1364 +1360 @@
     }
 
     delete decoder;
-#endif // USING_MINGW
 }
 

mythplugins/mythmusic/mythmusic/main.cpp

@@ -34 +34 @@
 #include "filescanner.h"
 #include "musicplayer.h"
 #include "config.h"
-#ifndef USING_MINGW
 #include "cdrip.h"
 #include "importmusic.h"
-#endif
 
 // System header (relies on config.h define)
 #ifdef HAVE_CDAUDIO
@@ -272 +270 @@
 {
     loadMusic();
 
+#if defined HAVE_CDAUDIO || defined HAVE_CDIO
     MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
 
     Ripper *rip = new Ripper(mainStack, chooseCD());
@@ -284 +283 @@
     QObject::connect(rip, SIGNAL(ripFinished()),
                      gMusicData, SLOT(reloadMusic()),
                      Qt::QueuedConnection);
+#endif
 }
 
 static void startImport(void)
 {
     loadMusic();
 
+#if defined HAVE_CDAUDIO || defined HAVE_CDIO
     MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
 
     ImportMusicDialog *import = new ImportMusicDialog(mainStack);
@@ -302 +303 @@
     QObject::connect(import, SIGNAL(importFinished()),
                      gMusicData, SLOT(reloadMusic()),
                      Qt::QueuedConnection);
+#endif
 }
 
 static void MusicCallback(void *data, QString &selection)
@@ -396 +398 @@
 {
     loadMusic();
 
+#if defined HAVE_CDAUDIO || defined HAVE_CDIO
     MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
 
     Ripper *rip = new Ripper(mainStack, chooseCD());
@@ -408 +411 @@
     QObject::connect(rip, SIGNAL(ripFinished()),
                      gMusicData, SLOT(reloadMusic()),
                      Qt::QueuedConnection);
+#endif
 }
 
 static void runScan(void)
@@ -472 +476 @@
     }
 
     if (gCoreContext->GetNumSetting("AutoPlayCD", 0))
+    {
+        // Empty the playlist to ensure CD is played first
+        if (gMusicData->all_music)
+            gMusicData->all_music->clearCDData();
+        if (gMusicData->all_playlists)
+            gMusicData->all_playlists->clearCDList();
+
         runMusicPlayback();
+    }
     else
         mythplugin_run();
 }

mythplugins/mythmusic/mythmusic/musiccommon.cpp

@@ -32 +32 @@
 #include "search.h"
 #include "editmetadata.h"
 
-#ifndef USING_MINGW
 #include "cddecoder.h"
-#endif // USING_MINGW
 
 #include "musiccommon.h"
 //#include "playlistview.h"