Shift some stuff around and move MythMedia to libmythdb so that we can add handling for media events in libmythui.

Author: stuartm

mythplugins/mythgallery/mythgallery/iconview.cpp

@@ -480,9 +480,9 @@ bool IconView::keyPressEvent(QKeyEvent *event)
                 handled = false;
         }
 
-        if (action == "ESCAPE") 
+        if (action == "ESCAPE")
         {
-            if (GetMythMainWindow()->IsExitingToMain()) 
+            if (GetMythMainWindow()->IsExitingToMain())
             {
                 while ( m_currDir != m_galleryDir &&
                         HandleSubDirEscape(m_galleryDir) );
@@ -738,7 +738,7 @@ void IconView::customEvent(QEvent *event)
             MythUIButtonListItem *item = m_imageList->GetItemAt(pos);
             if (QFile(thumbitem->GetImageFilename()).exists())
                 item->SetImage(thumbitem->GetImageFilename());
- 
+
             if (m_imageList->GetCurrentPos() == pos)
                 UpdateImage(item);
         }
@@ -993,7 +993,7 @@ void IconView::HandleDeleteCurrent(void)
 
     if (!thumbitem)
         return;
-    
+
     QString title = tr("Delete Current File or Folder");
     QString msg = (thumbitem->IsDir()) ?
         tr("Deleting 1 folder, including any subfolders and files.") :
@@ -1007,10 +1007,10 @@ void IconView::DoDeleteCurrent(bool doDelete)
     if (doDelete)
     {
         ThumbItem *thumbitem = GetCurrentThumb();
-        
+
         if (!thumbitem)
             return;
-            
+
         QFileInfo fi;
         fi.setFile(thumbitem->GetPath());
         GalleryUtil::Delete(fi);
@@ -1050,7 +1050,7 @@ void IconView::HandleSettings(void)
 
 void IconView::HandleEject(void)
 {
-    myth_eject();
+    MediaMonitor::ejectOpticalDisc();
 }
 
 void IconView::HandleImport(void)

mythtv/libs/libmyth/libmyth.pro

@@ -1,5 +1,5 @@
 include ( ../../settings.pro )
- 
+
 TEMPLATE = lib
 TARGET = myth-$$LIBVERSION
 CONFIG += thread dll
@@ -19,12 +19,12 @@ HEADERS += backendselect.h dbsettings.h dialogbox.h
 HEADERS += generictree.h langsettings.h
 HEADERS += managedlist.h mythconfigdialogs.h mythconfiggroups.h
 HEADERS += mythcontext.h mythdeque.h mythdialogs.h
-HEADERS += mythevent.h mythexp.h mythmedia.h mythmediamonitor.h
-HEADERS += mythplugin.h mythpluginapi.h 
+HEADERS += mythevent.h mythexp.h mythmediamonitor.h
+HEADERS += mythplugin.h mythpluginapi.h
 HEADERS += mythwidgets.h mythwizard.h schemawizard.h
-HEADERS += output.h 
-HEADERS += settings.h 
-HEADERS += uilistbtntype.h uitypes.h util.h mythuifilebrowser.h
+HEADERS += output.h
+HEADERS += settings.h
+HEADERS += uilistbtntype.h uitypes.h mythuifilebrowser.h
 HEADERS += volumebase.h visual.h xmlparse.h
 HEADERS += mythhdd.h mythcdrom.h storagegroupeditor.h dbutil.h
 HEADERS += mythcommandlineparser.h mythterminal.h
@@ -50,10 +50,10 @@ SOURCES += backendselect.cpp dbsettings.cpp dialogbox.cpp
 SOURCES += generictree.cpp langsettings.cpp
 SOURCES += managedlist.cpp mythconfigdialogs.cpp mythconfiggroups.cpp
 SOURCES += mythcontext.cpp mythdialogs.cpp
-SOURCES += mythmedia.cpp mythmediamonitor.cpp
-SOURCES += mythplugin.cpp 
+SOURCES += mythmediamonitor.cpp
+SOURCES += mythplugin.cpp
 SOURCES += mythwidgets.cpp mythwizard.cpp schemawizard.cpp
-SOURCES += output.cpp 
+SOURCES += output.cpp
 SOURCES += settings.cpp
 SOURCES += uilistbtntype.cpp uitypes.cpp util.cpp mythuifilebrowser.cpp
 SOURCES += mythhdd.cpp mythcdrom.cpp storagegroupeditor.cpp dbutil.cpp
@@ -105,8 +105,8 @@ inc.files += mythwidgets.h remotefile.h oldsettings.h volumecontrol.h
 inc.files += settings.h uitypes.h xmlparse.h mythplugin.h mythdialogs.h
 inc.files += audio/audiooutput.h audio/audiosettings.h
 inc.files += audio/audiooutputsettings.h
-inc.files += util.h dbutil.h
-inc.files += inetcomms.h mythmedia.h mythcdrom.h mythwizard.h schemawizard.h
+inc.files += dbutil.h
+inc.files += inetcomms.h mythcdrom.h mythwizard.h schemawizard.h
 inc.files += uilistbtntype.h generictree.h managedlist.h mythmediamonitor.h
 inc.files += visual.h volumebase.h output.h langsettings.h
 inc.files += mythexp.h mythpluginapi.h storagegroupeditor.h

mythtv/libs/libmyth/mythcontext.cpp

@@ -25,6 +25,7 @@ using namespace std;
 #include "mythevent.h"
 #include "dbutil.h"
 #include "DisplayRes.h"
+#include "mythmediamonitor.h"
 
 #include "mythdb.h"
 #include "mythdirs.h"
@@ -211,7 +212,7 @@ static void plugin_cb(const QString &cmd)
 
 static void eject_cb(void)
 {
-    myth_eject();
+    MediaMonitor::ejectOpticalDisc();
 }
 
 MythContextPrivate::MythContextPrivate(MythContext *lparent)

mythtv/libs/libmyth/mythmediamonitor.cpp

@@ -32,9 +32,6 @@ using namespace std;
 #include "mediamonitor-unix.h"
 #endif
 
-QEvent::Type MediaEvent::kEventType =
-    (QEvent::Type) QEvent::registerEventType();
-
 MediaMonitor *MediaMonitor::c_monitor = NULL;
 
 // MonitorThread
@@ -889,3 +886,27 @@ const QString MediaMonitor::listDevices(void)
 
     return list.join(", ");
 }
+
+/**
+ * \brief Eject a disk, unmount a drive, open a tray
+ *
+ * If the Media Monitor is enabled, we use its fully-featured routine.
+ * Otherwise, we guess a drive and use a primitive OS-specific command
+ */
+void MediaMonitor::ejectOpticalDisc()
+{
+    MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
+    if (mon)
+        mon->ChooseAndEjectMedia();
+    else
+    {
+        VERBOSE(VB_MEDIA, "CD/DVD Monitor isn't enabled.");
+#ifdef __linux__
+        VERBOSE(VB_MEDIA, "Trying Linux 'eject -T' command");
+        myth_system("eject -T");
+#elif CONFIG_DARWIN
+        VERBOSE(VB_MEDIA, "Trying 'disktool -e disk1");
+        myth_system("disktool -e disk1");
+#endif
+    }
+}

mythtv/libs/libmyth/mythmediamonitor.h

@@ -5,7 +5,6 @@
 #include <QPointer>
 #include <QThread>
 #include <QMutex>
-#include <QEvent>
 #include <QList>
 
 #include "mythmedia.h"
@@ -19,22 +18,6 @@ struct MHData
     QString  description;
 };
 
-class MPUBLIC MediaEvent : public QEvent
-{
-  public:
-    MediaEvent(MediaStatus oldStatus, MythMediaDevice *pDevice) :
-        QEvent(kEventType), m_OldStatus(oldStatus), m_Device(pDevice) {}
-
-    MediaStatus getOldStatus(void) const { return m_OldStatus; }
-    MythMediaDevice* getDevice(void) { return m_Device; }
-
-    static Type kEventType;
-
-  protected:
-    MediaStatus m_OldStatus;
-    QPointer<MythMediaDevice> m_Device;
-};
-
 class MediaMonitor;
 class MonitorThread : public QThread
 {
@@ -92,6 +75,8 @@ class MPUBLIC MediaMonitor : public QObject
     static QString defaultCDWriter();
     static QString defaultDVDWriter();
 
+    static void ejectOpticalDisc(void);
+
     virtual QStringList GetCDROMBlockDevices(void) = 0;
 
   public slots:
@@ -112,7 +97,7 @@ class MPUBLIC MediaMonitor : public QObject
     const QString listDevices(void);
 
     static QString defaultDevice(const QString setting,
-                                 const QString label,  
+                                 const QString label,
                                  const char *hardCodedDefault);
     MythMediaDevice *selectDrivePopup(const QString label, bool mounted=false);
 

mythtv/libs/libmythdb/libmythdb.pro

@@ -18,7 +18,8 @@ HEADERS += mythtimer.h mythsignalingtimer.h mythdirs.h exitcodes.h
 HEADERS += lcddevice.h mythstorage.h remotefile.h decodeencode.h
 HEADERS += mythcorecontext.h mythsystem.h mythlocale.h storagegroup.h
 HEADERS += mythcoreutil.h mythdownloadmanager.h mythtranslation.h
-HEADERS += unzip.h unzip_p.h zipentry_p.h iso639.h iso3166.h
+HEADERS += unzip.h unzip_p.h zipentry_p.h iso639.h iso3166.h mythmedia.h
+HEADERS += util.h
 
 SOURCES += mythsocket.cpp mythsocketthread.cpp msocketdevice.cpp
 SOURCES += mythdbcon.cpp mythdb.cpp oldsettings.cpp mythverbose.cpp
@@ -27,7 +28,7 @@ SOURCES += mythdirs.cpp mythsignalingtimer.cpp
 SOURCES += lcddevice.cpp mythstorage.cpp remotefile.cpp decodeencode.cpp
 SOURCES += mythcorecontext.cpp mythsystem.cpp mythlocale.cpp storagegroup.cpp
 SOURCES += mythcoreutil.cpp mythdownloadmanager.cpp mythtranslation.cpp
-SOURCES += unzip.cpp iso639.cpp iso3166.cpp
+SOURCES += unzip.cpp iso639.cpp iso3166.cpp mythmedia.cpp util.cpp
 
 win32:SOURCES += msocketdevice_win.cpp
 unix {
@@ -50,7 +51,7 @@ inc.files += mythtimer.h lcddevice.h exitcodes.h mythdirs.h mythstorage.h
 inc.files += mythsocket.h mythsocket_cb.h msocketdevice.h
 inc.files += mythcorecontext.h mythsystem.h storagegroup.h
 inc.files += mythcoreutil.h mythlocale.h mythdownloadmanager.h
-inc.files += mythtranslation.h iso639.h iso3166.h
+inc.files += mythtranslation.h iso639.h iso3166.h mythmedia.h util.h
 
 # Allow both #include <blah.h> and #include <libmyth/blah.h>
 inc2.path  = $${PREFIX}/include/mythtv/libmyth

mythtv/libs/libmyth/mythmedia.cpp renamed to mythtv/libs/libmythdb/mythmedia.cpp

@@ -52,8 +52,11 @@ const char* MythMediaDevice::MediaErrorStrings[] =
     "MEDIAERR_UNSUPPORTED"
 };
 
-MythMediaDevice::MythMediaDevice(QObject* par, const char* DevicePath, 
-                                 bool SuperMount,  bool AllowEject) 
+QEvent::Type MediaEvent::kEventType =
+    (QEvent::Type) QEvent::registerEventType();
+
+MythMediaDevice::MythMediaDevice(QObject* par, const char* DevicePath,
+                                 bool SuperMount,  bool AllowEject)
                : QObject(par)
 {
     m_DevicePath = DevicePath;
@@ -71,10 +74,10 @@ bool MythMediaDevice::openDevice()
     // Sanity check
     if (isDeviceOpen())
         return true;
- 
+
     QByteArray dev = m_DevicePath.toLocal8Bit();
     m_DeviceHandle = open(dev.constData(), O_RDONLY | O_NONBLOCK);
-    
+
     return isDeviceOpen();
 }
 
@@ -86,13 +89,13 @@ bool MythMediaDevice::closeDevice()
 
     int ret = close(m_DeviceHandle);
     m_DeviceHandle = -1;
-    
+
     return (ret != -1) ? true : false;
 }
 
