Commit a8acf5a0 authored by Manol Manolov's avatar Manol Manolov Committed by Jean-Baptiste Kempf

Add GUI support for Clear QAM

Option in the streaming dialog to pick Clear QAM.
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 39e9eba7
...@@ -730,12 +730,14 @@ void CaptureOpenPanel::initialize() ...@@ -730,12 +730,14 @@ void CaptureOpenPanel::initialize()
bdac = new QRadioButton( "DVB-C" ); bdac = new QRadioButton( "DVB-C" );
bdat = new QRadioButton( "DVB-T" ); bdat = new QRadioButton( "DVB-T" );
bdaa = new QRadioButton( "ATSC" ); bdaa = new QRadioButton( "ATSC" );
bdaq = new QRadioButton( "Clear QAM" );
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 ); bdaDevLayout->addWidget( bdaa, 0, 4 );
bdaDevLayout->addWidget( bdaq, 0, 5 );
/* bda Props */ /* bda Props */
QLabel *bdaFreqLabel = QLabel *bdaFreqLabel =
...@@ -778,10 +780,12 @@ void CaptureOpenPanel::initialize() ...@@ -778,10 +780,12 @@ void CaptureOpenPanel::initialize()
BUTTONACT( bdat, updateButtons() ); BUTTONACT( bdat, updateButtons() );
BUTTONACT( bdac, updateButtons() ); BUTTONACT( bdac, updateButtons() );
BUTTONACT( bdaa, updateButtons() ); BUTTONACT( bdaa, updateButtons() );
BUTTONACT( bdaq, updateButtons() );
BUTTONACT( bdas, updateMRL() ); BUTTONACT( bdas, updateMRL() );
BUTTONACT( bdat, updateMRL() ); BUTTONACT( bdat, updateMRL() );
BUTTONACT( bdac, updateMRL() ); BUTTONACT( bdac, updateMRL() );
BUTTONACT( bdaa, updateMRL() ); BUTTONACT( bdaa, updateMRL() );
BUTTONACT( bdaq, updateMRL() );
} }
#else /* WIN32 */ #else /* WIN32 */
...@@ -1120,6 +1124,7 @@ void CaptureOpenPanel::updateMRL() ...@@ -1120,6 +1124,7 @@ void CaptureOpenPanel::updateMRL()
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 if( bdaa->isChecked() ) mrl = "atsc://";
else if( bdaq->isChecked() ) mrl = "cqam://";
else return; else return;
mrl += "frequency=" + QString::number( bdaFreq->value() ); mrl += "frequency=" + QString::number( bdaFreq->value() );
if( bdac->isChecked() || bdat->isChecked() || bdaa->isChecked() ) if( bdac->isChecked() || bdat->isChecked() || bdaa->isChecked() )
...@@ -1243,6 +1248,13 @@ void CaptureOpenPanel::updateButtons() ...@@ -1243,6 +1248,13 @@ void CaptureOpenPanel::updateButtons()
bdaBandBox->show(); bdaBandBox->show();
bdaBandLabel->show(); bdaBandLabel->show();
} }
else if( bdaq->isChecked() )
{
bdaSrate->hide();
bdaSrateLabel->hide();
bdaBandBox->hide();
bdaBandLabel->hide();
}
break; break;
#else #else
case DVB_DEVICE: case DVB_DEVICE:
......
...@@ -200,7 +200,7 @@ private: ...@@ -200,7 +200,7 @@ private:
QString advMRL; QString advMRL;
QDialog *adv; QDialog *adv;
#ifdef WIN32 #ifdef WIN32
QRadioButton *bdas, *bdat, *bdac, *bdaa; QRadioButton *bdas, *bdat, *bdac, *bdaa, *bdaq;
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