[vlc-devel] commit: Qt: use dvb://frequency= iso dvb:// :dvb-frequency= ( Jean-Baptiste Kempf )

git version control git at videolan.org
Fri May 1 16:46:42 CEST 2009


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri May  1 16:12:44 2009 +0200| [0fa8b0e05a3441592870584d7961a63524e577e8] | committer: Jean-Baptiste Kempf 

Qt: use dvb://frequency= iso dvb:// :dvb-frequency=

This affects Opening of DVB and BDA.

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

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

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index a01d4b0..9beeab8 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -1103,11 +1103,11 @@ void CaptureOpenPanel::updateMRL()
         else if(  bdac->isChecked() ) mrl = "dvb-c://";
         else if(  bdaa->isChecked() ) mrl = "atsc://";
         else return;
-        fileList << mrl; mrl = "";
-
-        mrl += " :dvb-frequency=" + QString::number( bdaFreq->value() );
+        mrl += "frequency=" + QString::number( bdaFreq->value() );
         if( bdac->isChecked() || bdat->isChecked() || bdaa->isChecked() )
             mrl +="000";
+        fileList << mrl; mrl = "";
+
         if( bdas->isChecked() || bdac->isChecked() )
             mrl += " :dvb-srate=" + QString::number( bdaSrate->value() );
         else if( bdat->isChecked() || bdaa->isChecked() )
@@ -1165,11 +1165,13 @@ void CaptureOpenPanel::updateMRL()
             mrl += " :pvr-bitrate=" + QString::number( pvrBitr->value() );
         break;
     case DVB_DEVICE:
-        fileList << "dvb://";
-        mrl += " :dvb-adapter=" + QString::number( dvbCard->value() );
-        mrl += " :dvb-frequency=" + QString::number( dvbFreq->value() );
+        mrl = "dvb://";
+        mrl += "frequency=" + QString::number( dvbFreq->value() );
         if( dvbc->isChecked() || dvbt->isChecked() )
             mrl +="000";
+        fileList << mrl; mrl= "";
+
+        mrl += " :dvb-adapter=" + QString::number( dvbCard->value() );
         if( dvbs->isChecked() || dvbc->isChecked() )
             mrl += " :dvb-srate=" + QString::number( dvbSrate->value() );
         else if( dvbt->isChecked() )




More information about the vlc-devel mailing list