- First step towards proper recordmydesktop error handling

- Set minimal track height to 10 px
- Set minimal recordmydesktop framerate to 1

svn path=/trunk/kdenlive/; revision=4434

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index 645ab89e29df085bb1e832096e116d7f84b24e0f..f94bd83be485f39f431f08e607c7e16786589ae2 100644 (file)
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -315,10 +315,6 @@ void RecMonitor::slotStopCapture()
         m_isPlaying = false;
         break;
     case VIDEO4LINUX:
-        m_captureProcess->write("q\n", 3);
-        QTimer::singleShot(1000, m_captureProcess, SLOT(kill()));
-
-        break;
     case SCREENGRAB:
         m_captureProcess->write("q\n", 3);
         QTimer::singleShot(1000, m_captureProcess, SLOT(kill()));
@@ -594,8 +590,15 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status)
         if (m_captureProcess && m_captureProcess->exitStatus() == QProcess::CrashExit) {
             video_frame->setText(i18n("Capture crashed, please check your parameters"));
         } else {
-            if (device_selector->currentIndex() != SCREENGRAB) video_frame->setText(i18n("Not connected"));
-            else video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", KdenliveSettings::capturefolder())));
+            if (device_selector->currentIndex() != SCREENGRAB) {
+                video_frame->setText(i18n("Not connected"));
+            } else {
+                if (m_captureProcess->exitCode() != 0) {
+                    video_frame->setText(i18n("Capture crashed, please check your parameters\nRecordMyDesktop exit code: %1", QString::number(m_captureProcess->exitCode())));
+                } else {
+                    video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", KdenliveSettings::capturefolder())));
+                }
+            }
         }
         m_isCapturing = false;
 

diff --git a/src/recmonitor.h b/src/recmonitor.h
index f216a1134fa9214ee6a2522fd6491830bf68ebe1..9cebdcd525a6b1773936d8ccfbf9a3db6974896b 100644 (file)
--- a/src/recmonitor.h
+++ b/src/recmonitor.h
@@ -17,6 +17,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
+/**
+* @class RecMonitor
+* @brief Record video with dvgrab, video4linux and recordmydesktop 
+* @author Jean-Baptiste Mardelle
+*/
 
 #ifndef RECMONITOR_H
 #define RECMONITOR_H

diff --git a/src/widgets/configcapture_ui.ui b/src/widgets/configcapture_ui.ui
index dee306491776b5be825fec7c6d4f43ca5f267814..f41f77c2359c53132fb442990778f3e0bd4a857a 100644 (file)
--- a/src/widgets/configcapture_ui.ui
+++ b/src/widgets/configcapture_ui.ui
@@ -633,7 +633,11 @@
         </widget>
        </item>
        <item row="5" column="1">
-        <widget class="KDoubleNumInput" name="kcfg_rmd_fps"/>
+        <widget class="KDoubleNumInput" name="kcfg_rmd_fps">
+         <property name="minimum">
+          <double>1.000000000000000</double>
+         </property>
+        </widget>
        </item>
        <item row="5" column="2" rowspan="3">
         <spacer name="horizontalSpacer_2">
@@ -702,7 +706,6 @@
          </property>
         </spacer>
        </item>
-
       </layout>
      </widget>
     </widget>

diff --git a/src/widgets/configdisplay_ui.ui b/src/widgets/configdisplay_ui.ui
index 89a367d56e6b720c4dae5844bb10321672b3d493..e88fe3c82bd3634bc2dafdf217cda6eb56a59fec 100644 (file)
--- a/src/widgets/configdisplay_ui.ui
+++ b/src/widgets/configdisplay_ui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>396</width>
-    <height>197</height>
+    <width>398</width>
+    <height>213</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
@@ -76,7 +76,14 @@
     </widget>
    </item>
    <item row="4" column="1">
-    <widget class="QSpinBox" name="kcfg_trackheight"/>
+    <widget class="QSpinBox" name="kcfg_trackheight">
+     <property name="minimum">
+      <number>10</number>
+     </property>
+     <property name="value">
+      <number>10</number>
+     </property>
+    </widget>
    </item>
    <item row="4" column="2">
     <spacer name="horizontalSpacer_2">