-bool MythMediaDevice::isDeviceOpen() const 
-{ 
-    return (m_DeviceHandle >= 0) ? true : false; 
+bool MythMediaDevice::isDeviceOpen() const
+{
+    return (m_DeviceHandle >= 0) ? true : false;
 }
 
 bool MythMediaDevice::performMountCmd(bool DoMount)
@@ -107,7 +110,7 @@ bool MythMediaDevice::performMountCmd(bool DoMount)
     if (isDeviceOpen())
         closeDevice();
 
-    if (!m_SuperMount) 
+    if (!m_SuperMount)
     {
         QString MountCommand;
 
@@ -121,7 +124,7 @@ bool MythMediaDevice::performMountCmd(bool DoMount)
             MountCommand = QString("%1 %2")
                 .arg((DoMount) ? PATHTO_MOUNT : PATHTO_UNMOUNT)
                 .arg(m_DevicePath);
-    
+
         VERBOSE(VB_MEDIA, QString("Executing '%1'").arg(MountCommand));
         if (myth_system(MountCommand, kMSDontBlockInputDevs) != GENERIC_EXIT_OK)
         {
@@ -148,12 +151,12 @@ bool MythMediaDevice::performMountCmd(bool DoMount)
         else
             VERBOSE(VB_GENERAL, QString("Failed to mount %1.")
                                        .arg(m_DevicePath));
-    } 
-    else 
+    }
+    else
     {
         VERBOSE(VB_MEDIA, "Disk inserted on a supermount device");
         // If it's a super mount then the OS will handle mounting /  unmounting.
-        // We just need to give derived classes a chance to perform their 
+        // We just need to give derived classes a chance to perform their
         // mount / unmount logic.
         if (DoMount)
         {
@@ -307,11 +310,11 @@ void MythMediaDevice::setSpeed(int speed)
             .arg(speed).arg(m_DevicePath));
 }
 
-MediaError MythMediaDevice::lock() 
-{ 
+MediaError MythMediaDevice::lock()
+{
     // We just open the device here, which may or may not do the trick,
     // derived classes can do more...
-    if (openDevice()) 
+    if (openDevice())
     {
         m_Locked = true;
         return MEDIAERR_OK;
@@ -321,9 +324,9 @@ MediaError MythMediaDevice::lock()
 }
 
 MediaError MythMediaDevice::unlock()
-{ 
+{
     m_Locked = false;
-    
+
     return MEDIAERR_OK;
 }
 
@@ -419,9 +422,9 @@ MediaStatus MythMediaDevice::setStatus( MediaStatus NewStatus, bool CloseIt )
 
     // If the status is changed we need to take some actions
     // depending on the old and new status.
-    if (NewStatus != OldStatus) 
+    if (NewStatus != OldStatus)
     {
-        switch (NewStatus) 
+        switch (NewStatus)
         {
             // the disk is not / should not be mounted.
             case MEDIASTAT_ERROR:
@@ -438,7 +441,7 @@ MediaStatus MythMediaDevice::setStatus( MediaStatus NewStatus, bool CloseIt )
                 // get rid of the compiler warning...
                 break;
         }
-        
+
         // Don't fire off transitions to / from unknown states
         if (m_Status != MEDIASTAT_UNKNOWN && OldStatus != MEDIASTAT_UNKNOWN)
             emit statusChanged(OldStatus, this);

mythtv/libs/libmyth/mythmedia.h renamed to mythtv/libs/libmythdb/mythmedia.h

@@ -4,6 +4,8 @@
 #include <QObject>
 #include <QMap>
 #include <QString>
+#include <QEvent>
+#include <QPointer>
 
 #include "mythexp.h"
 
@@ -168,4 +170,20 @@ class MPUBLIC MythMediaDevice : public QObject
     ext_to_media_t m_ext_to_media; ///< Map of extension to media type.
 };
 
+class MPUBLIC MediaEvent : public QEvent
+{
+  public:
+    MediaEvent(MediaStatus oldStatus, MythMediaDevice *pDevice) :
+        QEvent(kEventType), m_OldStatus(oldStatus), m_Device(pDevice) {}
+
+    MediaStatus getOldStatus(void) const { return m_OldStatus; }
+    MythMediaDevice* getDevice(void) { return m_Device; }
+
+    static Type kEventType;
+
+  protected:
+    MediaStatus m_OldStatus;
+    QPointer<MythMediaDevice> m_Device;
+};
+
 #endif

mythtv/libs/libmythdb/mythversion.h

@@ -11,7 +11,7 @@
 /// Update this whenever the plug-in API changes.
 /// Including changes in the libmythdb, libmyth, libmythtv, libmythav* and
 /// libmythui class methods used by plug-ins.
-#define MYTH_BINARY_VERSION "0.25.20110125-3"
+#define MYTH_BINARY_VERSION "0.25.20110126-1"
 
 /** \brief Increment this whenever the MythTV network protocol changes.
  *