Skip to content

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

Qt4: update DVB dialog for the new plugin

parent 3e5e98f5
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 13 deletions
modules/gui/qt4/components/open_panels.cpp
View file @ a879bc58
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
.replaceInStrings( QRegExp("^"), "/dev/" ) \ .replaceInStrings( QRegExp("^"), "/dev/" ) \
); );
static const char *psz_devModule[] = { "v4l2", "pvr", "dvb", "bda", static const char psz_devModule[][8] = { "v4l2", "pvr", "dtv", "bda",
"dshow", "screen", "jack" }; "dshow", "screen", "jack" };
/************************************************************************** /**************************************************************************
...@@ -1004,8 +1004,8 @@ void CaptureOpenPanel::initialize() ...@@ -1004,8 +1004,8 @@ void CaptureOpenPanel::initialize()
/************** /**************
* DVB Stuffs * * DVB Stuffs *
**************/ **************/
if( module_exists( "dvb" ) ){ if( module_exists( "dtv" ) ){
addModuleAndLayouts( DVB_DEVICE, dvb, "DVB", QGridLayout ); addModuleAndLayouts( DVB_DEVICE, dvb, N_("TV (digital)"), QGridLayout );
/* DVB Main */ /* DVB Main */
QLabel *dvbDeviceLabel = new QLabel( qtr( "Adapter card to tune" ) ); QLabel *dvbDeviceLabel = new QLabel( qtr( "Adapter card to tune" ) );
...@@ -1068,14 +1068,7 @@ void CaptureOpenPanel::initialize() ...@@ -1068,14 +1068,7 @@ void CaptureOpenPanel::initialize()
dvbPropLayout->addWidget( dvbBandLabel, 2, 0 ); dvbPropLayout->addWidget( dvbBandLabel, 2, 0 );
dvbBandBox = new QComboBox; dvbBandBox = new QComboBox;
/* This doesn't work since dvb-bandwidth doesn't seem to be a setfillVLCConfigCombo( "dvb-bandwidth", p_intf, dvbBandBox );
list of Integers
setfillVLCConfigCombo( "dvb-bandwidth", p_intf, bdaBandBox );
*/
dvbBandBox->addItem( qtr( "Auto" ), 0 );
dvbBandBox->addItem( qtr( "6 MHz" ), 6 );
dvbBandBox->addItem( qtr( "7 MHz" ), 7 );
dvbBandBox->addItem( qtr( "8 MHz" ), 8 );
dvbPropLayout->addWidget( dvbBandBox, 2, 1 ); dvbPropLayout->addWidget( dvbBandBox, 2, 1 );
dvbBandLabel->hide(); dvbBandLabel->hide();
...@@ -1226,15 +1219,16 @@ void CaptureOpenPanel::updateMRL() ...@@ -1226,15 +1219,16 @@ void CaptureOpenPanel::updateMRL()
if( dvbt->isChecked() ) mrl = "dvb-t://"; if( dvbt->isChecked() ) mrl = "dvb-t://";
mrl += "frequency=" + QString::number( dvbFreq->value() ); mrl += "frequency=" + QString::number( dvbFreq->value() );
if( dvbc->isChecked() || dvbt->isChecked() )
mrl += "000";
if( dvbc->isChecked() ) if( dvbc->isChecked() )
{ {
unsigned qam = unsigned qam =
dvbModBox->itemData( dvbModBox->currentIndex() ).toInt(); dvbModBox->itemData( dvbModBox->currentIndex() ).toInt();
if( qam != 0 ) if( qam != 0 )
{
mrl += ":modulation=" + QString::number( qam ); mrl += ":modulation=" + QString::number( qam );
mrl += "QAM";
}
mrl += ":srate=" + QString::number( dvbSrate->value() ); mrl += ":srate=" + QString::number( dvbSrate->value() );
} }
else if( dvbs->isChecked() ) else if( dvbs->isChecked() )
......
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