[vlc-commits] Qt4: handle multiple Linux DVB frontends per adapter

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Mar 27 13:38:05 2011 +0300| [601609fea7bf57c92862732e1978b276fed1059c] | committer: Rémi Denis-Courmont

Qt4: handle multiple Linux DVB frontends per adapter

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

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

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 1dff228..63b272f 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -942,9 +942,14 @@ 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, 2, 1, 2 );
+    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" );
@@ -1011,6 +1016,9 @@ 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 ) );
@@ -1155,6 +1163,9 @@ 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 54a2397..5a9851a 100644
--- a/modules/gui/qt4/components/open_panels.hpp
+++ b/modules/gui/qt4/components/open_panels.hpp
@@ -216,7 +216,7 @@ private:
     QRadioButton *dvbs, *dvbt, *dvbc, *atsc, *cqam;
     QLabel *dvbBandLabel, *dvbSrateLabel, *dvbModLabel;
     QComboBox *dvbQamBox, *dvbBandBox;
-    QSpinBox *dvbCard, *dvbFreq, *dvbSrate;
+    QSpinBox *dvbCard, *dvbFE, *dvbFreq, *dvbSrate;
     QDoubleSpinBox *screenFPS;
 
 public slots: