[vlc-commits] Qt4: DVB-T2 in open dialog

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May 11 19:54:14 2011 +0300| [422238b7150f7863970f3e7173e9a54c64c825f4] | committer: Rémi Denis-Courmont

Qt4: DVB-T2 in open dialog

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

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

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index a70bd18..b3096a4 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -942,17 +942,19 @@ void CaptureOpenPanel::initialize()
     dvbs = new QRadioButton( "DVB-S" );
     dvbs2 = new QRadioButton( "DVB-S2" );
     dvbt = new QRadioButton( "DVB-T" );
+    dvbt2 = new QRadioButton( "DVB-T2" );
     atsc = new QRadioButton( "ATSC" );
     cqam = new QRadioButton( "Clear QAM" );
     dvbt->setChecked( true );
 
     dvbDevLayout->addWidget( dvbTypeLabel, 1, 0, 2, 1 );
-    dvbDevLayout->addWidget( dvbc, 1, 1 );
-    dvbDevLayout->addWidget( dvbs, 1, 2 );
+    dvbDevLayout->addWidget( dvbc,  1, 1 );
+    dvbDevLayout->addWidget( dvbs,  1, 2 );
     dvbDevLayout->addWidget( dvbs2, 2, 2 );
-    dvbDevLayout->addWidget( dvbt, 1, 3 );
-    dvbDevLayout->addWidget( atsc, 1, 4 );
-    dvbDevLayout->addWidget( cqam, 2, 4 );
+    dvbDevLayout->addWidget( dvbt,  1, 3 );
+    dvbDevLayout->addWidget( dvbt2, 2, 3 );
+    dvbDevLayout->addWidget( atsc,  1, 4 );
+    dvbDevLayout->addWidget( cqam,  2, 4 );
 
     /* DVB Props panel */
     QLabel *dvbFreqLabel =
@@ -1027,10 +1029,12 @@ void CaptureOpenPanel::initialize()
     BUTTONACT( dvbs, updateButtons() );
     BUTTONACT( dvbs2, updateButtons() );
     BUTTONACT( dvbt, updateButtons() );
+    BUTTONACT( dvbt2, updateButtons() );
     BUTTONACT( atsc, updateButtons() );
     BUTTONACT( cqam, updateButtons() );
     BUTTONACT( dvbc, updateMRL() );
     BUTTONACT( dvbt, updateMRL() );
+    BUTTONACT( dvbt2, updateMRL() );
     BUTTONACT( dvbs, updateMRL() );
     BUTTONACT( dvbs2, updateMRL() );
     BUTTONACT( atsc, updateMRL() );
@@ -1143,6 +1147,8 @@ void CaptureOpenPanel::updateMRL()
         else
         if( dvbt->isChecked() ) mrl = "dvb-t://";
         else
+        if( dvbt2->isChecked() ) mrl = "dvb-t2://";
+        else
         if( atsc->isChecked() ) mrl = "atsc://";
         else
         if( cqam->isChecked() ) mrl = "cqam://";
@@ -1157,7 +1163,7 @@ void CaptureOpenPanel::updateMRL()
                 + dvbPskBox->itemData( dvbPskBox->currentIndex() ).toString();
         if( dvbc->isChecked() || dvbs->isChecked() || dvbs2->isChecked() )
             mrl += ":srate=" + QString::number( dvbSrate->value() );
-        if( dvbt->isChecked() )
+        if( dvbt->isChecked() || dvbt2->isChecked() )
             mrl += ":bandwidth=" +
                 QString::number( dvbBandBox->itemData(
                     dvbBandBox->currentIndex() ).toInt() );
@@ -1224,7 +1230,7 @@ void CaptureOpenPanel::updateButtons()
             dvbPskBox->show();
             dvbModLabel->show();
         }
-        else if( dvbt->isChecked() )
+        else if( dvbt->isChecked() || dvbt2->isChecked() )
         {
             dvbBandBox->show();
             dvbBandLabel->show();
diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp
index 627e5bc..b5e3f45 100644
--- a/modules/gui/qt4/components/open_panels.hpp
+++ b/modules/gui/qt4/components/open_panels.hpp
@@ -211,7 +211,7 @@ private:
     QCheckBox *jackPace, *jackConnect;
     QLineEdit *jackPortsSelected;
 #endif
-    QRadioButton *dvbc, *dvbs, *dvbs2, *dvbt, *atsc, *cqam;
+    QRadioButton *dvbc, *dvbs, *dvbs2, *dvbt, *dvbt2, *atsc, *cqam;
     QLabel *dvbBandLabel, *dvbSrateLabel, *dvbModLabel;
     QComboBox *dvbQamBox, *dvbPskBox, *dvbBandBox;
     QSpinBox *dvbCard, *dvbFE, *dvbFreq, *dvbSrate;