Allow selection of audio frequency for screen grabs:

http://www.kdenlive.org:80/mantis/view.php?id=371

svn path=/branches/KDE4/; revision=2728

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 221ae30f4139395752f72f31d2df46186efa59d2..185751969908c57837fd759b5c0838c6511540d3 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -286,6 +286,16 @@
       <default></default>
     </entry>
 
+    <entry name="rmd_audio_freq" type="UInt">
+      <label>Audio frequency used for sound recording.</label>
+      <default>0</default>
+    </entry>
+
+    <entry name="rmd_freq" type="String">
+      <label>Audio frequency used for sound recording.</label>
+      <default>48000</default>
+    </entry>
+
     <entry name="rmd_alsa_buffer" type="Int">
       <label>Buffer for alsa audio rec.</label>
       <default>0</default>

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 838a6c615b75798c92558e59559527a6ebc0112e..53ccff20a44651246b894b09b98a00ac0f9aea0e 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -380,6 +380,13 @@ void KdenliveSettingsDialog::updateSettings() {
         KdenliveSettings::setRmd_alsadevicename(value);
     }
 
+    value = m_configCapture.kcfg_rmd_audio_freq->itemText(m_configCapture.kcfg_rmd_audio_freq->currentIndex());
+    kDebug()<<"// AUDIO FREQ VALUE: "<<value<<", CURRENT: "<<KdenliveSettings::rmd_freq()<<", IX: "<<m_configCapture.kcfg_rmd_audio_freq->currentIndex();
+    if (value != KdenliveSettings::rmd_freq()) {
+       kDebug()<<"// SETTING AUDIO FREQ TO: "<<value;
+        KdenliveSettings::setRmd_freq(value);
+    }
+
     value = m_configSdl.kcfg_audio_driver->itemData(m_configSdl.kcfg_audio_driver->currentIndex()).toString();
     if (value != KdenliveSettings::audiodrivername()) {
         KdenliveSettings::setAudiodrivername(value);

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index 29b0e8c5c5b0f22ff9cb997b5bb9916618ed3ec2..c0c602fa3bb391b3c71674ee9ac599ac23b6a6d0 100644 (file)
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -455,6 +455,8 @@ void RecMonitor::slotRecord() {
             }
             m_isCapturing = true;
             if (KdenliveSettings::rmd_capture_audio()) {
+               m_captureArgs << "-freq" << KdenliveSettings::rmd_freq();
+               m_captureArgs << "-channels" << QString::number(KdenliveSettings::rmd_audio_channels());
                 if (KdenliveSettings::rmd_use_jack()) {
                     m_captureArgs << "-use-jack" << KdenliveSettings::rmd_jackports();
                     if (KdenliveSettings::rmd_jack_buffer() > 0.0)

diff --git a/src/widgets/configcapture_ui.ui b/src/widgets/configcapture_ui.ui
index 02234d1b3f54725963572c999ec04c0d8b4cc82e..918e21ab62b2fa5b941179e44951580e9777e1d7 100644 (file)
--- a/src/widgets/configcapture_ui.ui
+++ b/src/widgets/configcapture_ui.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>409</width>
-    <height>416</height>
+    <height>444</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_6" >
@@ -381,7 +381,7 @@
        <string>Screen Grab</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3" >
-       <item row="0" column="0" colspan="5" >
+       <item row="0" column="0" colspan="3" >
         <widget class="QLabel" name="rmd_info" >
          <property name="frameShape" >
           <enum>QFrame::StyledPanel</enum>
@@ -394,14 +394,14 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="5" >
+       <item row="1" column="0" colspan="3" >
         <widget class="QCheckBox" name="kcfg_rmd_capture_audio" >
          <property name="text" >
           <string>Capture audio</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="5" >
+       <item row="2" column="0" colspan="3" >
         <widget class="QFrame" name="audio_group" >
          <property name="frameShape" >
           <enum>QFrame::StyledPanel</enum>
@@ -410,7 +410,7 @@
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_4" >
-          <item row="0" column="0" >
+          <item row="1" column="0" >
            <widget class="QRadioButton" name="radioButton_2" >
             <property name="text" >
              <string>ALSA</string>
@@ -420,54 +420,113 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1" colspan="3" >
+          <item row="1" column="1" colspan="3" >
            <widget class="KComboBox" name="kcfg_rmd_alsa_device" />
           </item>
-          <item row="1" column="0" >
+          <item row="2" column="0" >
            <widget class="QRadioButton" name="kcfg_rmd_use_jack" >
             <property name="text" >
              <string>Jack</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
+          <item row="2" column="1" >
            <widget class="QLabel" name="label_10" >
             <property name="text" >
              <string>Ports:</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="3" >
+          <item row="2" column="3" >
            <widget class="KLineEdit" name="kcfg_rmd_jackports" />
           </item>
-          <item row="1" column="4" >
+          <item row="2" column="4" >
            <widget class="QLabel" name="label_21" >
             <property name="text" >
              <string>Buffer</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="5" >
+          <item row="2" column="5" >
            <widget class="KDoubleNumInput" name="kcfg_rmd_jack_buffer" />
           </item>
-          <item row="0" column="5" >
+          <item row="1" column="5" >
            <widget class="KIntSpinBox" name="kcfg_rmd_alsa_buffer" >
             <property name="maximum" >
              <number>999</number>
             </property>
            </widget>
           </item>
-          <item row="0" column="4" >
+          <item row="1" column="4" >
            <widget class="QLabel" name="label_17" >
             <property name="text" >
              <string>Buffer</string>
             </property>
            </widget>
           </item>
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label_8" >
+            <property name="text" >
+             <string>Audio channels</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="KIntSpinBox" name="kcfg_rmd_audio_channels" />
+          </item>
+          <item row="0" column="3" >
+           <widget class="QLabel" name="label_22" >
+            <property name="text" >
+             <string>Audio frequency</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="4" colspan="2" >
+           <widget class="KComboBox" name="kcfg_rmd_audio_freq" >
+            <item>
+             <property name="text" >
+              <string>48000</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>41000</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>32000</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>22500</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>11250</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="0" column="2" >
+           <spacer name="horizontalSpacer_3" >
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
-       <item row="3" column="0" colspan="5" >
+       <item row="3" column="0" colspan="3" >
         <widget class="KComboBox" name="kcfg_rmd_capture_type" >
          <item>
           <property name="text" >
@@ -481,7 +540,7 @@
          </item>
         </widget>
        </item>
-       <item row="4" column="0" colspan="5" >
+       <item row="4" column="0" colspan="3" >
         <widget class="QFrame" name="region_group" >
          <property name="frameShape" >
           <enum>QFrame::StyledPanel</enum>
@@ -556,14 +615,14 @@
         </widget>
        </item>
        <item row="5" column="0" >
-        <widget class="QLabel" name="label_8" >
+        <widget class="QLabel" name="label_18" >
          <property name="text" >
-          <string>Audio channels</string>
+          <string>Frame rate</string>
          </property>
         </widget>
        </item>
        <item row="5" column="1" >
-        <widget class="KIntSpinBox" name="kcfg_rmd_audio_channels" />
+        <widget class="KDoubleNumInput" name="kcfg_rmd_fps" />
        </item>
        <item row="5" column="2" >
         <spacer name="horizontalSpacer_2" >
@@ -572,30 +631,20 @@
          </property>
          <property name="sizeHint" stdset="0" >
           <size>
-           <width>86</width>
-           <height>26</height>
+           <width>237</width>
+           <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="5" column="3" >
-        <widget class="QLabel" name="label_18" >
-         <property name="text" >
-          <string>Frame rate</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="4" >
-        <widget class="KDoubleNumInput" name="kcfg_rmd_fps" />
-       </item>
-       <item row="6" column="0" colspan="4" >
+       <item row="6" column="0" colspan="3" >
         <widget class="QCheckBox" name="kcfg_rmd_fullshots" >
          <property name="text" >
           <string>Full shots</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="0" colspan="5" >
+       <item row="7" column="0" colspan="3" >
         <spacer name="verticalSpacer_3" >
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
@@ -613,6 +662,9 @@
     </widget>
    </item>
   </layout>
+  <zorder>label</zorder>
+  <zorder>kcfg_defaultcapture</zorder>
+  <zorder>tabWidget</zorder>
  </widget>
  <customwidgets>
   <customwidget>
@@ -665,7 +717,6 @@
   <tabstop>kcfg_rmd_offsety</tabstop>
   <tabstop>kcfg_rmd_width</tabstop>
   <tabstop>kcfg_rmd_height</tabstop>
-  <tabstop>kcfg_rmd_audio_channels</tabstop>
   <tabstop>kcfg_rmd_fullshots</tabstop>
  </tabstops>
  <resources/>