Qt4 - use a docked playlist, remove dead code, don't reinvent the wheel, remove the...

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

diff --git a/modules/gui/qt4/components/open.hpp b/modules/gui/qt4/components/open.hpp
index 9f3d51e8954c1c9251159cc847b53968cf0a3e5d..2618cf49c3f98587886d7e365e8a9fb3ead34b5e 100644 (file)
--- a/modules/gui/qt4/components/open.hpp
+++ b/modules/gui/qt4/components/open.hpp
@@ -2,10 +2,13 @@
  * open.hpp : Panels for the open dialogs
  ****************************************************************************
  * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2007 Société des arts technologiques
+ * Copyright (C) 2007 Savoir-faire Linux
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *          Jean-Baptiste Kempf <jb@videolan.org>
+ *          Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,11 +44,17 @@
 #define setSpinBoxFreq( spinbox ){ spinbox->setRange ( 0, INT_MAX ); \
     spinbox->setAccelerated( true ); }
 
-#define V4L_DEVICE         0x0
-#define PVR_DEVICE         0x1
-#define DVB_DEVICE         0x2
-#define BDA_DEVICE         0x4
-#define DSHOW_DEVICE       0x8
+enum
+{
+    V4L_DEVICE,
+    V4L2_DEVICE,
+    PVR_DEVICE,
+    DVB_DEVICE,
+    BDA_DEVICE,
+    DSHOW_DEVICE,
+    SCREEN_DEVICE,
+    JACK_DEVICE
+};
 
 class QWidget;
 class QLineEdit;
@@ -144,12 +153,16 @@ private:
     Ui::OpenCapture ui;
     QRadioButton *dvbs, *dvbt, *dvbc;
     QRadioButton *bdas, *bdat, *bdac;
-    QSpinBox  *v4lFreq, *pvrFreq, *pvrBitr ;
+    QSpinBox  *v4lFreq, *pvrFreq, *pvrBitr;
     QLineEdit *v4lVideoDevice, *v4lAudioDevice;
+    QLineEdit *v4l2VideoDevice, *v4l2AudioDevice;
     QLineEdit *pvrDevice, *pvrRadioDevice;
-    QComboBox *v4lNormBox, *pvrNormBox, *bdaBandBox;
+    QComboBox *v4lNormBox, *v4l2StdBox, *pvrNormBox, *bdaBandBox;
     QSpinBox *dvbCard, *dvbFreq, *dvbSrate;
     QSpinBox *bdaCard, *bdaFreq, *bdaSrate;
+    QSpinBox *jackChannels, *jackCaching;
+    QCheckBox *jackPace, *jackConnect;
+    QLineEdit *jackPortsSelected;
 
     QLabel *bdaSrateLabel, *bdaBandLabel;