Allow audio capture through alsa for screen grabs. Should fix issue:

[kdenlive] / src / widgets / configcapture_ui.ui

diff --git a/src/widgets/configcapture_ui.ui b/src/widgets/configcapture_ui.ui
index 452f1de217a1a3f386192deefc03f0b01db8d324..439d2d2f81ebcf325a9084fdfa4691b8acbd6748 100644 (file)
--- a/src/widgets/configcapture_ui.ui
+++ b/src/widgets/configcapture_ui.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>446</width>
-    <height>312</height>
+    <width>409</width>
+    <height>311</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_3" >
@@ -21,12 +21,12 @@
     <widget class="KComboBox" name="kcfg_defaultcapture" >
      <item>
       <property name="text" >
-       <string> Firewire (DV / HDV)</string>
+       <string>Firewire</string>
       </property>
      </item>
      <item>
       <property name="text" >
-       <string>Video4Linux (webcam)</string>
+       <string>Video4Linux</string>
       </property>
      </item>
      <item>
@@ -48,14 +48,6 @@
       <number>2</number>
      </property>
      <widget class="QWidget" name="tab" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>486</width>
-        <height>270</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Firewire / dvgrab</string>
       </attribute>
@@ -63,11 +55,11 @@
        <item row="0" column="0" >
         <widget class="QLabel" name="label_2" >
          <property name="text" >
-          <string>Default format</string>
+          <string>Capture format</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1" colspan="2" >
+       <item row="0" column="1" >
         <widget class="KComboBox" name="kcfg_firewireformat" >
          <item>
           <property name="text" >
@@ -91,7 +83,7 @@
          </item>
         </widget>
        </item>
-       <item row="0" column="3" >
+       <item row="0" column="2" >
         <spacer name="horizontalSpacer" >
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
@@ -104,7 +96,21 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="2" >
+       <item row="1" column="0" colspan="3" >
+        <widget class="QCheckBox" name="kcfg_firewireautosplit" >
+         <property name="text" >
+          <string>Automatically start a new file on scene cut</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="3" >
+        <widget class="QCheckBox" name="kcfg_firewiretimestamp" >
+         <property name="text" >
+          <string>Add recording time to captured file name</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1" >
         <spacer name="verticalSpacer_2" >
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
@@ -120,16 +126,8 @@
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>486</width>
-        <height>270</height>
-       </rect>
-      </property>
       <attribute name="title" >
-       <string>Video4Linux2 / FFmpeg</string>
+       <string>Video4Linux / FFmpeg</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout" >
        <item row="1" column="1" colspan="3" >
@@ -353,39 +351,66 @@
       </layout>
      </widget>
      <widget class="QWidget" name="tab_3" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>430</width>
-        <height>238</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Screen Grab / FFmpeg</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_4" >
-       <item row="0" column="0" >
+      <layout class="QGridLayout" name="gridLayout_5" >
+       <item row="0" column="0" colspan="2" >
         <widget class="QCheckBox" name="kcfg_screengrabenableaudio" >
          <property name="text" >
           <string>Capture audio</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="2" >
-        <widget class="KLineEdit" name="kcfg_screengrabaudiocapture" />
+       <item row="1" column="0" colspan="3" >
+        <widget class="QFrame" name="audio_group" >
+         <property name="frameShape" >
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow" >
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_4" >
+          <item row="0" column="0" >
+           <widget class="QRadioButton" name="radioButton_2" >
+            <property name="text" >
+             <string>ALSA</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="KLineEdit" name="kcfg_screengrabalsacapture" />
+          </item>
+          <item row="0" column="2" >
+           <widget class="KLineEdit" name="kcfg_screengrabalsacapture2" />
+          </item>
+          <item row="1" column="0" >
+           <widget class="QRadioButton" name="kcfg_useosscapture" >
+            <property name="text" >
+             <string>OSS</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" colspan="2" >
+           <widget class="KLineEdit" name="kcfg_screengrabosscapture" />
+          </item>
+         </layout>
+        </widget>
        </item>
-       <item row="1" column="0" colspan="2" >
+       <item row="2" column="0" colspan="2" >
         <widget class="QLabel" name="label_17" >
          <property name="text" >
           <string>Video capture params</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="2" >
+       <item row="2" column="2" >
         <widget class="KLineEdit" name="kcfg_screengrabcapture" />
        </item>
-       <item row="2" column="0" >
+       <item row="3" column="0" colspan="2" >
         <widget class="QLabel" name="label_8" >
          <property name="sizePolicy" >
           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
@@ -398,7 +423,7 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="2" >
+       <item row="3" column="2" >
         <widget class="KLineEdit" name="kcfg_screengrabencoding" >
          <property name="sizePolicy" >
           <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
@@ -411,7 +436,7 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="0" >
+       <item row="4" column="0" >
         <widget class="QLabel" name="label_10" >
          <property name="sizePolicy" >
           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
@@ -424,7 +449,7 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="2" >
+       <item row="4" column="2" >
         <widget class="KLineEdit" name="kcfg_screengrabextension" >
          <property name="sizePolicy" >
           <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
@@ -437,14 +462,14 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="3" >
+       <item row="5" column="0" colspan="3" >
         <widget class="QCheckBox" name="kcfg_fullscreengrab" >
          <property name="text" >
           <string>Full screen capture</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="1" colspan="2" >
+       <item row="6" column="1" colspan="2" >
         <spacer name="verticalSpacer_3" >
          <property name="orientation" >
           <enum>Qt::Vertical</enum>