Ticket #6276: 00-6276-mythmusic-cddevices.2.patch

mythplugins/mythmusic/mythmusic/globalsettings.cpp

@@ -67 +67 @@
     return gc;
 };
 
-static HostComboBox *CDDevice()
+static HostLineEdit *CDDevice()
 {
-    HostComboBox *gc = new HostComboBox("CDDevice", true);
+    HostLineEdit *gc = new HostLineEdit("CDDevice");
     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->setValue("default");
     gc->setHelpText(QObject::tr("CDRom device used for ripping/playback."));
     return gc;
 };
@@ -492 +483 @@
     return gc;
 };
 
-static HostComboBox *CDWriterDevice()
+static HostLineEdit *CDWriterDevice()
 {
-    HostComboBox *gc = new HostComboBox("CDWriterDevice");
-
-    typedef std::vector<std::pair<QString, QString> > search_cmd_list;
-    search_cmd_list search_types;
-    search_types.push_back(std::make_pair("", ""));
-    search_types.push_back(std::make_pair("-dev=ATA", "ATA:"));
-    search_types.push_back(std::make_pair("-dev=ATAPI", "ATAPI:"));
-
-    const QString scan_command("cdrecord");
-    for (search_cmd_list::const_iterator p = search_types.begin();
-            p != search_types.end(); ++p)
-    {
-        QStringList args;
-        args << "--scanbus";
-        if (p->first.size())
-            args << p->first;
-
-        QProcess proc;
-
-        proc.start(scan_command, args, QIODevice::ReadOnly);
-        if (proc.waitForStarted() && proc.waitForFinished(1500) &&
-                proc.exitStatus() == QProcess::NormalExit)
-        {
-            QTextStream output(&proc);
-
-            QString line;
-            while (!(line = output.readLine()).isNull())
-            {
-                if (line.length() > 12)
-                {
-                    if (line[10] == ')' && line[12] != '*')
-                    {
-                        QString name = line.mid(24, 16);
-                        QString dev  = p->second + line.mid(1, 5);
-
-                        gc->addSelection(name, dev);
-                        VERBOSE(VB_GENERAL,
-                                QString("MythMusic adding CD-Writer: %1 -- %2")
-                                .arg(dev).arg(name));
-                    }
-                }
-            }
-        }
-        else
-        {
-                VERBOSE(VB_GENERAL, QString("Failed to run '%1 %2' "
-                                "error code: %3").arg(scan_command)
-                        .arg(args.join(" ")).arg(proc.error()));
-        }
-    }
-
+    HostLineEdit *gc = new HostLineEdit("CDWriterDevice");
+    gc->setValue("default");
     gc->setLabel(QObject::tr("CD-Writer Device"));
     gc->setHelpText(QObject::tr("Select the SCSI or IDE Device for CD Writing."));
     return gc;

mythplugins/mythmusic/mythmusic/playlist.cpp

@@ -18 +18 @@
 #include <mythcontext.h>
 #include <mythdb.h>
 #include <compat.h>
+#include <mythmediamonitor.h>
 
 const char *kID0err = "Song with ID of 0 in playlist, this shouldn't happen.";
 
@@ -1180 +1181 @@
         return 1;
     }
 
-    QString scsidev = gContext->GetSetting("CDWriterDevice");
+    QString scsidev = MediaMonitor::defaultCDWriter();
     if (scsidev.isEmpty() || scsidev.isNull())
     {
         VERBOSE(VB_GENERAL, "No CD Writer device defined.");

mythplugins/mythmusic/mythmusic/databasebox.cpp

@@ -18 +18 @@
 #include <mythtv/lcddevice.h>
 #include <mythtv/uitypes.h>
 #include <mythtv/uilistbtntype.h>
+#include <mythtv/mythmediamonitor.h>
 
 // mythmusic
 #include "metadata.h"
@@ -421 +422 @@
         return;
     }
 
-    QString scsidev = gContext->GetSetting("CDWriterDevice");
-    if (scsidev.length()==0)
+    QString scsidev = MediaMonitor::defaultCDWriter();
+    if (scsidev.isEmpty() || scsidev.isNull())
     {
-        VERBOSE(VB_GENERAL, "We don't have SCSI devices");
+        VERBOSE(VB_GENERAL, "No CD Writer device defined.");
         return;
     }
+
     // Begin Blanking
     MythProgressDialog *record_progress;
     record_progress = new MythProgressDialog(tr("CD-RW Blanking Progress"), 10);
@@ -865 +867 @@
 
     if (gContext->GetNumSetting("CDWriterEnabled"))
     {
-        QString scsidev = gContext->GetSetting("CDWriterDevice");
+        QString scsidev = MediaMonitor::defaultCDWriter();
         if (!scsidev.isEmpty() && !scsidev.isNull())
             cdwriter = true;
     }