vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Oct 10 17:06:12 2010 +0300| [ea1799418b4ce1293742692d929a2afcd6f7f8b2] | committer: Rémi Denis-Courmont
Qt4: update discs MRL syntax for Windows > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ea1799418b4ce1293742692d929a2afcd6f7f8b2 --- modules/gui/qt4/components/open_panels.cpp | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp index 6701bcd..ab9a091 100644 --- a/modules/gui/qt4/components/open_panels.cpp +++ b/modules/gui/qt4/components/open_panels.cpp @@ -466,6 +466,12 @@ void DiscOpenPanel::updateButtons() #undef setDrive +#ifndef WIN32 +# define LOCALHOST "" +#else +# define LOCALHOST "/" +#endif + /* Update the current MRL */ void DiscOpenPanel::updateMRL() { @@ -476,9 +482,9 @@ void DiscOpenPanel::updateMRL() /* DVD */ if( ui.dvdRadioButton->isChecked() ) { if( !ui.dvdsimple->isChecked() ) - mrl = "dvd://"; + mrl = "dvd://" LOCALHOST; else - mrl = "dvdsimple://"; + mrl = "dvdsimple://" LOCALHOST; mrl += ui.deviceCombo->currentText(); if( !ui.dvdsimple->isChecked() ) emit methodChanged( "dvdnav-caching" ); @@ -494,7 +500,7 @@ void DiscOpenPanel::updateMRL() /* VCD */ } else if ( ui.vcdRadioButton->isChecked() ) { - mrl = "vcd://" + ui.deviceCombo->currentText(); + mrl = "vcd://" LOCALHOST + ui.deviceCombo->currentText(); emit methodChanged( "vcd-caching" ); if( ui.titleSpin->value() > 0 ) { @@ -503,7 +509,7 @@ void DiscOpenPanel::updateMRL() /* CDDA */ } else { - mrl = "cdda://" + ui.deviceCombo->currentText(); + mrl = "cdda://" LOCALHOST + ui.deviceCombo->currentText(); emit methodChanged( "cdda-caching" ); } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
