Ticket #1753: mythmediamonitor.patch

mythcdrom.cpp

@@ -33 +33 @@
 #elif defined(__FreeBSD__)
     return new MythCDROMFreeBSD(par, devicePath, SuperMount, AllowEject);
 #elif defined(CONFIG_DARWIN)
-    return new MythCDROM(par, devicePath, SuperMount, AllowEject);
+    return new MythCDROMDarwin(par, devicePath, SuperMount, AllowEject);
 #else
     return NULL;
 #endif

mythmediamonitor.h

@@ -47 +47 @@
 {
     Q_OBJECT
     friend class MonitorThread;
-
+    friend class MonitorThreadDarwin;
+    
   protected:
     MediaMonitor(QObject* par, unsigned long interval, bool allowEject);
 
@@ -56 +57 @@
 
     bool IsActive(void) const { return m_Active; }
 
-    void StartMonitoring(void);
+    virtual void StartMonitoring(void);
     void StopMonitoring(void);
     void ChooseAndEjectMedia(void);
 
@@ -82 +83 @@
     bool CheckMountable(void);
     bool FindPartitions(const QString &dev, bool checkPartitions);
 
-    bool AddDevice(MythMediaDevice* pDevice);
+    virtual bool AddDevice(MythMediaDevice* pDevice);
     bool AddDevice(const char* dev);
     bool AddDevice(struct fstab* mep);
     bool RemoveDevice(const QString &dev);
@@ -98 +99 @@
     QMap<MythMediaDevice*, int>  m_UseCount;
 
     bool                         m_Active;
-    MonitorThread                m_Thread;
+    MonitorThread                *m_Thread;
+    unsigned long                m_MonitorPollingInterval;
     bool                         m_AllowEject;
     int                          m_fifo;
 

mythcdrom.h

@@ -58 +58 @@
     virtual MediaError unlock(void);
 };
 
+class MythCDROMDarwin: public MythCDROM
+{
+public:
+    MythCDROMDarwin(QObject* par, const char* DevicePath, bool SuperMount,
+        bool AllowEject):
+        MythCDROM(par, DevicePath, SuperMount, AllowEject) {
+    }
+
+    virtual bool openDevice();
+    virtual MediaError testMedia(void);
+    virtual bool mediaChanged(void);
+    virtual bool checkOK(void);
+    virtual MediaStatus checkMedia(void);
+    virtual MediaError eject(bool open_close = true);
+    virtual MediaError lock(void);
+    virtual MediaError unlock(void);
+};
+
 #endif

libmyth.pro

@@ -72 +72 @@
 }
 
 macx {
-    HEADERS += audiooutputca.h   screensaver-osx.h   DisplayResOSX.h
-    SOURCES += audiooutputca.cpp screensaver-osx.cpp DisplayResOSX.cpp
+    HEADERS += audiooutputca.h   screensaver-osx.h   DisplayResOSX.h mythmediamonitor-darwin.h
+    SOURCES += audiooutputca.cpp screensaver-osx.cpp DisplayResOSX.cpp mythmediamonitor-darwin.cpp
     HEADERS += util-osx.h
     SOURCES += util-osx.cpp
-
+    SOURCES += mythcdrom-darwin.cpp
+    
     using_appleremote {
         HEADERS += AppleRemote.h   AppleRemoteListener.h   lircevent.h
         SOURCES += AppleRemote.cpp AppleRemoteListener.cpp lircevent.cpp
     }
 
     # Mac OS X Frameworks
-    FWKS = ApplicationServices AudioUnit Carbon CoreAudio IOKit
+    FWKS = ApplicationServices AudioUnit Carbon CoreAudio IOKit DiskArbitration
 
     # The following trick is tidier, and shortens the command line, but it
     # depends on the shell expanding Csh-style braces. Luckily, Bash & Zsh do.

mythmediamonitor.cpp

@@ -25 +25 @@
 #include <qdir.h>
 #include <qfile.h>
 
+#ifdef Q_OS_MACX
+#include "mythmediamonitor-darwin.h"
+#endif // Q_OS_MACX
+
 // MythTV headers
 #include "mythmediamonitor.h"
 #include "mythcontext.h"
@@ -87 +91 @@
 
     if (gContext->GetNumSetting("MonitorDrives"))
     {
+#ifdef Q_OS_MACX
+        c_monitor = new MediaMonitorDarwin(NULL, 500, true);
+#else
         c_monitor = new MediaMonitor(NULL, 500, true);
+#endif // Q_OS_MACX        
         c_monitor->CheckFileSystemTable();
         c_monitor->CheckMountable();
     }
@@ -199 +207 @@
 
 MediaMonitor::MediaMonitor(QObject* par, unsigned long interval, 
                            bool allowEject) 
-    : QObject(par), m_Active(false), m_Thread(this, interval),
+    : QObject(par), m_Active(false), m_Thread(NULL), m_MonitorPollingInterval(interval),
       m_AllowEject(allowEject), m_fifo(-1)
 {
 }
 
 MediaMonitor::~MediaMonitor()
 {
+    if (m_Thread)
+    {
+        delete m_Thread;
+        m_Thread = NULL;
+    }
+    
     if (m_fifo > 0)
     {
         close(m_fifo);
@@ -742 +756 @@
     if (m_Active)
         return;
 
+    if (!m_Thread)
+    {
+        m_Thread = new MonitorThread(this, m_MonitorPollingInterval);
+    }
     m_Active = true;
-    m_Thread.start();
+    m_Thread->start();
 }
 
 /** \fn MediaMonitor::StopMonitoring(void)
@@ -756 +774 @@
         return;
 
     m_Active = false;
-    m_Thread.wait();
+    m_Thread->wait();
 }
 
 /** \fn MediaMonitor::ValidateAndLock(MythMediaDevice *pMedia)