Commit a67e449b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: rename modulation box to QAM box, and try to fix build

(we might need a PSK box later)
parent 9fcda59c
...@@ -984,17 +984,17 @@ void CaptureOpenPanel::initialize() ...@@ -984,17 +984,17 @@ void CaptureOpenPanel::initialize()
dvbModLabel = new QLabel( qtr( "Modulation / Constellation" ) ); dvbModLabel = new QLabel( qtr( "Modulation / Constellation" ) );
dvbPropLayout->addWidget( dvbModLabel, 2, 0 ); dvbPropLayout->addWidget( dvbModLabel, 2, 0 );
dvbModBox = new QComboBox; dvbQamBox = new QComboBox;
dvbModBox->addItem( qtr( "Automatic" ), 0 ); dvbQamBox->addItem( qtr( "Automatic" ), 0 );
dvbModBox->addItem( "256-QAM", 256 ); dvbQamBox->addItem( "256-QAM", 256 );
dvbModBox->addItem( "128-QAM", 128 ); dvbQamBox->addItem( "128-QAM", 128 );
dvbModBox->addItem( "64-QAM", 64 ); dvbQamBox->addItem( "64-QAM", 64 );
dvbModBox->addItem( "32-QAM", 32 ); dvbQamBox->addItem( "32-QAM", 32 );
dvbModBox->addItem( "16-QAM", 16 ); dvbQamBox->addItem( "16-QAM", 16 );
dvbPropLayout->addWidget( dvbModBox, 2, 1 ); dvbPropLayout->addWidget( dvbQamBox, 2, 1 );
dvbModLabel->hide(); dvbModLabel->hide();
dvbModBox->hide(); dvbQamBox->hide();
dvbBandLabel = new QLabel( qtr( "Bandwidth" ) ); dvbBandLabel = new QLabel( qtr( "Bandwidth" ) );
dvbPropLayout->addWidget( dvbBandLabel, 2, 0 ); dvbPropLayout->addWidget( dvbBandLabel, 2, 0 );
...@@ -1013,7 +1013,7 @@ void CaptureOpenPanel::initialize() ...@@ -1013,7 +1013,7 @@ void CaptureOpenPanel::initialize()
CuMRL( dvbCard, valueChanged ( int ) ); CuMRL( dvbCard, valueChanged ( int ) );
CuMRL( dvbFreq, valueChanged ( int ) ); CuMRL( dvbFreq, valueChanged ( int ) );
CuMRL( dvbSrate, valueChanged ( int ) ); CuMRL( dvbSrate, valueChanged ( int ) );
CuMRL( dvbModBox, currentIndexChanged ( int ) ); CuMRL( dvbQamBox, currentIndexChanged ( int ) );
CuMRL( dvbBandBox, currentIndexChanged ( int ) ); CuMRL( dvbBandBox, currentIndexChanged ( int ) );
BUTTONACT( dvbs, updateButtons() ); BUTTONACT( dvbs, updateButtons() );
...@@ -1141,7 +1141,7 @@ void CaptureOpenPanel::updateMRL() ...@@ -1141,7 +1141,7 @@ void CaptureOpenPanel::updateMRL()
if( dvbc->isChecked() || cqam->isChecked() ) if( dvbc->isChecked() || cqam->isChecked() )
{ {
unsigned qam = unsigned qam =
dvbModBox->itemData( dvbModBox->currentIndex() ).toInt(); dvbQamBox->itemData( dvbQamBox->currentIndex() ).toInt();
if( qam != 0 ) if( qam != 0 )
mrl += ":modulation=" + QString::number( qam ) + "QAM"; mrl += ":modulation=" + QString::number( qam ) + "QAM";
mrl += ":srate=" + QString::number( dvbSrate->value() ); mrl += ":srate=" + QString::number( dvbSrate->value() );
...@@ -1187,7 +1187,7 @@ void CaptureOpenPanel::updateButtons() ...@@ -1187,7 +1187,7 @@ void CaptureOpenPanel::updateButtons()
case DTV_DEVICE: case DTV_DEVICE:
dvbSrate->hide(); dvbSrate->hide();
dvbSrateLabel->hide(); dvbSrateLabel->hide();
dvbModBox->hide(); dvbQamBox->hide();
dvbModLabel->hide(); dvbModLabel->hide();
dvbBandBox->hide(); dvbBandBox->hide();
dvbBandLabel->hide(); dvbBandLabel->hide();
...@@ -1196,7 +1196,7 @@ void CaptureOpenPanel::updateButtons() ...@@ -1196,7 +1196,7 @@ void CaptureOpenPanel::updateButtons()
{ {
dvbSrate->show(); dvbSrate->show();
dvbSrateLabel->show(); dvbSrateLabel->show();
dvbModBox->show(); dvbQamBox->show();
dvbModLabel->show(); dvbModLabel->show();
} }
else if( dvbs->isChecked() ) else if( dvbs->isChecked() )
......
...@@ -207,7 +207,7 @@ private: ...@@ -207,7 +207,7 @@ private:
QSpinBox *pvrFreq, *pvrBitr; QSpinBox *pvrFreq, *pvrBitr;
QComboBox *v4l2VideoDevice, *v4l2AudioDevice; QComboBox *v4l2VideoDevice, *v4l2AudioDevice;
QLineEdit *pvrDevice, *pvrRadioDevice; QLineEdit *pvrDevice, *pvrRadioDevice;
QComboBox *v4l2StdBox, *pvrNormBox, *dvbModBox, *dvbBandBox; QComboBox *v4l2StdBox, *pvrNormBox;
QSpinBox *jackChannels, *jackCaching; QSpinBox *jackChannels, *jackCaching;
QCheckBox *jackPace, *jackConnect; QCheckBox *jackPace, *jackConnect;
QLineEdit *jackPortsSelected; QLineEdit *jackPortsSelected;
...@@ -215,6 +215,7 @@ private: ...@@ -215,6 +215,7 @@ private:
#endif #endif
QRadioButton *dvbs, *dvbt, *dvbc, *atsc, *cqam; QRadioButton *dvbs, *dvbt, *dvbc, *atsc, *cqam;
QLabel *dvbBandLabel, *dvbSrateLabel, *dvbModLabel; QLabel *dvbBandLabel, *dvbSrateLabel, *dvbModLabel;
QComboBox *dvbQamBox, *dvbBandBox;
QSpinBox *dvbCard, *dvbFreq, *dvbSrate; QSpinBox *dvbCard, *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