Ticket #3077: default-cd.diff

src/mythplugins/mythmusic/mythmusic/cdrip.cpp

@@ -167 +163 @@
     sendEvent(ST_TRACK_PROGRESS, 0);
 
     QString textstatus;
-    QString cddevice = gContext->GetSetting("CDDevice");
+    QString cddevice = MediaMonitor::defaultCDdevice();
     QString encodertype = gContext->GetSetting("EncoderType");
     bool mp3usevbr = gContext->GetNumSetting("Mp3UseVBR", 0);
 
@@ -734 +730 @@
 
 void Ripper::scanCD(void)
 {
-    QString cddevice = gContext->GetSetting("CDDevice");
+    QString cddevice = MediaMonitor::defaultCDdevice();
 
     int cdrom_fd = cd_init_device((char*)cddevice.ascii());
     if (cdrom_fd == -1)
@@ -1144 +1140 @@
 
 void Ripper::ejectCD()
 {
-    QString cddevice = gContext->GetSetting("CDDevice");
+    QString cddevice = MediaMonitor::defaultCDdevice();
     bool bEjectCD = gContext->GetNumSetting("EjectCDAfterRipping",1);
     if (bEjectCD)
     {

src/mythplugins/mythmusic/mythmusic/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) 
@@ -40 +41 @@
 
     settracknum = -1;
 
-    devicename = gContext->GetSetting("CDDevice");
+    devicename = MediaMonitor::defaultCDdevice();
 }
 
 CdDecoder::~CdDecoder(void)

src/mythplugins/mytharchive/mytharchive/archivesettings.cpp

@@ -50 +50 @@
     return gc;
 };
 
