Ticket #3077: mythmusic-cddevices.diff

mythmusic/mythmusic/globalsettings.cpp

@@ -12 +12 @@
 #include <qprocess.h>
 #include <qapplication.h>
 #include <mythtv/util.h>
+#include <mythtv/mythmediamonitor.h>
 
 // General Settings
 
@@ -53 +54 @@
 {
     HostComboBox *gc = new HostComboBox("CDDevice", true);
     gc->setLabel(QObject::tr("CD device"));
-    QDir dev("/dev", "cdrom*", QDir::Name, QDir::System);
-    gc->fillSelectionsFromDir(dev);
-    dev.setNameFilter("scd*");
-    gc->fillSelectionsFromDir(dev);
-    dev.setNameFilter("hd*");
-    gc->fillSelectionsFromDir(dev);
-
-    dev.setNameFilter("cdrom*");
-    dev.setPath("/dev/cdroms");
-    gc->fillSelectionsFromDir(dev);
-    gc->setHelpText(QObject::tr("CDRom device used for ripping/playback."));
+    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("CDRom device used for ripping/playback. 'default' will use the device specified in MythTV"));
     return gc;
 };
 
@@ -388 +385 @@
 
 static HostComboBox *CDWriterDevice()
 {
-    HostComboBox *gc = new HostComboBox("CDWriterDevice");
-
-    QString argadd[3]  = { "", "-dev=ATA", "-dev=ATAPI" };
-    QString prepend[3] = { "", "ATA:", "ATAPI:" };
-
-    for (int i = 0; i < 3; i++)
-    {
-        QStringList args;
-        QStringList result;
-
-        args = "cdrecord";
-        args += "--scanbus";
-
-        if (argadd[i].length() > 1)
-            args += argadd[i];
-
-        QProcess proc(args);
-
-        MythTimer totaltimer;
-    
-        if (proc.start())
-        {
-            totaltimer.start();
-
-            while (1)
-            {
-                while (proc.canReadLineStdout())
-                    result += proc.readLineStdout();
-                if (proc.isRunning())
-                {
-                    qApp->processEvents();
-                    usleep(10000);
-                }
-                else
-                {
-                    if (!proc.normalExit())
-                        cerr << "Failed to run 'cdrecord --scanbus'\n";
-                    break;
-                }
-
-                if (totaltimer.elapsed() > 1500)
-                    proc.kill();
-            }
-        }
-        else
-            cerr << "Failed to run 'cdrecord --scanbus'\n";
-
-        while (proc.canReadLineStdout())
-            result += proc.readLineStdout();
-
-        for (QStringList::Iterator it = result.begin(); it != result.end();
-             ++it)
-        {
-            QString line = *it;
-            if (line.length() > 12)
-            {
-                if (line[10] == ')' && line[12] != '*')
-                {
-                    gc->addSelection(line.mid(24, 16), prepend[i] + 
-                                                       line.mid(1, 5));
-cout << "adding: " << prepend[i] + line.mid(1, 5) << " -- " << line.mid(24, 16) << endl;
-                }
-            }
-        }
-    }
-    
+    HostComboBox *gc = new HostComboBox("CDWriterDevice", true);
     gc->setLabel(QObject::tr("CD-Writer Device"));
-    gc->setHelpText(QObject::tr("Select the SCSI or IDE Device for CD Writing."));
+    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("CD/DVD writer device for CD Writing. 'default' will use the device specified in MythTV"));
     return gc;
 };
 
@@ -463 +401 @@
 {
     HostComboBox *gc = new HostComboBox("CDDiskSize");
     gc->setLabel(QObject::tr("Disk Size"));
-    gc->addSelection(QObject::tr("650MB/75min"), "1");
+    gc->addSelection(QObject::tr("650MB/74min"), "1");
     gc->addSelection(QObject::tr("700MB/80min"), "2");
     gc->setHelpText(QObject::tr("Default CD Capacity."));
     return gc;

mythmusic/mythmusic/playlist.cpp

@@ -1584 +1584 @@
     }
 
     QString scsidev = gContext->GetSetting("CDWriterDevice");
+    if (scsidev == "default")
+        scsidev = gContext->GetSetting("defaultCDDevice");
     if (scsidev.isEmpty() || scsidev.isNull()) 
     {
         cerr << "No CD Writer device defined.\n";

mythmusic/mythmusic/databasebox.cpp

@@ -407 +407 @@
     }
 
     QString scsidev = gContext->GetSetting("CDWriterDevice");
-    if (scsidev.length()==0) 
+    if (scsidev == "default")
+        scsidev = gContext->GetSetting("defaultCDDevice");
+    if (scsidev.isEmpty() || scsidev.isNull()) 
     {
-        cerr << "playlist.o: We don't have SCSI devices" << endl ;
+        cerr << "No CD Writer device defined.\n";
         return;
     }
+
     // Begin Blanking
     MythProgressDialog *record_progress;
     record_progress = new MythProgressDialog(tr("CD-RW Blanking Progress"), 10);
@@ -836 +839 @@
     if (gContext->GetNumSetting("CDWriterEnabled")) 
     {
         QString scsidev = gContext->GetSetting("CDWriterDevice");
+        if (scsidev == "default")
+            scsidev = gContext->GetSetting("defaultCDDevice");
+
         if (!scsidev.isEmpty() && !scsidev.isNull())
             cdwriter = true;
     }

mythmusic/mythmusic/cddecoder.cpp

@@ -41 +41 @@
     settracknum = -1;
 
     devicename = gContext->GetSetting("CDDevice");
+    if (devicename == "default")
+        devicename = gContext->GetSetting("defaultCDDevice");
 }
 
 CdDecoder::~CdDecoder(void)