Changeset 163 for smplayer/vendor/current/src/discname.cpp

Timestamp:

May 15, 2014, 7:53:54 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.7

File:

• smplayer/vendor/current/src/discname.cpp (modified) (5 diffs)

smplayer/vendor/current/src/discname.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -40 +40 @@
                 case VCD: protocol = "vcd"; break;
                 case CDDA: protocol = "cdda"; break;
+                case BLURAY: protocol = "br"; 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|br)://(\\d+)/(.*)");
+        QRegExp rx2("^(dvd|dvdnav|vcd|cdda|br)://(\\d+)");
+        QRegExp rx3("^(dvd|dvdnav|vcd|cdda|br):///(.*)");
+        QRegExp rx4("^(dvd|dvdnav|vcd|cdda|br):(.*)");
 
         DiscData d;
@@ -145 +146 @@
         d = split( "dvdnav:////dev/dvdrecorder/" );
 
+        d = split( "br://1//dev/dvd" );
+        d = split( "br://1/D:/" );
+        d = split( "br://5" );
+        d = split( "br://" );
+        d = split( "br:////dev/dvdrecorder/" );
+
         QString s;
         s = join( DVD, 4, "/dev/dvd/" );
@@ -156 +163 @@
         s = joinDVD( 3, "", true );
         s = join( VCD, 3, "" );
+        s = join( BLURAY, 2, "/dev/cdrom");
 }
 #endif