Skip to content

V
vlc-2-2
Commit 695b9cd7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Qt4: add modulations for DVB-S2

parent c75171d7
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 14 deletions
modules/gui/qt4/components/open_panels.cpp
View file @ 695b9cd7
...@@ -992,16 +992,25 @@ void CaptureOpenPanel::initialize() ...@@ -992,16 +992,25 @@ void CaptureOpenPanel::initialize()
dvbPropLayout->addWidget( dvbModLabel, 2, 0 ); dvbPropLayout->addWidget( dvbModLabel, 2, 0 );
dvbQamBox = new QComboBox; dvbQamBox = new QComboBox;
dvbQamBox->addItem( qtr( "Automatic" ), 0 ); dvbQamBox->addItem( qtr( "Automatic" ), qfu("QAM") );
dvbQamBox->addItem( "256-QAM", 256 ); dvbQamBox->addItem( "256-QAM", qfu("256QAM") );
dvbQamBox->addItem( "128-QAM", 128 ); dvbQamBox->addItem( "128-QAM", qfu("128QAM") );
dvbQamBox->addItem( "64-QAM", 64 ); dvbQamBox->addItem( "64-QAM", qfu("64QAM") );
dvbQamBox->addItem( "32-QAM", 32 ); dvbQamBox->addItem( "32-QAM", qfu("32QAM") );
dvbQamBox->addItem( "16-QAM", 16 ); dvbQamBox->addItem( "16-QAM", qfu("16QAM") );
dvbPropLayout->addWidget( dvbQamBox, 2, 1 ); dvbPropLayout->addWidget( dvbQamBox, 2, 1 );
dvbPskBox = new QComboBox;
dvbPskBox->addItem( "QPSK", qfu("QPSK") );
dvbPskBox->addItem( "DQPSK", qfu("DQPSK") );
dvbPskBox->addItem( "8-PSK", qfu("8PSK") );
dvbPskBox->addItem( "16-APSK", qfu("16APSK") );
dvbPskBox->addItem( "32-APSK", qfu("32APSK") );
dvbPropLayout->addWidget( dvbPskBox, 2, 1 );
dvbModLabel->hide(); dvbModLabel->hide();
dvbQamBox->hide(); dvbQamBox->hide();
dvbPskBox->hide();
dvbBandLabel = new QLabel( qtr( "Bandwidth" ) ); dvbBandLabel = new QLabel( qtr( "Bandwidth" ) );
dvbPropLayout->addWidget( dvbBandLabel, 2, 0 ); dvbPropLayout->addWidget( dvbBandLabel, 2, 0 );
...@@ -1024,6 +1033,7 @@ void CaptureOpenPanel::initialize() ...@@ -1024,6 +1033,7 @@ void CaptureOpenPanel::initialize()
CuMRL( dvbFreq, valueChanged ( int ) ); CuMRL( dvbFreq, valueChanged ( int ) );
CuMRL( dvbSrate, valueChanged ( int ) ); CuMRL( dvbSrate, valueChanged ( int ) );
CuMRL( dvbQamBox, currentIndexChanged ( int ) ); CuMRL( dvbQamBox, currentIndexChanged ( int ) );
CuMRL( dvbPskBox, currentIndexChanged ( int ) );
CuMRL( dvbBandBox, currentIndexChanged ( int ) ); CuMRL( dvbBandBox, currentIndexChanged ( int ) );
BUTTONACT( dvbc, updateButtons() ); BUTTONACT( dvbc, updateButtons() );
...@@ -1153,13 +1163,11 @@ void CaptureOpenPanel::updateMRL() ...@@ -1153,13 +1163,11 @@ void CaptureOpenPanel::updateMRL()
mrl += "frequency=" + QString::number( dvbFreq->value() ); mrl += "frequency=" + QString::number( dvbFreq->value() );
if( dvbc->isChecked() || cqam->isChecked() ) if( dvbc->isChecked() || cqam->isChecked() )
{ mrl += ":modulation="
unsigned qam = + dvbQamBox->itemData( dvbQamBox->currentIndex() ).toString();
dvbQamBox->itemData( dvbQamBox->currentIndex() ).toInt(); if( dvbs2->isChecked() )
if( qam != 0 ) mrl += ":modulation="
mrl += ":modulation=" + QString::number( qam ) + "QAM"; + dvbPskBox->itemData( dvbPskBox->currentIndex() ).toString();
mrl += ":srate=" + QString::number( dvbSrate->value() );
}
if( dvbc->isChecked() || dvbs->isChecked() || dvbs2->isChecked() ) if( dvbc->isChecked() || dvbs->isChecked() || dvbs2->isChecked() )
mrl += ":srate=" + QString::number( dvbSrate->value() ); mrl += ":srate=" + QString::number( dvbSrate->value() );
if( dvbt->isChecked() ) if( dvbt->isChecked() )
...@@ -1205,6 +1213,7 @@ void CaptureOpenPanel::updateButtons() ...@@ -1205,6 +1213,7 @@ void CaptureOpenPanel::updateButtons()
dvbSrate->hide(); dvbSrate->hide();
dvbSrateLabel->hide(); dvbSrateLabel->hide();
dvbQamBox->hide(); dvbQamBox->hide();
dvbPskBox->hide();
dvbModLabel->hide(); dvbModLabel->hide();
dvbBandBox->hide(); dvbBandBox->hide();
dvbBandLabel->hide(); dvbBandLabel->hide();
...@@ -1225,6 +1234,8 @@ void CaptureOpenPanel::updateButtons() ...@@ -1225,6 +1234,8 @@ void CaptureOpenPanel::updateButtons()
{ {
dvbSrate->show(); dvbSrate->show();
dvbSrateLabel->show(); dvbSrateLabel->show();
dvbPskBox->show();
dvbModLabel->show();
} }
else if( dvbt->isChecked() ) else if( dvbt->isChecked() )
{ {
......
modules/gui/qt4/components/open_panels.hpp
View file @ 695b9cd7
...@@ -215,7 +215,7 @@ private: ...@@ -215,7 +215,7 @@ private:
#endif #endif
QRadioButton *dvbc, *dvbs, *dvbs2, *dvbt, *atsc, *cqam; QRadioButton *dvbc, *dvbs, *dvbs2, *dvbt, *atsc, *cqam;
QLabel *dvbBandLabel, *dvbSrateLabel, *dvbModLabel; QLabel *dvbBandLabel, *dvbSrateLabel, *dvbModLabel;
QComboBox *dvbQamBox, *dvbBandBox; QComboBox *dvbQamBox, *dvbPskBox, *dvbBandBox;
QSpinBox *dvbCard, *dvbFE, *dvbFreq, *dvbSrate; QSpinBox *dvbCard, *dvbFE, *dvbFreq, *dvbSrate;
QDoubleSpinBox *screenFPS; QDoubleSpinBox *screenFPS;
......
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