-static HostLineEdit *MythArchiveDVDLocation()
-{
-    HostLineEdit *gc = new HostLineEdit("MythArchiveDVDLocation");
-    gc->setLabel(QObject::tr("Location of DVD"));
-    gc->setValue("/dev/dvd");
-    gc->setHelpText(QObject::tr("Which DVD drive to use when burning discs."));
-    return gc;
-};
-
 static HostLineEdit *MythArchiveDVDPlayerCmd()
 {
     HostLineEdit *gc = new HostLineEdit("MythArchiveDVDPlayerCmd");
@@ -276 +267 @@
     vcg1->addChild(MythArchiveShareDir());
     vcg1->addChild(PALNTSC());
     vcg1->addChild(MythArchiveFileFilter());
-    vcg1->addChild(MythArchiveDVDLocation());
     vcg1->addChild(MythArchiveDVDPlayerCmd());
     addChild(vcg1);
 

src/mythplugins/mytharchive/mytharchivehelper/main.cpp

@@ -23 +23 @@
 // MythTV headers
 #include <mythtv/mythcontext.h>
 #include <mythtv/util.h>
-#include <mythtv/mythcontext.h>
+#include <mythtv/mythmediamonitor.h>
 #include <mythtv/exitcodes.h>
 #include <mythtv/mythdbcon.h>
 #include <ffmpeg/avcodec.h>
@@ -164 +164 @@
 
 int burnISOImage(int mediaType, bool bEraseDVDRW, bool nativeFormat)
 {
-    QString dvdDrive = gContext->GetSetting("MythArchiveDVDLocation", "/dev/dvd");
+    QString dvdDrive = MediaMonitor::defaultDVDwriter();
     VERBOSE(VB_JOBQUEUE, "Burning ISO image to " + dvdDrive);
 
     QString tempDirectory = getTempDirectory();

src/mythplugins/mythvideo/mtd/mtd.cpp

@@ -16 +16 @@
 
 #include <mythtv/util.h>
 #include <mythtv/mythcontext.h>
+#include <mythtv/mythmediamonitor.h>
 
 #include "mtd.h"
 #include "logging.h"
@@ -173 +174 @@
     //  timer to query whether the thread is done or not
     //
         
-    QString dvd_device = gContext->GetSetting("DVDDeviceLocation");
-    if(dvd_device.length() < 1)
-    {
-        cerr << "dvdripbox.o: Can't get a value for DVD device location. Did you run setup?" << endl;
-        exit(0);
-    }
+    QString dvd_device = MediaMonitor::defaultDVDdevice();
     dvd_probe = new DVDProbe(dvd_device);
     disc_checking_thread = new DiscCheckingThread(this, dvd_probe, dvd_drive_access, titles_mutex);
     disc_checking_thread->start();
@@ -678 +674 @@
 
     QString file_name = dir_and_file.section("/", -1, -1);
 
+    QString dvd_device = MediaMonitor::defaultDVDdevice();
 
-    QString dvd_device = gContext->GetSetting("DVDDeviceLocation");
-    if(dvd_device.length() < 1)
-    {
-        emit writeToLog("crapity crap crap - all set to launch a dvd job and you don't have a dvd device defined");
-        return;
-    }
-
     //
     //  OK, we are ready to launch this job
     //

src/mythplugins/mythvideo/mythvideo/globalsettings.cpp

@@ -272 +272 @@
 
 // General Settings
 
-HostLineEdit *SetVCDDevice()
-{
-    HostLineEdit *gc = new HostLineEdit("VCDDeviceLocation");
-    gc->setLabel(QObject::tr("Location of VCD device"));
-    gc->setValue("/dev/cdrom");
-    gc->setHelpText(QObject::tr("This device must exist, and the user "
-                    "running MythDVD needs to have read permission "
-                    "on the device."));
-    return gc;
-}
-
-HostLineEdit *SetDVDDevice()
-{
-    HostLineEdit *gc = new HostLineEdit("DVDDeviceLocation");
-    gc->setLabel(QObject::tr("Location of DVD device"));
-    gc->setValue("/dev/dvd");
-    gc->setHelpText(QObject::tr("This device must exist, and the user "
-                    "running MythDVD needs to have read permission "
-                    "on the device."));
-    return gc;
-}
-
 HostComboBox *SetOnInsertDVD()
 {
     HostComboBox *gc = new HostComboBox("DVDOnInsertDVD");
@@ -557 +535 @@
             new VerticalConfigurationGroup(false);
     general3->setLabel(QObject::tr("General Settings (%1/%2)")
                        .arg(3).arg(pages));
-    general3->addChild(SetDVDDevice());
-    general3->addChild(SetVCDDevice());
     general3->addChild(SetOnInsertDVD());
     general3->addChild(SetDVDDriveSpeed());
     general3->addChild(new DVDBookmarkSettings());

src/mythplugins/mythvideo/mythvideo/main.cpp

@@ -17 +17 @@
 #include <mythtv/lcddevice.h>
 #include <mythtv/libmythui/myththemedmenu.h>
 #include <mythtv/mythpluginapi.h>
+#include <mythtv/mythmediamonitor.h>
 #include <mythtv/mythmedia.h>
 #include <mythtv/util.h>
 
@@ -251 +252 @@
                 //
                 //  Need to do device substitution
                 //
-                QString vcd_device = gContext->GetSetting("VCDDeviceLocation");
-                if(vcd_device.length() < 1)
-                {
-                    //
-                    //  RTF README
-                    //
-                    DialogBox *no_device_dialog =
-                            new DialogBox(gContext->GetMainWindow(),
-                            QObject::tr("\n\nYou have no VCD Device defined."));
-                    no_device_dialog->
-                            AddButton(QObject::tr("OK, I'll go run Setup"));
-                    no_device_dialog->exec();
-
-                    delete no_device_dialog;
-                    gContext->removeCurrentLocation();
-
-                    return;
-                }
-                else
-                {
-                    command_string =
-                            command_string.replace(QRegExp("%d"), vcd_device);
-                }
+                QString vcd_device = MediaMonitor::defaultVCDdevice();
+                command_string
+                    = command_string.replace(QRegExp("%d"), vcd_device);
             }
             myth_system(command_string);
             gContext->GetMainWindow()->raise();
@@ -296 +277 @@
         QString dvd_device = gDVDdevice;
 
         if (dvd_device.isNull())
-            dvd_device = gContext->GetSetting("DVDDeviceLocation");
+            dvd_device = MediaMonitor::defaultDVDdevice();
 
-        if(dvd_device.length() < 1)
-        {
-            //
-            //  RTF README
-            //
-            DialogBox *no_device_dialog =
-                    new DialogBox(gContext->GetMainWindow(),
-                    QObject::tr("\n\nYou have no DVD Device defined."));
-            no_device_dialog->AddButton(QObject::tr("OK, I'll go run Setup"));
-            no_device_dialog->exec();
-
-            delete no_device_dialog;
-            gContext->removeCurrentLocation();
-
-            return;
-        }
-
         gContext->addCurrentLocation("playdvd");
 
         if ((command_string.find("internal", 0, false) > -1) ||

src/mythplugins/mythvideo/mythvideo/dvdripbox.cpp

@@ -14 +14 @@
 using namespace std;
 
 #include <mythtv/mythcontext.h>
+#include <mythtv/mythmediamonitor.h>
 #include <mythtv/uitypes.h>
 
 #include "dvdripbox.h"
@@ -138 +139 @@
     //  timer to query whether the thread is done or not
     //
         
-    QString dvd_device = gContext->GetSetting("DVDDeviceLocation");
-    if(dvd_device.length() < 1)
-    {
-        cerr << "dvdripbox.o: Can't get a value for DVD device location. Did you run setup?" << endl;
-        exit(0);
-    }
+    QString dvd_device = MediaMonitor::defaultDVDdevice();
     dvd_info = NULL;
     disc_checking_timer = new QTimer();
     disc_checking_timer->start(600);

src/mythplugins/mythvideo/mythvideo/titledialog.cpp

@@ -17 +17 @@
 
 #include <mythtv/util.h>
 #include <mythtv/uitypes.h>
+#include <mythtv/mythmediamonitor.h>
 
 #include "titledialog.h"
 
@@ -324 +325 @@
         return;
     }
 
-    QString dvd_device = gContext->GetSetting("DVDDeviceLocation");
-    if(dvd_device.length() < 1)
-    {
-        cerr << "titledialog.o: No DVD device defined" << endl;
-        return;
-    }
+    QString dvd_device = MediaMonitor::defaultDVDdevice();
     
     int audio_track = 1;
     int channels = 2;

src/mythtv/libs/libmyth/mythmediamonitor.h

@@ -68 +68 @@
 
     void MonitorRegisterExtensions(uint mediaType, const QString &extensions);
 
+    // Plugins should use these if they need to access optical disks:
+    static QString defaultCDdevice();
+    static QString defaultVCDdevice();
+    static QString defaultDVDdevice();
+    static QString defaultWriter();
+
     virtual QStringList GetCDROMBlockDevices(void) = 0;
 
   public slots:
@@ -79 +85 @@
     virtual bool AddDevice(MythMediaDevice* pDevice) = 0;
     bool RemoveDevice(const QString &dev);
 
+    static QString   defaultDevice(const QString setting, const QString label);
+    MythMediaDevice *selectDrivePopup(const QString label, bool mounted=false);
+
   protected:
     QMutex                       m_DevicesLock;
     QValueList<MythMediaDevice*> m_Devices;

src/mythtv/libs/libmyth/mythmediamonitor.cpp

@@ -95 +95 @@
     return str;
 }
 
+/**
+ * \brief Popup a dialog box for the user to select one drive.
+ *  
+ * Has to iterate through all devices to check if any are suitable,
+ * prevent drawing a list if there is only one drive, et cetera
+ */ 
+MythMediaDevice * MediaMonitor::selectDrivePopup(const QString label,
+                                                 bool          listMounted)
+{       
+    QValueList <MythMediaDevice *>           drives;
+    QValueList <MythMediaDevice *>::iterator it = m_Devices.begin();
+    QMutexLocker                             locker(&m_DevicesLock);
+
+    //while (it != m_Devices.end())
+    for (it = m_Devices.begin(); it != m_Devices.end(); ++it)
+    {
+        // We can't currently tell if a MediaMonitor device is a CD/DVD,
+        // but if the device is ejectable that's probably safe.
+        // Caller can also request mounted drives to be listed:
+
+        if ((*it)->getAllowEject() || (listMounted && (*it)->isMounted()))
+            drives.append(*it);
+
+        //it++;
+    }
+
+    if (drives.count() == 0)
+    {
+        VERBOSE(VB_MEDIA, "MediaMonitor::selectDrivePopup("
+                          + label + ") - No suitable devices");
+        return NULL;
+    }
+
+    if (drives.count() == 1)
+    {
+        VERBOSE(VB_MEDIA, "MediaMonitor::selectDrivePopup("
+                          + label + ") - One suitable device");
+        return drives.front();
+    }
+
+    MythPopupBox box(gContext->GetMainWindow(), "select drive");
+    box.addLabel(label);
+    //it = drives.begin();
+    //while (it != drives.end())
+    //    box.addButton(DevName(*it++));
+    for (it = drives.begin(); it != drives.end(); ++it)
+        box.addButton(DevName(*it));
+
+    box.addButton(tr("Cancel"))->setFocus();
+
+    int ret = box.ExecPopup();
+
+    if ((uint)ret < drives.count())
+        return drives[ret];
+
+    return NULL;
+}
+
+
 /** \fn MediaMonitor::ChooseAndEjectMedia(void)
  *  \brief Unmounts and ejects removable media devices.
  *
@@ -105 +164 @@
  */
 void MediaMonitor::ChooseAndEjectMedia(void)
 {
-    MythMediaDevice *selected = NULL;
+    MythMediaDevice *selected;
 
-    QMutexLocker locker(&m_DevicesLock);
 
-    if (m_Devices.count() == 1)
-    {
-        if (m_Devices.first()->getAllowEject())
-            selected = m_Devices.first();
-    }
-    else if (m_Devices.count() > 1)
-    {
-        MythPopupBox ejectbox(gContext->GetMainWindow(), "eject media");
+    selected = selectDrivePopup(tr("Select removable media to eject"), true);
 
-        ejectbox.addLabel(tr("Select removable media to eject"));
-
-        QValueList <MythMediaDevice *> shownDevices;
-        QValueList <MythMediaDevice *>::iterator it = m_Devices.begin();
-        while (it != m_Devices.end())
-        {
-            // if the device is ejectable (ie a CD or DVD device)
-            // or if it is mounted (ie a USB memory stick)
-            // then add it to the list of choices
-            if ((*it)->getAllowEject() || (*it)->isMounted(true))
-            {
-                shownDevices.append(*it);
-                ejectbox.addButton(DevName(*it));
-            }
-
-            it++;
-        }
-
-        ejectbox.addButton(tr("Cancel"))->setFocus();
-
-        int ret = ejectbox.ExecPopup();
-
-        if ((uint)ret < shownDevices.count())
-            selected = shownDevices[ret];
-    }
-    else
+    if (!selected)
     {
         MythPopupBox::showOkPopup(gContext->GetMainWindow(),
                                   "nothing to eject ",
                                   tr("No devices to eject"));
+        return;
     }
 
-    if (!selected)
-        return;
-
     bool doEject = false;
     int   status = selected->getStatus();
     QString  dev = DevName(selected);
@@ -161 +185 @@
     {
         VERBOSE(VB_MEDIA,
                 QString("Disk %1's tray is OPEN. Closing tray").arg(dev));
-        selected->eject(false);
+
+        if (selected->eject(false))
+        {
+            QString msg = "Unable to work out if %1 is open or closed.";
+
+            msg += "\nYou may have to use the eject button on its tray.";
+            MythPopupBox::showOkPopup(gContext->GetMainWindow(),
+                                      "eject close-tray fail",
+                                      tr(msg).arg(dev));
+        }
     }
     else if (MEDIASTAT_MOUNTED == status)
     {
         VERBOSE(VB_MEDIA, QString("Disk %1 is mounted? Unmounting").arg(dev));
         selected->unmount();
 
-        if (selected->isMounted(true))
+        if (selected->isMounted(true) == MEDIAERR_FAILED)
         {
             MythPopupBox::showOkPopup(gContext->GetMainWindow(),
                                       "eject unmount fail",
@@ -430 +463 @@
         pMedia->clearData();
     }
 }
+
+/*
+ * These methods return the user's preferred devices for playing and burning
+ * CDs and DVDs. Traditionally we had a database setting to remember this,
+ * but that is a bit wasteful when most users only have one drive.
+ *
+ * To make it a bit more beginner friendly, if no database default exists,
+ * or if it contins "default", the code tries to guess the correct drive,
+ * or put a dialog box up if there are several valid options.
+ *
+ * Ideally, these would return a MythMediaDevice * instead of a QString
+ */
+
+QString MediaMonitor::defaultDevice(QString dbSetting, QString label)
+{
+    QString device = gContext->GetSetting(dbSetting);
+
+    // No settings database defaults. Try to choose one:
+    if (device.isEmpty() || device == "default")
+    {
+        if (!c_monitor)
+            c_monitor = GetMediaMonitor();
+
+        if (c_monitor)
+        {
+            MythMediaDevice *d = c_monitor->selectDrivePopup(label);
+
+            if (d)
+                return d->getDevicePath();
+        }
+    }
+
+    return device;
+}
+
+/**
+ * CDDevice, user-selected drive, or /dev/cdrom
+ */
+QString MediaMonitor::defaultCDdevice()
+{
+    QString device = defaultDevice("CDDevice",
+                                   tr("Select a CD drive"));
+    if (device.length())
+        return device;
+
+    // Last resort:
+    return "/dev/cdrom";
+}
+
+/**
+ * VCDDeviceLocation, user-selected drive, or /dev/cdrom
+ */
+QString MediaMonitor::defaultVCDdevice()
+{
+    QString device = defaultDevice("VCDDeviceLocation",
+                                   tr("Select a VCD drive"));
+    if (device.length())
+        return device;
+
+    // Last resort:
+    return "/dev/cdrom";
+}
+
+/**
+ * DVDDeviceLocation, user-selected drive, or /dev/dvd
+ */
+QString MediaMonitor::defaultDVDdevice()
+{
+    QString device = defaultDevice("DVDDeviceLocation",
+                                   tr("Select a DVD drive"));
+    if (device.length())
+        return device;
+
+    // Last resort:
+    return "/dev/dvd";
+}
+
+/**
+ * \brief MythArchiveDVDLocation, user-selected drive, or /dev/dvd
+ *
+ * This should also look for drives with blanks or RWs in them,
+ * but Nigel hasn't worked out how to do this tidily (yet).
+ */
+QString MediaMonitor::defaultWriter()
+{
+    QString device = defaultDevice("MythArchiveDVDLocation",
+                                   tr("Select a DVD writer"));
+    if (device.length())
+        return device;
+
+    // Absolute last resort:
+    return "/dev/dvd";
+}