[vlc-commits] Qt4: pass DVB parameters through MRL rather than options

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Mar 24 00:14:33 2011 +0200| [74b24809d80cd7c8302e8523ce9f6999d34ebf84] | committer: Rémi Denis-Courmont

Qt4: pass DVB parameters through MRL rather than options

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

 modules/gui/qt4/components/open_panels.cpp |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index cc9f529..ed71cee 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -1222,25 +1222,25 @@ void CaptureOpenPanel::updateMRL()
         mrl = "dvb://";
         mrl += "frequency=" + QString::number( dvbFreq->value() );
         if( dvbc->isChecked() || dvbt->isChecked() )
-            mrl +="000";
-        fileList << mrl; mrl= "";
+            mrl += "000";
 
-        mrl += " :dvb-adapter=" + QString::number( dvbCard->value() );
         if( dvbc->isChecked() )
         {
             unsigned qam =
                 dvbModBox->itemData( dvbModBox->currentIndex() ).toInt();
             if( qam != 0 )
-                mrl += " :dvb-modulation=" + QString::number( qam );
-            mrl += " :dvb-srate=" + QString::number( dvbSrate->value() );
+                mrl += ":modulation=" + QString::number( qam );
+            mrl += ":srate=" + QString::number( dvbSrate->value() );
         }
         else if( dvbs->isChecked() )
-            mrl += " :dvb-srate=" + QString::number( dvbSrate->value() );
+            mrl += ":srate=" + QString::number( dvbSrate->value() );
         else if( dvbt->isChecked() )
-            mrl += " :dvb-bandwidth=" +
+            mrl += ":bandwidth=" +
                 QString::number( dvbBandBox->itemData(
                     dvbBandBox->currentIndex() ).toInt() );
 
+        fileList << mrl; mrl= "";
+        mrl += " :dvb-adapter=" + QString::number( dvbCard->value() );
         break;
 #endif
     case SCREEN_DEVICE: