Commit fd549c75 authored by Ken Self's avatar Ken Self
Browse files

BDA fixes: no dvb-adapter, hide srate for dvb-t, freq always in kHz

parent 2991ed6a
......@@ -599,15 +599,8 @@ CaptureOpenPanel::CaptureOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
addModuleAndLayouts( BDA_DEVICE, bda, "DVB DirectShow" );
/* bda Main */
QLabel *bdaDeviceLabel = new QLabel( qtr( "Adapter card to tune" ) );
QLabel *bdaTypeLabel = new QLabel( qtr( "DVB Type:" ) );
bdaCard = new QSpinBox;
bdaCard->setAlignment( Qt::AlignRight );
bdaDevLayout->addWidget( bdaDeviceLabel, 0, 0 );
bdaDevLayout->addWidget( bdaCard, 0, 2, 1, 2 );
bdas = new QRadioButton( "DVB-S" );
bdas->setChecked( true );
bdac = new QRadioButton( "DVB-C" );
......@@ -637,7 +630,6 @@ CaptureOpenPanel::CaptureOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
bdaPropLayout->addWidget( bdaSrate, 1, 1 );
/* bda CONNECTs */
CuMRL( bdaCard, valueChanged ( int ) );
CuMRL( bdaFreq, valueChanged ( int ) );
CuMRL( bdaSrate, valueChanged ( int ) );
BUTTONACT( bdas, updateButtons() );
......@@ -751,9 +743,9 @@ void CaptureOpenPanel::updateMRL()
else if( bdat->isChecked() ) mrl = "dvb-t://";
else if( bdac->isChecked() ) mrl = "dvb-c://";
else return;
mrl += " :dvb-adapter=" + QString("%1").arg( bdaCard->value() );
mrl += " :dvb-frequency=" + QString("%1").arg( bdaFreq->value() );
mrl += " :dvb-srate=" + QString("%1").arg( bdaSrate->value() );
if( bdas->isChecked() || bdac->isChecked() )
mrl += " :dvb-srate=" + QString("%1").arg( bdaSrate->value() );
break;
case DSHOW_DEVICE:
break;
......@@ -774,8 +766,6 @@ void CaptureOpenPanel::updateButtons()
if( dvbc->isChecked() || dvbt->isChecked() ) dvbFreq->setSuffix(" Hz");
break;
case BDA_DEVICE:
if( bdas->isChecked() ) bdaFreq->setSuffix(" kHz");
if( bdac->isChecked() || bdat->isChecked() ) bdaFreq->setSuffix(" Hz");
if( bdas->isChecked() || bdac->isChecked() )
{
bdaSrate->show();
......@@ -783,7 +773,7 @@ void CaptureOpenPanel::updateButtons()
}
else
{
bdaSrate->show();
bdaSrate->hide();
bdaSrateLabel->hide();
}
break;
......
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