[vlc-devel] commit: Add "" around DVD/VCD/CDDA devices... Should help to play . iso and VIDEO_TS folder with spaces in it. Watch that for any regressions. (Jean-Baptiste Kempf )

git version control git at videolan.org
Sat Mar 22 21:23:18 CET 2008


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar 22 13:22:29 2008 -0700| [26343f3df922a3db76aa985fa1b1354460073660]

Add "" around DVD/VCD/CDDA devices... Should help to play .iso and VIDEO_TS folder with spaces in it. Watch that for any regressions.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=26343f3df922a3db76aa985fa1b1354460073660
---

 modules/gui/qt4/components/open_panels.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index c187aa7..40b053f 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -337,9 +337,9 @@ void DiscOpenPanel::updateMRL()
     /* DVD */
     if( ui.dvdRadioButton->isChecked() ) {
         if( !ui.dvdsimple->isChecked() )
-            mrl = "dvd://";
+            mrl = "\"dvd://";
         else
-            mrl = "dvdsimple://";
+            mrl = "\"dvdsimple://";
         mrl += ui.deviceCombo->currentText();
         emit methodChanged( "dvdnav-caching" );
 
@@ -352,7 +352,7 @@ void DiscOpenPanel::updateMRL()
 
     /* VCD */
     } else if ( ui.vcdRadioButton->isChecked() ) {
-        mrl = "vcd://" + ui.deviceCombo->currentText();
+        mrl = "\"vcd://" + ui.deviceCombo->currentText();
         emit methodChanged( "vcd-caching" );
 
         if( ui.titleSpin->value() > 0 ) {
@@ -361,12 +361,14 @@ void DiscOpenPanel::updateMRL()
 
     /* CDDA */
     } else {
-        mrl = "cdda://" + ui.deviceCombo->currentText();
+        mrl = "\"cdda://" + ui.deviceCombo->currentText();
         if( ui.titleSpin->value() > 0 ) {
             QString("@%1").arg( ui.titleSpin->value() );
         }
     }
 
+    mrl += "\"";
+
     if ( ui.dvdRadioButton->isChecked() || ui.vcdRadioButton->isChecked() )
     {
         if ( ui.audioSpin->value() >= 0 ) {




More information about the vlc-devel mailing list