Changeset 165 for smplayer/trunk/src/discname.cpp

Timestamp:

May 16, 2014, 9:51:55 AM (12 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to latest 0.8.7

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/discname.cpp (modified) (5 diffs)

smplayer/trunk/src/discname.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <[email protected]>
+    Copyright (C) 2006-201 Ricardo Villalba <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
@@ -40 +40 @@
                 case VCD: protocol = "vcd"; break;
                 case CDDA: protocol = "cdda"; break;
+
         }
         return join( DiscData(protocol, title, device) );
@@ -47 +48 @@
         qDebug("DiscName::split: disc_url: '%s'", disc_url.toUtf8().constData());
 
-        QRegExp rx1("^(dvd|dvdnav|vcd|cdda)://(\\d+)/(.*)");
-        QRegExp rx2("^(dvd|dvdnav|vcd|cdda)://(\\d+)");
-        QRegExp rx3("^(dvd|dvdnav|vcd|cdda):///(.*)");
-        QRegExp rx4("^(dvd|dvdnav|vcd|cdda):(.*)");
+        QRegExp rx1("^(dvd|dvdnav|vcd|cdda)://(\\d+)/(.*)");
+        QRegExp rx2("^(dvd|dvdnav|vcd|cdda)://(\\d+)");
+        QRegExp rx3("^(dvd|dvdnav|vcd|cdda):///(.*)");
+        QRegExp rx4("^(dvd|dvdnav|vcd|cdda):(.*)");
 
         DiscData d;
@@ -145 +146 @@
         d = split( "dvdnav:////dev/dvdrecorder/" );
 
+
+
+
+
+
+
         QString s;
         s = join( DVD, 4, "/dev/dvd/" );
@@ -156 +163 @@
         s = joinDVD( 3, "", true );
         s = join( VCD, 3, "" );
+
 }
 #endif