Ticket #9268: pathname.diff

mythtv/libs/libmythtv/RingBuffer.cpp

@@ -358 +358 @@
             filename.remove(0,5);              //             e.g. "dvd://dev/sda"
         else if (filename.left(5) == "dvd:/")  // Less correct URI "dvd:" + path
             filename.remove(0,4);              //             e.g. "dvd:/videos/ET"
+        else if (filename.left(4) == "dvd:")   // Win32 URI "dvd:" + abs path
+            filename.remove(0,4);              //             e.g. "dvd:D:\"
 
         if (QFile::exists(filename) || filename.startsWith("myth://"))
             VERBOSE(VB_PLAYBACK, "OpenFile() trying DVD at " + filename);

mythtv/libs/libmythmetadata/videoutils.cpp

@@ -74 +74 @@
 
     if (host.isEmpty())
     {
+#ifdef WIN32
         QStringList tmp3 = gCoreContext->GetSetting("VideoStartupDir",
+                    DEFAULT_VIDEOSTARTUP_DIR).split(";", QString::SkipEmptyParts);
+#else
+        QStringList tmp3 = gCoreContext->GetSetting("VideoStartupDir",
                     DEFAULT_VIDEOSTARTUP_DIR).split(":", QString::SkipEmptyParts);
+#endif
         for (QStringList::iterator p = tmp3.begin(); p != tmp3.end(); ++p)
         {
             bool matches = false;