From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Sun, 16 Mar 2008 12:24:51 +0000 (+0000)
Subject: Add command line for advanced video4linux config
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f43509e723f4586f1a1234dfdf3f08724eb614ef;p=kdenlive

Add command line for advanced video4linux config

svn path=/branches/KDE4/; revision=2065
---

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 6760855a..6e02f045 100644
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -72,7 +72,7 @@
 
     <entry name="video4vformat" type="String">
       <label>Default video4linux capture format.</label>
-      <default>m4v</default>
+      <default>video4linux2</default>
     </entry>
 
     <entry name="video4vdevice" type="String">
@@ -90,20 +90,35 @@
       <default>/dev/dsp</default>
     </entry>
 
-    <entry name="video4width" type="Int">
+    <entry name="video4size" type="String">
+      <label>Default video4linux capture format.</label>
+      <default>320x240</default>
+    </entry>
+
+    <entry name="video4vencoding" type="String">
       <label>Default video4linux capture format.</label>
-      <default>320</default>
+      <default>m4v</default>
     </entry>
 
-    <entry name="video4height" type="Int">
+    <entry name="video4aencoding" type="String">
       <label>Default video4linux capture format.</label>
-      <default>240</default>
+      <default></default>
     </entry>
 
     <entry name="video4rate" type="Int">
       <label>Default video4linux capture format.</label>
       <default>15</default>
     </entry>
+
+    <entry name="video4capture" type="String">
+      <label>ffmpeg arguments for video capture.</label>
+      <default></default>
+    </entry>
+
+    <entry name="video4playback" type="String">
+      <label>ffplay arguments for video playback.</label>
+      <default></default>
+    </entry>
   </group>
 
   <group name="unmanaged">
diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 18ee2947..adcb99bd 100644
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -51,6 +51,15 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(
     m_configCapture.capturefolderurl->lineEdit()->setObjectName("kcfg_capturefolder");
     page4 = addPage(p4, i18n("Capture"), "audio-card");
 
+    connect(m_configCapture.kcfg_video4vdevice, SIGNAL(editingFinished ()), this, SLOT(rebuildVideo4Commands()));
+    connect(m_configCapture.kcfg_video4adevice, SIGNAL(editingFinished ()), this, SLOT(rebuildVideo4Commands()));
+    connect(m_configCapture.kcfg_video4vformat, SIGNAL(editingFinished ()), this, SLOT(rebuildVideo4Commands()));
+    connect(m_configCapture.kcfg_video4aformat, SIGNAL(editingFinished ()), this, SLOT(rebuildVideo4Commands()));
+    connect(m_configCapture.kcfg_video4vencoding, SIGNAL(editingFinished ()), this, SLOT(rebuildVideo4Commands()));
+    connect(m_configCapture.kcfg_video4aencoding, SIGNAL(editingFinished ()), this, SLOT(rebuildVideo4Commands()));
+    connect(m_configCapture.kcfg_video4size, SIGNAL(editingFinished ()), this, SLOT(rebuildVideo4Commands()));
+    connect(m_configCapture.kcfg_video4rate, SIGNAL(editingFinished ()), this, SLOT(rebuildVideo4Commands()));
+
     QStringList profilesNames = ProfilesDialog::getProfileNames();
     m_configMisc.profiles_list->addItems(profilesNames);
     m_defaulfProfile = ProfilesDialog::getSettingsFromFile(KdenliveSettings::default_profile()).value("description");
@@ -63,6 +72,18 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(
 KdenliveSettingsDialog::~KdenliveSettingsDialog() {}
 
 
+void KdenliveSettingsDialog::rebuildVideo4Commands() {
+    QString captureCommand;
+	if (!m_configCapture.kcfg_video4adevice->text().isEmpty()) captureCommand = "-f " + m_configCapture.kcfg_video4aformat->text() + " -i " + m_configCapture.kcfg_video4adevice->text();
+
+	captureCommand +=  " -f " + m_configCapture.kcfg_video4vformat->text() + " -s " + m_configCapture.kcfg_video4size->text() + " -r " + QString::number(m_configCapture.kcfg_video4rate->value()) + " -i " + m_configCapture.kcfg_video4vdevice->text() + " -f " + m_configCapture.kcfg_video4vencoding->text();
+	m_configCapture.kcfg_video4capture->setText(captureCommand);
+
+	QString playbackCommand;
+	playbackCommand =  "-f " + m_configCapture.kcfg_video4vencoding->text();
+	m_configCapture.kcfg_video4playback->setText(playbackCommand);
+}
+
 bool KdenliveSettingsDialog::hasChanged() {
     kDebug() << "// // // KCONFIG hasChanged called";
     if (m_configMisc.profiles_list->currentText() != m_defaulfProfile) return true;
diff --git a/src/kdenlivesettingsdialog.h b/src/kdenlivesettingsdialog.h
index 9f637155..975e1a54 100644
--- a/src/kdenlivesettingsdialog.h
+++ b/src/kdenlivesettingsdialog.h
@@ -42,6 +42,7 @@ protected:
 
 private slots:
     void slotUpdateDisplay();
+    void rebuildVideo4Commands();
 
 private:
     KPageWidgetItem *page1;
diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index 98037694..bdb3fb68 100644
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -82,6 +82,19 @@ RecMonitor::RecMonitor(QString name, QWidget *parent)
     env << "SDL_WINDOWID=" + QString::number(ui.video_frame->winId());
     displayProcess->setEnvironment(env);
 
+    if (KdenliveSettings::video4capture().isEmpty()) {
+	QString captureCommand;
+	if (!KdenliveSettings::video4adevice().isEmpty()) captureCommand = "-f " + KdenliveSettings::video4aformat() + " -i " + KdenliveSettings::video4adevice();
+
+	captureCommand +=  " -f " + KdenliveSettings::video4vformat() + " -s " + KdenliveSettings::video4size() + " -r " + QString::number(KdenliveSettings::video4rate()) + " -i " + KdenliveSettings::video4vdevice() + " -f " + KdenliveSettings::video4vencoding();
+	KdenliveSettings::setVideo4capture(captureCommand);
+    }
+
+    if (KdenliveSettings::video4playback().isEmpty()) {
+	QString playbackCommand;
+	playbackCommand =  "-f " + KdenliveSettings::video4vencoding();
+	KdenliveSettings::setVideo4playback(playbackCommand);
+    }
     kDebug() << "/////// BUILDING MONITOR, ID: " << ui.video_frame->winId();
 }
 
@@ -214,9 +227,8 @@ void RecMonitor::slotStartCapture(bool play) {
         m_captureArgs << "--format" << "hdv" << "-i" << "capture" << "-";
         m_displayArgs << "-f" << "mpegts" << "-x" << QString::number(ui.video_frame->width()) << "-y" << QString::number(ui.video_frame->height()) << "-";
     } else {
-        if (!KdenliveSettings::video4adevice().isEmpty()) m_captureArgs << "-f" << KdenliveSettings::video4aformat() << "-i" << KdenliveSettings::video4adevice();
-        m_captureArgs << "-f" << "video4linux2" << "-s" << QString::number(KdenliveSettings::video4width()) + "x" + QString::number(KdenliveSettings::video4height()) << "-r" << QString::number(KdenliveSettings::video4rate()) << "-i" << KdenliveSettings::video4vdevice() << "-f" << KdenliveSettings::video4vformat() << "-";
-        m_displayArgs << "-f" << KdenliveSettings::video4vformat() << "-x" << QString::number(ui.video_frame->width()) << "-y" << QString::number(ui.video_frame->height()) << "-";
+	m_captureArgs << KdenliveSettings::video4capture().simplified().split(' ') << "-";
+        m_displayArgs << KdenliveSettings::video4playback().simplified().split(' ') << "-x" << QString::number(ui.video_frame->width()) << "-y" << QString::number(ui.video_frame->height()) << "-";
     }
 
     captureProcess->setStandardOutputProcess(displayProcess);
@@ -276,9 +288,8 @@ void RecMonitor::slotRecord() {
             m_captureArgs << "--format" << "hdv" << "-i" << "capture" << "-";
             m_displayArgs << "-f" << "mpegts" << "-x" << QString::number(ui.video_frame->width()) << "-y" << QString::number(ui.video_frame->height()) << "-";
         } else {
-            if (!KdenliveSettings::video4adevice().isEmpty()) m_captureArgs << "-f" << KdenliveSettings::video4aformat() << "-i" << KdenliveSettings::video4adevice();
-            m_captureArgs << "-f" << "video4linux2" << "-s" << QString::number(KdenliveSettings::video4width()) + "x" + QString::number(KdenliveSettings::video4height()) << "-r" << QString::number(KdenliveSettings::video4rate()) << "-i" << KdenliveSettings::video4vdevice() << "-y" << "-f" << KdenliveSettings::video4vformat() << m_captureFile.path() << "-f" << KdenliveSettings::video4vformat() << "-";
-            m_displayArgs << "-f" << KdenliveSettings::video4vformat() << "-x" << QString::number(ui.video_frame->width()) << "-y" << QString::number(ui.video_frame->height()) << "-";
+	    m_captureArgs << KdenliveSettings::video4capture().simplified().split(' ') << "-y" << m_captureFile.path() << "-f" << KdenliveSettings::video4vencoding() << "-";
+	    m_displayArgs << KdenliveSettings::video4playback().simplified().split(' ') << "-x" << QString::number(ui.video_frame->width()) << "-y" << QString::number(ui.video_frame->height()) << "-";
         }
 
         captureProcess->setStandardOutputProcess(displayProcess);
diff --git a/src/widgets/configcapture_ui.ui b/src/widgets/configcapture_ui.ui
index a177b4fe..647a8136 100644
--- a/src/widgets/configcapture_ui.ui
+++ b/src/widgets/configcapture_ui.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>422</width>
-    <height>339</height>
+    <width>502</width>
+    <height>374</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_3" >
@@ -31,160 +31,360 @@
      </item>
     </widget>
    </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label_10" >
+     <property name="text" >
+      <string>Capture folder</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="KUrlRequester" name="capturefolderurl" />
+   </item>
    <item row="2" column="0" colspan="2" >
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
-      <string>Firewire config</string>
+    <widget class="QTabWidget" name="tabWidget" >
+     <property name="minimumSize" >
+      <size>
+       <width>401</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="currentIndex" >
+      <number>0</number>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2" >
-      <item row="0" column="0" >
-       <widget class="QLabel" name="label_2" >
-        <property name="text" >
-         <string>Default format</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="KComboBox" name="kcfg_firewireformat" >
-        <item>
+     <widget class="QWidget" name="tab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>482</width>
+        <height>233</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Firewire / dvgrab</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_2" >
+         <property name="text" >
+          <string>Default format</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" colspan="2" >
+        <widget class="KComboBox" name="kcfg_firewireformat" >
+         <item>
+          <property name="text" >
+           <string>DV Raw</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>DV AVI type 1</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>DV AVI type 2</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>HDV</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="0" column="3" >
+        <spacer name="horizontalSpacer" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>241</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="2" >
+        <spacer name="verticalSpacer_2" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>20</width>
+           <height>188</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>482</width>
+        <height>233</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Video4Linux2 / FFmpeg</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_7" >
          <property name="text" >
-          <string>DV Raw</string>
+          <string>Video</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" colspan="9" >
+        <widget class="Line" name="line" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
          </property>
-        </item>
-        <item>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="label_14" >
          <property name="text" >
-          <string>DV AVI type 1</string>
+          <string>Device</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" colspan="3" >
+        <widget class="KLineEdit" name="kcfg_video4vdevice" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-        </item>
-        <item>
          <property name="text" >
-          <string>DV AVI type 2</string>
+          <string>/dev/video0</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="4" >
+        <widget class="QLabel" name="label_3" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-        </item>
-        <item>
          <property name="text" >
-          <string>HDV</string>
+          <string>Format</string>
          </property>
-        </item>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2" >
-    <widget class="QGroupBox" name="groupBox_2" >
-     <property name="title" >
-      <string>Video4Linux</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout" >
-      <item row="0" column="0" colspan="2" >
-       <widget class="QLabel" name="label_7" >
-        <property name="text" >
-         <string>Video device</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" colspan="2" >
-       <widget class="KLineEdit" name="kcfg_video4vdevice" >
-        <property name="text" >
-         <string>/dev/video0</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="4" >
-       <widget class="QLabel" name="label_3" >
-        <property name="text" >
-         <string>Format</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="5" >
-       <widget class="KLineEdit" name="kcfg_video4vformat" >
-        <property name="text" >
-         <string>m4v</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2" >
-       <widget class="QLabel" name="label_8" >
-        <property name="text" >
-         <string>Audio device</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" colspan="2" >
-       <widget class="KLineEdit" name="kcfg_video4adevice" >
-        <property name="text" >
-         <string>/dev/dsp</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="4" >
-       <widget class="QLabel" name="label_9" >
-        <property name="text" >
-         <string>Format</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="5" >
-       <widget class="KLineEdit" name="kcfg_video4aformat" >
-        <property name="text" >
-         <string>oss</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="label_4" >
-        <property name="text" >
-         <string>Image width</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2" >
-       <widget class="QSpinBox" name="kcfg_video4width" >
-        <property name="maximum" >
-         <number>2000</number>
-        </property>
-        <property name="value" >
-         <number>320</number>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="3" >
-       <widget class="QLabel" name="label_5" >
-        <property name="text" >
-         <string>Image height</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="4" colspan="2" >
-       <widget class="QSpinBox" name="kcfg_video4height" >
-        <property name="maximum" >
-         <number>2000</number>
-        </property>
-        <property name="value" >
-         <number>240</number>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="label_6" >
-        <property name="text" >
-         <string>Frame rate</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2" >
-       <widget class="QSpinBox" name="kcfg_video4rate" >
-        <property name="value" >
-         <number>15</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
+        </widget>
+       </item>
+       <item row="1" column="5" colspan="2" >
+        <widget class="KLineEdit" name="kcfg_video4vformat" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text" >
+          <string>video4linux2</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="7" colspan="2" >
+        <widget class="QLabel" name="label_5" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text" >
+          <string>Encoding</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="9" >
+        <widget class="KLineEdit" name="kcfg_video4vencoding" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text" >
+          <string>ogg</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2" >
+        <widget class="QLabel" name="label_15" >
+         <property name="text" >
+          <string>Audio</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="2" colspan="8" >
+        <widget class="Line" name="line_2" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" >
+        <widget class="QLabel" name="label_16" >
+         <property name="text" >
+          <string>Device</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1" colspan="3" >
+        <widget class="KLineEdit" name="kcfg_video4adevice" >
+         <property name="text" >
+          <string>/dev/dsp</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="4" >
+        <widget class="QLabel" name="label_9" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text" >
+          <string>Format</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="5" colspan="2" >
+        <widget class="KLineEdit" name="kcfg_video4aformat" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text" >
+          <string>oss</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="7" colspan="2" >
+        <widget class="QLabel" name="label_13" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text" >
+          <string>Encoding</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="9" >
+        <widget class="KLineEdit" name="kcfg_video4aencoding" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0" colspan="10" >
+        <widget class="Line" name="line_3" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="3" >
+        <widget class="QLabel" name="label_4" >
+         <property name="text" >
+          <string>Image size</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="3" colspan="3" >
+        <widget class="KLineEdit" name="kcfg_video4size" >
+         <property name="text" >
+          <string>320x240</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="6" colspan="2" >
+        <widget class="QLabel" name="label_6" >
+         <property name="text" >
+          <string>Frame rate</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="8" colspan="2" >
+        <widget class="QSpinBox" name="kcfg_video4rate" >
+         <property name="value" >
+          <number>15</number>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0" colspan="3" >
+        <widget class="QLabel" name="label_11" >
+         <property name="text" >
+          <string>Capture params</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="3" colspan="7" >
+        <widget class="KLineEdit" name="kcfg_video4capture" />
+       </item>
+       <item row="7" column="0" colspan="3" >
+        <widget class="QLabel" name="label_12" >
+         <property name="text" >
+          <string>Playback params</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="3" colspan="7" >
+        <widget class="KLineEdit" name="kcfg_video4playback" />
+       </item>
+      </layout>
+      <zorder>kcfg_video4vdevice</zorder>
+      <zorder>label_7</zorder>
+      <zorder>line</zorder>
+      <zorder>label_3</zorder>
+      <zorder>label_5</zorder>
+      <zorder>kcfg_video4vformat</zorder>
+      <zorder>kcfg_video4vencoding</zorder>
+      <zorder>label_14</zorder>
+      <zorder>kcfg_video4aencoding</zorder>
+      <zorder>kcfg_video4adevice</zorder>
+      <zorder>line_2</zorder>
+      <zorder>label_9</zorder>
+      <zorder>label_16</zorder>
+      <zorder>label_15</zorder>
+      <zorder>label_13</zorder>
+      <zorder>line_3</zorder>
+      <zorder>label_4</zorder>
+      <zorder>label_6</zorder>
+      <zorder>kcfg_video4size</zorder>
+      <zorder>label_11</zorder>
+      <zorder>kcfg_video4rate</zorder>
+      <zorder>kcfg_video4capture</zorder>
+      <zorder>kcfg_video4playback</zorder>
+      <zorder>label_12</zorder>
+      <zorder>kcfg_video4aformat</zorder>
+     </widget>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2" >
+   <item row="3" column="1" >
     <spacer name="verticalSpacer" >
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -197,16 +397,6 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="label_10" >
-     <property name="text" >
-      <string>Capture folder</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" >
-    <widget class="KUrlRequester" name="capturefolderurl" />
-   </item>
   </layout>
  </widget>
  <customwidgets>