[vlc-commits] Qt4: remove Linux DVB device spin box

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu May 26 17:13:31 2011 +0300| [26a440b84552eae94cac101e0c2d586f7a936e82] | committer: Rémi Denis-Courmont

Qt4: remove Linux DVB device spin box

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=26a440b84552eae94cac101e0c2d586f7a936e82
---

 modules/gui/qt4/components/open_panels.cpp |   11 -----------
 modules/gui/qt4/components/open_panels.hpp |    2 +-
 2 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 0b2c194..ce11312 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -930,14 +930,9 @@ void CaptureOpenPanel::initialize()
     dvbCard->setAlignment( Qt::AlignRight );
 #ifdef __linux__
     dvbCard->setPrefix( "/dev/dvb/adapter" );
-    dvbFE = new QSpinBox;
-    dvbFE->setPrefix( "/frontend" );
 #endif
     dvbDevLayout->addWidget( dvbDeviceLabel, 0, 0 );
     dvbDevLayout->addWidget( dvbCard, 0, 1, 1, 2 );
-#ifdef __linux__
-    dvbDevLayout->addWidget( dvbFE, 0, 3 );
-#endif
 
     dvbc = new QRadioButton( "DVB-C" );
     dvbs = new QRadioButton( "DVB-S" );
@@ -1017,9 +1012,6 @@ void CaptureOpenPanel::initialize()
 
     /* DVB CONNECTs */
     CuMRL( dvbCard, valueChanged ( int ) );
-#ifdef __linux__
-    CuMRL( dvbFE, valueChanged ( int ) );
-#endif
     CuMRL( dvbFreq, valueChanged ( int ) );
     CuMRL( dvbSrate, valueChanged ( int ) );
     CuMRL( dvbQamBox, currentIndexChanged ( int ) );
@@ -1171,9 +1163,6 @@ void CaptureOpenPanel::updateMRL()
 
         fileList << mrl; mrl= "";
         mrl += " :dvb-adapter=" + QString::number( dvbCard->value() );
-#ifdef __linux__
-        mrl += " :dvb-device=" + QString::number( dvbFE->value() );
-#endif
         break;
     case SCREEN_DEVICE:
         fileList << "screen://";
diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp
index 3e86bb3..c95e49b 100644
--- a/modules/gui/qt4/components/open_panels.hpp
+++ b/modules/gui/qt4/components/open_panels.hpp
@@ -214,7 +214,7 @@ private:
     QRadioButton *dvbc, *dvbs, *dvbs2, *dvbt, *dvbt2, *atsc, *cqam;
     QLabel *dvbBandLabel, *dvbSrateLabel, *dvbModLabel;
     QComboBox *dvbQamBox, *dvbPskBox, *dvbBandBox;
-    QSpinBox *dvbCard, *dvbFE, *dvbFreq, *dvbSrate;
+    QSpinBox *dvbCard, *dvbFreq, *dvbSrate;
     QDoubleSpinBox *screenFPS;
 
 public slots: