Ticket #3077: mytharchive-cddevices.diff

mytharchive/archivesettings.cpp

@@ -6 +6 @@
 
 // myth
 #include <mythtv/mythcontext.h>
+#include <mythtv/mythmediamonitor.h>
 
 // mytharchive
 #include "archivesettings.h"
@@ -50 +51 @@
     return gc;
 };
 
-static HostLineEdit *MythArchiveDVDLocation()
+static HostComboBox *MythArchiveDVDLocation()
 {
-    HostLineEdit *gc = new HostLineEdit("MythArchiveDVDLocation");
+    HostComboBox *gc = new HostComboBox("MythArchiveDVDLocation", true);
     gc->setLabel(QObject::tr("Location of DVD"));
-    gc->setValue("/dev/dvd");
-    gc->setHelpText(QObject::tr("Which DVD drive to use when burning discs."));
+    gc->addSelection(QObject::tr("default"), "default");
+    MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
+    QStringList cdroms = mon->GetCDROMBlockDevices();
+    QStringList::iterator iter = cdroms.begin();
+        for (; iter != cdroms.end(); iter++ )
+            gc->addSelection("/dev/"+*iter);
+    gc->setHelpText(QObject::tr("Which DVD drive to use when burning discs. 'default' will use the device specified in MythTV"));
     return gc;
 };
 

mytharchivehelper/main.cpp

@@ -167 +167 @@
 int burnISOImage(int mediaType, bool bEraseDVDRW, bool nativeFormat)
 {
     QString dvdDrive = gContext->GetSetting("MythArchiveDVDLocation", "/dev/dvd");
+    if (dvdDrive == "default")
+        dvdDrive = gContext->GetSetting("defaultDVDDevice");
+
     VERBOSE(VB_JOBQUEUE, "Burning ISO image to " + dvdDrive);
 
     QString tempDirectory = gContext->GetSetting("MythArchiveTempDir", "");

mythburn/scripts/mythburn.py

@@ -553 +553 @@
                         'MythArchiveMpg123Cmd',
                         'MythArchiveProjectXCmd',
                         'MythArchiveDVDLocation',
+                        'defaultDVDDevice',
                         'MythArchiveGrowisofsCmd',
                         'MythArchiveJpeg2yuvCmd',
                         'MythArchiveSpumuxCmd',
@@ -3885 +3886 @@
 temppath = defaultsettings["MythArchiveTempDir"] + "/work"
 logpath = defaultsettings["MythArchiveTempDir"] + "/logs"
 dvddrivepath = defaultsettings["MythArchiveDVDLocation"]
+if dvddrivepath == 'default':
+    dvddrivepath = defaultsettings["defaultDVDDevice"]
 dbVersion = defaultsettings["DBSchemaVer"]
 preferredlang1 = defaultsettings["ISO639Language0"]
 preferredlang2 = defaultsettings["ISO639Language1"]