Ticket #3077: mediamonitor-scd-fix.diff

mythtv/libs/libmyth/mediamonitor-unix.cpp

@@ -238 +238 @@
     if (devpath.isSymLink())
         devname = devpath.readLink();
 
+        // Given something like /dev/hda1, extract hda1
+        devname = devname.mid(5,5);     
 
-    // Given something like /dev/sdb1, extract sdb
-    devname = devname.mid(5,3);
-
-
 #ifdef linux
     if (devname.startsWith("hd"))  // IDE drive
     {
+                devname = devname.left(3); // Given hda1, extract hda
+
         QFile  file("/proc/ide/" + devname + "/model");
         if (file.open(IO_ReadOnly))
         {
@@ -256 +256 @@
         }
     }
 
-    if (devname.startsWith("sd"))  // SATA/USB/FireWire
+        else if ((devname.startsWith("sd"))||(devname.startsWith("sr"))||(devname.startsWith("scd")))  // SATA/USB/FireWire
     {
-        QString path = devname.prepend("/sys/block/");
+
+                if (devname.startsWith("scd")) // scd0 doesn't appear in /sys/block, use sr0 instead
+                        devname="sr" + devname.mid(3);
+
+                QString path = devname.prepend("/sys/block/");
         path.append("/device/");
 
         QFile  file(path + "vendor");