Ticket #2990: cdrip.diff

mythmusic/mythmusic/cdrip.cpp

@@ -30 +30 @@
 #include <mythtv/mythwidgets.h>
 #include <mythtv/lcddevice.h>
 #include <mythtv/dialogbox.h>
+#include <mythtv/mythmediamonitor.h>
 
 // MythMusic includes
 #include "cdrip.h"
@@ -367 +368 @@
 Ripper::Ripper(MythMainWindow *parent, const char *name)
       : MythThemedDialog(parent, "cdripper", "music-", name, true)
 {
+#ifndef _WIN32
+    // if the MediaMonitor is running stop it
+    m_mediaMonitorActive = false;
+    MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
+    if (mon && mon->IsActive())
+    {
+        m_mediaMonitorActive = true;
+        mon->StopMonitoring();
+    }
+#endif
+
     // Set this to false so we can tell if the ripper has done anything
     // (i.e. we can tell if the user quit prior to ripping)
     m_somethingwasripped = false;
@@ -381 +393 @@
 {
     if (m_decoder)
         delete m_decoder;
+
+#ifndef _WIN32
+    // if the MediaMonitor was active when we started then restart it
+    if (m_mediaMonitorActive)
+    {
+        MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
+        if (mon)
+            mon->StartMonitoring();
+    }
+#endif
 }
 
 void Ripper::wireupTheme(void)

mythmusic/mythmusic/cdrip.h

@@ -145 +145 @@
     QString            m_albumName, m_artistName, m_genreName, m_year;
     QStringList        m_searchList;
     bool               m_somethingwasripped;
+    bool               m_mediaMonitorActive;
 };