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

Qt4: handle multiple Linux DVB frontends per adapter

parent b17181d0
...@@ -942,9 +942,14 @@ void CaptureOpenPanel::initialize() ...@@ -942,9 +942,14 @@ void CaptureOpenPanel::initialize()
dvbCard->setAlignment( Qt::AlignRight ); dvbCard->setAlignment( Qt::AlignRight );
#ifdef __linux__ #ifdef __linux__
dvbCard->setPrefix( "/dev/dvb/adapter" ); dvbCard->setPrefix( "/dev/dvb/adapter" );
dvbFE = new QSpinBox;
dvbFE->setPrefix( "/frontend" );
#endif #endif
dvbDevLayout->addWidget( dvbDeviceLabel, 0, 0 ); dvbDevLayout->addWidget( dvbDeviceLabel, 0, 0 );
dvbDevLayout->addWidget( dvbCard, 0, 2, 1, 2 ); dvbDevLayout->addWidget( dvbCard, 0, 1, 1, 2 );
#ifdef __linux__
dvbDevLayout->addWidget( dvbFE, 0, 3 );
#endif
dvbc = new QRadioButton( "DVB-C" ); dvbc = new QRadioButton( "DVB-C" );
dvbs = new QRadioButton( "DVB-S" ); dvbs = new QRadioButton( "DVB-S" );
...@@ -1011,6 +1016,9 @@ void CaptureOpenPanel::initialize() ...@@ -1011,6 +1016,9 @@ void CaptureOpenPanel::initialize()
/* DVB CONNECTs */ /* DVB CONNECTs */
CuMRL( dvbCard, valueChanged ( int ) ); CuMRL( dvbCard, valueChanged ( int ) );
#ifdef __linux__
CuMRL( dvbFE, valueChanged ( int ) );
#endif
CuMRL( dvbFreq, valueChanged ( int ) ); CuMRL( dvbFreq, valueChanged ( int ) );
CuMRL( dvbSrate, valueChanged ( int ) ); CuMRL( dvbSrate, valueChanged ( int ) );
CuMRL( dvbQamBox, currentIndexChanged ( int ) ); CuMRL( dvbQamBox, currentIndexChanged ( int ) );
...@@ -1155,6 +1163,9 @@ void CaptureOpenPanel::updateMRL() ...@@ -1155,6 +1163,9 @@ void CaptureOpenPanel::updateMRL()
fileList << mrl; mrl= ""; fileList << mrl; mrl= "";
mrl += " :dvb-adapter=" + QString::number( dvbCard->value() ); mrl += " :dvb-adapter=" + QString::number( dvbCard->value() );
#ifdef __linux__
mrl += " :dvb-device=" + QString::number( dvbFE->value() );
#endif
break; break;
case SCREEN_DEVICE: case SCREEN_DEVICE:
fileList << "screen://"; fileList << "screen://";
......
...@@ -216,7 +216,7 @@ private: ...@@ -216,7 +216,7 @@ private:
QRadioButton *dvbs, *dvbt, *dvbc, *atsc, *cqam; QRadioButton *dvbs, *dvbt, *dvbc, *atsc, *cqam;
QLabel *dvbBandLabel, *dvbSrateLabel, *dvbModLabel; QLabel *dvbBandLabel, *dvbSrateLabel, *dvbModLabel;
QComboBox *dvbQamBox, *dvbBandBox; QComboBox *dvbQamBox, *dvbBandBox;
QSpinBox *dvbCard, *dvbFreq, *dvbSrate; QSpinBox *dvbCard, *dvbFE, *dvbFreq, *dvbSrate;
QDoubleSpinBox *screenFPS; QDoubleSpinBox *screenFPS;
public slots: public slots:
......
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