Preferences: don't show empty boxes ('zoom' box bug)

[vlc] / modules / gui / qt4 / components / open_panels.hpp

diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp
index 32bc6acaab771a3031b6e6bbb9c713bdb9be9baf..e2de731df174e39a114afbb996f9e62fd608fec6 100644 (file)
--- a/modules/gui/qt4/components/open_panels.hpp
+++ b/modules/gui/qt4/components/open_panels.hpp
@@ -28,7 +28,11 @@
 #ifndef _OPENPANELS_H_
 #define _OPENPANELS_H_
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 
 #include <QFileDialog>
 
@@ -37,13 +41,27 @@
 #include "ui/open_net.h"
 #include "ui/open_capture.h"
 
-#ifdef HAVE_LIMITS_H
-#   include <limits.h>
-#endif
+#include "components/preferences_widgets.hpp"
+
+#include <limits.h>
 
 #define setSpinBoxFreq( spinbox ){ spinbox->setRange ( 0, INT_MAX ); \
     spinbox->setAccelerated( true ); }
 
+enum
+{
+    NO_PROTO,
+    HTTP_PROTO,
+    HTTPS_PROTO,
+    MMS_PROTO,
+    FTP_PROTO,
+    RTSP_PROTO,
+    RTP_PROTO,
+    UDP_PROTO,
+    RTMP_PROTO
+};
+
+
 enum
 {
     V4L_DEVICE,
@@ -56,6 +74,10 @@ enum
     JACK_DEVICE
 };
 
+static const char *psz_devModule[] = { "v4l", "v4l2", "pvr", "dvb", "bda",
+                                       "dshow", "screen", "jack" };
+
+
 class QWidget;
 class QLineEdit;
 class QString;
@@ -143,6 +165,7 @@ public slots:
 private slots:
     void browseDevice();
     void updateButtons() ;
+    void eject();
 };
 
 
@@ -155,25 +178,33 @@ public:
     virtual void clear() ;
 private:
     Ui::OpenCapture ui;
-    QRadioButton *dvbs, *dvbt, *dvbc;
+    QString advMRL;
+    QDialog *adv;
+#ifdef WIN32
     QRadioButton *bdas, *bdat, *bdac;
+    QSpinBox *bdaCard, *bdaFreq, *bdaSrate;
+    QLabel *bdaSrateLabel, *bdaBandLabel;
+    QComboBox *bdaBandBox;
+    StringListConfigControl *vdevDshowW, *adevDshowW;
+    QLineEdit *dshowVSizeLine;
+#else
+    QRadioButton *dvbs, *dvbt, *dvbc;
     QSpinBox  *v4lFreq, *pvrFreq, *pvrBitr;
     QLineEdit *v4lVideoDevice, *v4lAudioDevice;
     QLineEdit *v4l2VideoDevice, *v4l2AudioDevice;
     QLineEdit *pvrDevice, *pvrRadioDevice;
-    QComboBox *v4lNormBox, *v4l2StdBox, *pvrNormBox, *bdaBandBox;
+    QComboBox *v4lNormBox, *v4l2StdBox, *pvrNormBox;
     QSpinBox *dvbCard, *dvbFreq, *dvbSrate;
-    QSpinBox *bdaCard, *bdaFreq, *bdaSrate;
     QSpinBox *jackChannels, *jackCaching;
     QCheckBox *jackPace, *jackConnect;
     QLineEdit *jackPortsSelected;
-
-    QLabel *bdaSrateLabel, *bdaBandLabel;
+#endif
 
 public slots:
     virtual void updateMRL();
 private slots:
     void updateButtons();
+    void advancedDialog();
 };
 
 #endif