Ticket #7135: mediamonitor.diff

mediamonitor-unix.cpp

@@ -223 +223 @@
     QTextStream  stream(udevinfo);
     QStringList  args;
 
+    args << "info";
     args << "-q";
     args << "name";
     args << "-rp";
@@ -231 +232 @@
 
     if (!udevinfo->waitForStarted(2000 /*ms*/))
     {
-        VERBOSE(VB_MEDIA, msg + ", Error - udevinfo failed to start!");
+        VERBOSE(VB_MEDIA, msg + ", Error - udevadm missing/failed to start!");
         udevinfo->deleteLater();
         return ret;
     }
@@ -239 +240 @@
     if (!udevinfo->waitForFinished(2000 /*ms*/))
     {
         VERBOSE(VB_MEDIA,
-                msg + ", Error - udevinfo failed to end! Terminating");
+                msg + ", Error - udevadm failed to end! Terminating");
         udevinfo->kill();
         udevinfo->deleteLater();
         return ret;
@@ -252 +253 @@
         while (!stream.atEnd())
         {
             VERBOSE(VB_MEDIA+VB_EXTRA,
-                    msg + " - udevinfo error...\n" + stream.readLine());
+                    msg + " - udevadm error...\n" + stream.readLine());
         }
     }
 
     udevinfo->setReadChannel(QProcess::StandardOutput);
 
     ret = stream.readLine();
-    if (ret.startsWith("device not found in database"))
+    if (ret.startsWith("device path not found"))
         return ret;
 
     udevinfo->deleteLater();