Skip to content

V
vlc-1.1
Commit 36ff2a5f authored by kenself's avatar kenself Committed by Jean-Baptiste Kempf
Browse files
Options

Add ATSC option to GUI 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 4983eb0e
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
modules/gui/qt4/components/open_panels.cpp
View file @ 36ff2a5f
...@@ -672,11 +672,13 @@ void CaptureOpenPanel::initialize() ...@@ -672,11 +672,13 @@ void CaptureOpenPanel::initialize()
bdas->setChecked( true ); bdas->setChecked( true );
bdac = new QRadioButton( "DVB-C" ); bdac = new QRadioButton( "DVB-C" );
bdat = new QRadioButton( "DVB-T" ); bdat = new QRadioButton( "DVB-T" );
bdaa = new QRadioButton( "ATSC" );
bdaDevLayout->addWidget( bdaTypeLabel, 0, 0 ); bdaDevLayout->addWidget( bdaTypeLabel, 0, 0 );
bdaDevLayout->addWidget( bdas, 0, 1 ); bdaDevLayout->addWidget( bdas, 0, 1 );
bdaDevLayout->addWidget( bdac, 0, 2 ); bdaDevLayout->addWidget( bdac, 0, 2 );
bdaDevLayout->addWidget( bdat, 0, 3 ); bdaDevLayout->addWidget( bdat, 0, 3 );
bdaDevLayout->addWidget( bdaa, 0, 4 );
/* bda Props */ /* bda Props */
QLabel *bdaFreqLabel = QLabel *bdaFreqLabel =
...@@ -718,9 +720,11 @@ void CaptureOpenPanel::initialize() ...@@ -718,9 +720,11 @@ void CaptureOpenPanel::initialize()
BUTTONACT( bdas, updateButtons() ); BUTTONACT( bdas, updateButtons() );
BUTTONACT( bdat, updateButtons() ); BUTTONACT( bdat, updateButtons() );
BUTTONACT( bdac, updateButtons() ); BUTTONACT( bdac, updateButtons() );
BUTTONACT( bdaa, updateButtons() );
BUTTONACT( bdas, updateMRL() ); BUTTONACT( bdas, updateMRL() );
BUTTONACT( bdat, updateMRL() ); BUTTONACT( bdat, updateMRL() );
BUTTONACT( bdac, updateMRL() ); BUTTONACT( bdac, updateMRL() );
BUTTONACT( bdaa, updateMRL() );
} }
#else /* WIN32 */ #else /* WIN32 */
...@@ -1026,11 +1030,12 @@ void CaptureOpenPanel::updateMRL() ...@@ -1026,11 +1030,12 @@ void CaptureOpenPanel::updateMRL()
if( bdas->isChecked() ) mrl = "dvb-s://"; if( bdas->isChecked() ) mrl = "dvb-s://";
else if( bdat->isChecked() ) mrl = "dvb-t://"; else if( bdat->isChecked() ) mrl = "dvb-t://";
else if( bdac->isChecked() ) mrl = "dvb-c://"; else if( bdac->isChecked() ) mrl = "dvb-c://";
else if( bdaa->isChecked() ) mrl = "atsc://";
else return; else return;
mrl += " :dvb-frequency=" + QString("%1").arg( bdaFreq->value() ); mrl += " :dvb-frequency=" + QString("%1").arg( bdaFreq->value() );
if( bdas->isChecked() || bdac->isChecked() ) if( bdas->isChecked() || bdac->isChecked() )
mrl += " :dvb-srate=" + QString("%1").arg( bdaSrate->value() ); mrl += " :dvb-srate=" + QString("%1").arg( bdaSrate->value() );
else else if( bdat->isChecked() )
mrl += " :dvb-bandwidth=" + mrl += " :dvb-bandwidth=" +
QString("%1").arg( bdaBandBox->itemData( QString("%1").arg( bdaBandBox->itemData(
bdaBandBox->currentIndex() ).toInt() ); bdaBandBox->currentIndex() ).toInt() );
...@@ -1123,7 +1128,7 @@ void CaptureOpenPanel::updateButtons() ...@@ -1123,7 +1128,7 @@ void CaptureOpenPanel::updateButtons()
bdaBandBox->hide(); bdaBandBox->hide();
bdaBandLabel->hide(); bdaBandLabel->hide();
} }
else else if( bdat->isChecked() )
{ {
bdaSrate->hide(); bdaSrate->hide();
bdaSrateLabel->hide(); bdaSrateLabel->hide();
......
modules/gui/qt4/components/open_panels.hpp
View file @ 36ff2a5f
...@@ -187,7 +187,7 @@ private: ...@@ -187,7 +187,7 @@ private:
QString advMRL; QString advMRL;
QDialog *adv; QDialog *adv;
#ifdef WIN32 #ifdef WIN32
QRadioButton *bdas, *bdat, *bdac; QRadioButton *bdas, *bdat, *bdac, *bdaa;
QSpinBox *bdaCard, *bdaFreq, *bdaSrate; QSpinBox *bdaCard, *bdaFreq, *bdaSrate;
QLabel *bdaSrateLabel, *bdaBandLabel; QLabel *bdaSrateLabel, *bdaBandLabel;
QComboBox *bdaBandBox; QComboBox *bdaBandBox;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment