[vlc-commits] Qt4: remove V4L1

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Mar  1 19:50:57 2011 +0200| [5d5eeb9eef54215ea12a5a93a1aedc662add15c3] | committer: Rémi Denis-Courmont

Qt4: remove V4L1

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

 modules/gui/qt4/components/open_panels.cpp        |   53 +--------------------
 modules/gui/qt4/components/open_panels.hpp        |    6 +--
 modules/gui/qt4/components/simple_preferences.cpp |    4 --
 3 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 0ce49dd..22fd50f 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -65,7 +65,7 @@
         .replaceInStrings( QRegExp("^"), "/dev/" ) \
     );
 
-static const char *psz_devModule[] = { "v4l", "v4l2", "pvr", "dvb", "bda",
+static const char *psz_devModule[] = { "v4l2", "pvr", "dvb", "bda",
                                        "dshow", "screen", "jack" };
 
 /**************************************************************************
@@ -872,51 +872,6 @@ void CaptureOpenPanel::initialize()
     }
 
     /*******
-     * V4L *
-     *******/
-    if( module_exists( "v4l" ) ){
-    addModuleAndLayouts( V4L_DEVICE, v4l, "Video for Linux", QGridLayout );
-
-    /* V4l Main panel */
-    QLabel *v4lVideoDeviceLabel = new QLabel( qtr( "Video device name" ) );
-    v4lDevLayout->addWidget( v4lVideoDeviceLabel, 0, 0 );
-
-    v4lVideoDevice = new QLineEdit;
-    v4lDevLayout->addWidget( v4lVideoDevice, 0, 1 );
-
-    QLabel *v4lAudioDeviceLabel = new QLabel( qtr( "Audio device name" ) );
-    v4lDevLayout->addWidget( v4lAudioDeviceLabel, 1, 0 );
-
-    v4lAudioDevice = new QLineEdit;
-    v4lDevLayout->addWidget( v4lAudioDevice, 1, 1 );
-
-    /* V4l Props panel */
-    QLabel *v4lNormLabel = new QLabel( qtr( "Norm" ) );
-    v4lPropLayout->addWidget( v4lNormLabel, 0 , 0 );
-
-    v4lNormBox = new QComboBox;
-    setfillVLCConfigCombo( "v4l-norm", p_intf, v4lNormBox );
-    v4lPropLayout->addWidget( v4lNormBox, 0 , 1 );
-
-    QLabel *v4lFreqLabel = new QLabel( qtr( "Frequency" ) );
-    v4lPropLayout->addWidget( v4lFreqLabel, 1 , 0 );
-
-    v4lFreq = new QSpinBox;
-    v4lFreq->setAlignment( Qt::AlignRight );
-    v4lFreq->setSuffix(" kHz");
-    setSpinBoxFreq( v4lFreq );
-    v4lPropLayout->addWidget( v4lFreq, 1 , 1 );
-    v4lPropLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ),
-            2, 0, 2, 1 );
-
-    /* v4l CONNECTs */
-    CuMRL( v4lVideoDevice, textChanged( const QString& ) );
-    CuMRL( v4lAudioDevice, textChanged( const QString& ) );
-    CuMRL( v4lFreq, valueChanged ( int ) );
-    CuMRL( v4lNormBox,  currentIndexChanged ( int ) );
-    }
-
-    /*******
      * JACK *
      *******/
     if( module_exists( "jack" ) ){
@@ -1197,12 +1152,6 @@ void CaptureOpenPanel::updateMRL()
         emit methodChanged( "dshow-caching" );
         break;
 #else
-    case V4L_DEVICE:
-        fileList << "v4l://" + v4lVideoDevice->text();
-        mrl += " :input-slave=alsa://" + v4lAudioDevice->text();
-        mrl += " :v4l-norm=" + QString::number( v4lNormBox->currentIndex() );
-        mrl += " :v4l-frequency=" + QString::number( v4lFreq->value() );
-        break;
     case V4L2_DEVICE:
         fileList << "v4l2://" + v4l2VideoDevice->currentText();
         mrl += " :input-slave=alsa://" + v4l2AudioDevice->currentText();
diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp
index 8d6f00c..0fe6eb5 100644
--- a/modules/gui/qt4/components/open_panels.hpp
+++ b/modules/gui/qt4/components/open_panels.hpp
@@ -48,7 +48,6 @@
 
 enum
 {
-    V4L_DEVICE,
     V4L2_DEVICE,
     PVR_DEVICE,
     DVB_DEVICE,
@@ -211,11 +210,10 @@ private:
 #else
     QRadioButton *dvbs, *dvbt, *dvbc;
     QLabel *dvbBandLabel, *dvbSrateLabel;
-    QSpinBox  *v4lFreq, *pvrFreq, *pvrBitr;
-    QLineEdit *v4lVideoDevice, *v4lAudioDevice;
+    QSpinBox  *pvrFreq, *pvrBitr;
     QComboBox *v4l2VideoDevice, *v4l2AudioDevice;
     QLineEdit *pvrDevice, *pvrRadioDevice;
-    QComboBox *v4lNormBox, *v4l2StdBox, *pvrNormBox, *dvbBandBox;
+    QComboBox *v4l2StdBox, *pvrNormBox, *dvbBandBox;
     QSpinBox *dvbCard, *dvbFreq, *dvbSrate;
     QSpinBox *jackChannels, *jackCaching;
     QCheckBox *jackPace, *jackConnect;
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 1a76d43..21cb228 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -507,8 +507,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             #ifdef WIN32
             TestCaC( "dshow-caching" );
             #else
-            if (module_exists ("v4l"))
-                TestCaC( "v4l-caching" );
             if (module_exists ("access_jack"))
                 TestCaC( "jack-input-caching" );
             if (module_exists ("v4l2"))
@@ -803,8 +801,6 @@ void SPrefsPanel::apply()
             #ifdef WIN32
             CaC( "dshow-caching" );
             #else
-            if (module_exists ( "v4l" ))
-                CaC( "v4l-caching" );
             if (module_exists ( "access_jack" ))
             CaC( "jack-input-caching" );
             if (module_exists ( "v4l2" ))