Changeset b6ffa9ae52c53a2d4f3e0f8d8d100403c2b874f7

Timestamp:

09/01/07 19:26:17 (1 year ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1188667577 +0000

git-parent:

[4070db3ea94ae8e6c3680c4f11fe6540c97bc775]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1188667577 +0000

Message:

Qt4 - Jack Input UI.

Files:

• modules/gui/qt4/components/open.cpp (modified) (7 diffs)
• modules/gui/qt4/components/open.hpp (modified) (4 diffs)

modules/gui/qt4/components/open.cpp

@@ -3 +3 @@
- ****************************************************************************
- * 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
@@ -88 +91 @@
-    /* Ugly hacks to get the good Widget */
-    //This lineEdit is the normal line in the fileDialog.
-_VERSION >= 0x040300
+43
-    lineFileEdit = findChildren<QLineEdit*>()[2];
-#else
@@ -103 +106 @@
-    listLabel[5]->setText( qtr( "Filter:" ) );
-
+    QListView *fileListView = findChildren<QListView*>().first();
-#if WIN32
- 
+
-       the followin */
-    QListView *fileListView = findChildren<QListView*>().first();
-    fileListView->setLayoutMode(QListView::Batched);
-    fileListView->setViewMode(QListView::ListMode);
@@ -129 +132 @@
-    BUTTONACT( ui.subCheckBox, toggleSubtitleFrame());
-
+#if QT43
+    CONNECT( fileListView, clicked( QModelIndex ), this, updateMRL() );
+#else
-    CONNECT( ui.fileInput, editTextChanged( QString ), this, updateMRL() );
+#endif
-    CONNECT( ui.subInput, editTextChanged( QString ), this, updateMRL() );
-    CONNECT( ui.alignSubComboBox, currentIndexChanged( int ), this,
@@ -170 +177 @@
-void FileOpenPanel::updateMRL()
-{
+    msg_Dbg( p_intf, "I was here" );
-    QString mrl = ui.fileInput->currentText();
-
@@ -520 +528 @@
-    CuMRL( v4lNormBox,  currentIndexChanged ( int ) );
-
+    /*******
+     * JACK *
+     *******/
+    addModuleAndLayouts( JACK_DEVICE, jack, "JACK Audio Connection Kit" );
+
+    /* Jack Main panel */
+    /* Channels */
+    QLabel *jackChannelsLabel = new QLabel( qtr( "Channels :" ) );
+    jackDevLayout->addWidget( jackChannelsLabel, 1, 0 );
+
+    jackChannels = new QSpinBox;
+    setSpinBoxFreq( jackChannels );
+    jackChannels->setMaximum(255);
+    jackChannels->setValue(2);
+    jackChannels->setAlignment( Qt::AlignRight );
+    jackDevLayout->addWidget( jackChannels, 1, 1 );
+
+    /* Jack Props panel */
+    
+    /* Selected ports */
+    QLabel *jackPortsLabel = new QLabel( qtr( "Selected ports :" ) );
+    jackPropLayout->addWidget( jackPortsLabel, 0 , 0 );
+
+    jackPortsSelected = new QLineEdit( qtr( ".*") );
+    jackPortsSelected->setAlignment( Qt::AlignRight );
+    jackPropLayout->addWidget( jackPortsSelected, 0, 1 );
+    
+    /* Caching */
+    QLabel *jackCachingLabel = new QLabel( qtr( "Input caching :" ) );
+    jackPropLayout->addWidget( jackCachingLabel, 1 , 0 );
+    jackCaching = new QSpinBox;
+    setSpinBoxFreq( jackCaching );
+    jackCaching->setSuffix( " ms" );
+    jackCaching->setValue(1000);
+    jackCaching->setAlignment( Qt::AlignRight );
+    jackPropLayout->addWidget( jackCaching, 1 , 1 );
+    
+    /* Pace */
+    jackPace = new QCheckBox(qtr( "Use VLC pace" ));
+    jackPropLayout->addWidget( jackPace, 2, 1 );
+    
+    /* Auto Connect */
+    jackConnect = new QCheckBox( qtr( "Auto connnection" ));
+    jackPropLayout->addWidget( jackConnect, 3, 1 );
+    
+    /* Jack CONNECTs */
+    CuMRL( jackChannels, valueChanged( int ) );
+    CuMRL( jackCaching, valueChanged( int ) );
+    CuMRL( jackPace, stateChanged( int ) );
+    CuMRL( jackConnect, stateChanged( int ) );
+    CuMRL( jackPortsSelected, textChanged( QString ) );
+
-    /************
-     * PVR      *
@@ -773 +833 @@
-        mrl += " :v4l-norm=" + QString("%1").arg( v4lNormBox->currentIndex() );
-        mrl += " :v4l-frequency=" + QString("%1").arg( v4lFreq->value() );
+        break;
+    case JACK_DEVICE:
+        mrl = "jack://";
+        mrl += "channels=" + QString("%1").arg( jackChannels->value() );
+        mrl += ":ports=" + jackPortsSelected->text();
+        mrl += " --jack-input-caching=" + QString("%1").arg( jackCaching->value() );
+        if ( jackPace->isChecked() )
+        {
+                mrl += " --jack-input-use-vlc-pace";
+        }
+        if ( jackConnect->isChecked() )
+        {
+                mrl += " --jack-input-auto-connect";
+        }
-        break;
-    case PVR_DEVICE:

modules/gui/qt4/components/open.hpp

@@ -3 +3 @@
- ****************************************************************************
- * 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
@@ -48 +51 @@
-#define DSHOW_DEVICE       0x8
-#define SCREEN_DEVICE      0x16
+#define JACK_DEVICE        0x32
-
-class QWidget;
@@ -146 +150 @@
-    QRadioButton *dvbs, *dvbt, *dvbc;
-    QRadioButton *bdas, *bdat, *bdac;
- 
+
-    QLineEdit *v4lVideoDevice, *v4lAudioDevice;
-    QLineEdit *pvrDevice, *pvrRadioDevice;
@@ -152 +156 @@
-    QSpinBox *dvbCard, *dvbFreq, *dvbSrate;
-    QSpinBox *bdaCard, *bdaFreq, *bdaSrate;
+    QSpinBox *jackChannels, *jackCaching;
+    QCheckBox *jackPace, *jackConnect;
+    QLineEdit *jackPortsSelected;
-
-    QLabel *bdaSrateLabel, *bdaBandLabel;