From ab13096c997915cac07bb372ed0d4cecc675b8d7 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Sun, 16 Nov 2008 16:33:21 +0000
Subject: [PATCH] Update the recordmydesktop config options

svn path=/branches/KDE4/; revision=2707
---
 src/kdenlivesettings.kcfg       | 16 +++++++
 src/recmonitor.cpp              | 19 ++++++--
 src/widgets/configcapture_ui.ui | 79 +++++++++++++++++++++++++++++----
 3 files changed, 102 insertions(+), 12 deletions(-)

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index e82bd659..221ae30f 100644
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -286,6 +286,22 @@
       <default></default>
     </entry>
 
+    <entry name="rmd_alsa_buffer" type="Int">
+      <label>Buffer for alsa audio rec.</label>
+      <default>0</default>
+    </entry>
+
+    <entry name="rmd_jack_buffer" type="Double">
+      <label>Buffer for jack audio rec.</label>
+      <default>0.0</default>
+    </entry>
+
+    <entry name="rmd_hide_frame" type="Bool">
+      <label>Hide frame around capture zone.</label>
+      <default>false</default>
+    </entry>
+
+
     <entry name="dvgrab_path" type="String">
       <label>Path for the dvgrab binary.</label>
       <default></default>
diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index 85765e4f..29b0e8c5 100644
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -447,17 +447,28 @@ void RecMonitor::slotRecord() {
                 m_captureArgs << "-width" << QString::number(KdenliveSettings::rmd_width()) << "-height" << QString::number(KdenliveSettings::rmd_height());
                 if (!KdenliveSettings::rmd_follow_mouse()) {
                     m_captureArgs << "-x" << QString::number(KdenliveSettings::rmd_offsetx()) << "-y" << QString::number(KdenliveSettings::rmd_offsety());
-                } else m_captureArgs << "--follow-mouse";
+                } else {
+                    m_captureArgs << "--follow-mouse";
+                    if (KdenliveSettings::rmd_hide_frame()) m_captureArgs << "--no-frame";
+                }
                 break;
             }
             m_isCapturing = true;
             if (KdenliveSettings::rmd_capture_audio()) {
-                if (KdenliveSettings::rmd_use_jack()) m_captureArgs << "-use-jack" << KdenliveSettings::rmd_jackports();
-                else if (!KdenliveSettings::rmd_alsadevicename().isEmpty())
-                    m_captureArgs << "-device" << KdenliveSettings::rmd_alsadevicename();
+                if (KdenliveSettings::rmd_use_jack()) {
+                    m_captureArgs << "-use-jack" << KdenliveSettings::rmd_jackports();
+                    if (KdenliveSettings::rmd_jack_buffer() > 0.0)
+                        m_captureArgs << "-ring-buffer-size" << QString::number(KdenliveSettings::rmd_jack_buffer());
+                } else {
+                    if (!KdenliveSettings::rmd_alsadevicename().isEmpty())
+                        m_captureArgs << "-device" << KdenliveSettings::rmd_alsadevicename();
+                    if (KdenliveSettings::rmd_alsa_buffer() > 0)
+                        m_captureArgs << "-buffer-size" << QString::number(KdenliveSettings::rmd_alsa_buffer());
+                }
             } else m_captureArgs << "--no-sound";
 
             if (KdenliveSettings::rmd_fullshots()) m_captureArgs << "--full-shots";
+            m_captureArgs << "-workdir" << KdenliveSettings::currenttmpfolder();
             m_captureArgs << "-fps" << QString::number(KdenliveSettings::rmd_fps()) << "-o" << m_captureFile.path();
             captureProcess->start(KdenliveSettings::rmd_path(), m_captureArgs);
             kDebug() << "// RecordMyDesktop params: " << m_captureArgs;
diff --git a/src/widgets/configcapture_ui.ui b/src/widgets/configcapture_ui.ui
index 3928b5f2..02234d1b 100644
--- 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>411</height>
+    <height>416</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_6" >
@@ -45,7 +45,7 @@
       </size>
      </property>
      <property name="currentIndex" >
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab" >
       <attribute name="title" >
@@ -420,6 +420,9 @@
             </property>
            </widget>
           </item>
+          <item row="0" column="1" colspan="3" >
+           <widget class="KComboBox" name="kcfg_rmd_alsa_device" />
+          </item>
           <item row="1" column="0" >
            <widget class="QRadioButton" name="kcfg_rmd_use_jack" >
             <property name="text" >
@@ -427,12 +430,6 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1" colspan="2" >
-           <widget class="KComboBox" name="kcfg_rmd_alsa_device" />
-          </item>
-          <item row="1" column="2" >
-           <widget class="KLineEdit" name="kcfg_rmd_jackports" />
-          </item>
           <item row="1" column="1" >
            <widget class="QLabel" name="label_10" >
             <property name="text" >
@@ -440,6 +437,33 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="3" >
+           <widget class="KLineEdit" name="kcfg_rmd_jackports" />
+          </item>
+          <item row="1" column="4" >
+           <widget class="QLabel" name="label_21" >
+            <property name="text" >
+             <string>Buffer</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="5" >
+           <widget class="KDoubleNumInput" name="kcfg_rmd_jack_buffer" />
+          </item>
+          <item row="0" column="5" >
+           <widget class="KIntSpinBox" name="kcfg_rmd_alsa_buffer" >
+            <property name="maximum" >
+             <number>999</number>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="4" >
+           <widget class="QLabel" name="label_17" >
+            <property name="text" >
+             <string>Buffer</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -521,6 +545,13 @@
             </property>
            </widget>
           </item>
+          <item row="0" column="1" >
+           <widget class="QCheckBox" name="kcfg_rmd_hide_frame" >
+            <property name="text" >
+             <string>Hide frame</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -605,6 +636,38 @@
    <header>klineedit.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>kcfg_defaultcapture</tabstop>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>kcfg_firewireformat</tabstop>
+  <tabstop>kcfg_firewireautosplit</tabstop>
+  <tabstop>kcfg_firewiretimestamp</tabstop>
+  <tabstop>kcfg_video4vdevice</tabstop>
+  <tabstop>kcfg_video4vformat</tabstop>
+  <tabstop>kcfg_video4vencoding</tabstop>
+  <tabstop>kcfg_video4adevice</tabstop>
+  <tabstop>kcfg_video4aformat</tabstop>
+  <tabstop>kcfg_video4aencoding</tabstop>
+  <tabstop>kcfg_video4size</tabstop>
+  <tabstop>kcfg_video4rate</tabstop>
+  <tabstop>kcfg_video4capture</tabstop>
+  <tabstop>kcfg_video4playback</tabstop>
+  <tabstop>kcfg_rmd_capture_audio</tabstop>
+  <tabstop>radioButton_2</tabstop>
+  <tabstop>kcfg_rmd_alsa_device</tabstop>
+  <tabstop>kcfg_rmd_alsa_buffer</tabstop>
+  <tabstop>kcfg_rmd_use_jack</tabstop>
+  <tabstop>kcfg_rmd_jackports</tabstop>
+  <tabstop>kcfg_rmd_capture_type</tabstop>
+  <tabstop>kcfg_rmd_follow_mouse</tabstop>
+  <tabstop>kcfg_rmd_hide_frame</tabstop>
+  <tabstop>kcfg_rmd_offsetx</tabstop>
+  <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/>
  <connections/>
 </ui>
-- 
2.39.2