Ticket #3077: mythtv-defaultcddevices.diff

libs/libmyth/mythmediamonitor.h

@@ -72 +72 @@
 
     void MonitorRegisterExtensions(uint mediaType, const QString &extensions);
 
+    static QStringList GetCDROMBlockDevices(void);
+    
   public slots:
     void mediaStatusChanged(MediaStatus oldStatus, MythMediaDevice* pMedia);
 
@@ -89 +91 @@
 
     QString GetDeviceFile(const QString &sysfs);
 
-    static QStringList GetCDROMBlockDevices(void);
 
+
   protected:
     QMutex                       m_DevicesLock;
     QValueList<MythMediaDevice*> m_Devices;

programs/mythfrontend/globalsettings.cpp

@@ -20 +20 @@
 #include "util-x11.h"
 #include "DisplayRes.h"
 #include "uitypes.h"
+#include <mythtv/mythmediamonitor.h>
 
 static HostComboBox *AudioOutputDevice()
 {
@@ -2622 +2623 @@
     return gs;
 }
 
+static HostComboBox *defaultCDDevice()
+{
+    HostComboBox *gc = new HostComboBox("defaultCDDevice", true);
+    gc->setLabel(QObject::tr("Default CD Device"));
+    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("Default CD device"));
+    return gc;
+}
+
+static HostComboBox *defaultDVDDevice()
+{
+    HostComboBox *gc = new HostComboBox("defaultDVDDevice", true);
+    gc->setLabel(QObject::tr("Default DVD device"));
+    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("Default DVD device"));
+    return gc;
+}
+
 static HostCheckBox *EnableMediaMon()
 {
     HostCheckBox *gc = new HostCheckBox("MonitorDrives");
@@ -3474 +3517 @@
     general->setLabel(QObject::tr("General"));
     general->addChild(SetupPinCodeRequired());
     general->addChild(SetupPinCode());
+    general->addChild(defaultCDDevice());
+    general->addChild(defaultDVDDevice());
     general->addChild(EnableMediaMon());
     general->addChild(EnableXbox());
     addChild(general);