vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Mar 27 13:38:42 2011 +0300| [4eb307c4ead80b2fe3b581733bc833aa9f746635] | committer: Rémi Denis-Courmont
Qt4: add DVB-S2 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4eb307c4ead80b2fe3b581733bc833aa9f746635 --- modules/gui/qt4/components/open_panels.cpp | 19 +++++++++++++++---- modules/gui/qt4/components/open_panels.hpp | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp index 63b272f..6c04161 100644 --- a/modules/gui/qt4/components/open_panels.cpp +++ b/modules/gui/qt4/components/open_panels.cpp @@ -953,17 +953,19 @@ void CaptureOpenPanel::initialize() dvbc = new QRadioButton( "DVB-C" ); dvbs = new QRadioButton( "DVB-S" ); + dvbs2 = new QRadioButton( "DVB-S2" ); dvbt = new QRadioButton( "DVB-T" ); atsc = new QRadioButton( "ATSC" ); cqam = new QRadioButton( "Clear QAM" ); dvbt->setChecked( true ); - dvbDevLayout->addWidget( dvbTypeLabel, 1, 0 ); + dvbDevLayout->addWidget( dvbTypeLabel, 1, 0, 2, 1 ); 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, 1, 5 ); + dvbDevLayout->addWidget( cqam, 2, 4 ); /* DVB Props panel */ QLabel *dvbFreqLabel = @@ -1024,14 +1026,16 @@ void CaptureOpenPanel::initialize() CuMRL( dvbQamBox, currentIndexChanged ( int ) ); CuMRL( dvbBandBox, currentIndexChanged ( int ) ); + BUTTONACT( dvbc, updateButtons() ); BUTTONACT( dvbs, updateButtons() ); + BUTTONACT( dvbs2, updateButtons() ); BUTTONACT( dvbt, updateButtons() ); - BUTTONACT( dvbc, updateButtons() ); BUTTONACT( atsc, updateButtons() ); BUTTONACT( cqam, updateButtons() ); BUTTONACT( dvbs, updateMRL() ); BUTTONACT( dvbt, updateMRL() ); BUTTONACT( dvbs, updateMRL() ); + BUTTONACT( dvbs2, updateMRL() ); BUTTONACT( atsc, updateMRL() ); BUTTONACT( cqam, updateMRL() ); } @@ -1138,6 +1142,8 @@ void CaptureOpenPanel::updateMRL() else if( dvbs->isChecked() ) mrl = "dvb-s://"; else + if( dvbs2->isChecked() ) mrl = "dvb-s2://"; + else if( dvbt->isChecked() ) mrl = "dvb-t://"; else if( atsc->isChecked() ) mrl = "atsc://"; @@ -1154,7 +1160,7 @@ void CaptureOpenPanel::updateMRL() mrl += ":modulation=" + QString::number( qam ) + "QAM"; mrl += ":srate=" + QString::number( dvbSrate->value() ); } - if( dvbc->isChecked() || dvbs->isChecked() ) + if( dvbc->isChecked() || dvbs->isChecked() || dvbs2->isChecked() ) mrl += ":srate=" + QString::number( dvbSrate->value() ); if( dvbt->isChecked() ) mrl += ":bandwidth=" + @@ -1215,6 +1221,11 @@ void CaptureOpenPanel::updateButtons() dvbSrate->show(); dvbSrateLabel->show(); } + else if( dvbs2->isChecked() ) + { + dvbSrate->show(); + dvbSrateLabel->show(); + } else if( dvbt->isChecked() ) { dvbBandBox->show(); diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp index 5a9851a..063d163 100644 --- a/modules/gui/qt4/components/open_panels.hpp +++ b/modules/gui/qt4/components/open_panels.hpp @@ -213,7 +213,7 @@ private: QLineEdit *jackPortsSelected; # define DTV_PLUGIN "dtv" #endif - QRadioButton *dvbs, *dvbt, *dvbc, *atsc, *cqam; + QRadioButton *dvbc, *dvbs, *dvbs2, *dvbt, *atsc, *cqam; QLabel *dvbBandLabel, *dvbSrateLabel, *dvbModLabel; QComboBox *dvbQamBox, *dvbBandBox; QSpinBox *dvbCard, *dvbFE, *dvbFreq, *dvbSrate; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
