Moves VideoSurface into widgets folder.

[kdenlive] / src / recmonitor.cpp

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index 8aaa60e2f8828952976e705284d4f277d41c5bed..f54e678b17e4f869115834f9b8f5b6b0890fc3a4 100644 (file)
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -26,9 +26,10 @@
 #include "monitormanager.h"
 #include "monitor.h"
 #include "profilesdialog.h"
+#include "widgets/videosurface.h"
 
 #include <KDebug>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KStandardDirs>
 #include <KComboBox>
 #include <KIO/NetAccess>
@@ -45,7 +46,7 @@
 #include <QDesktopWidget>
 
 
-RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidget *parent) :
+RecMonitor::RecMonitor(Kdenlive::MonitorId name, MonitorManager *manager, QWidget *parent) :
     AbstractMonitor(name, manager, parent),
     m_isCapturing(false),
     m_didCapture(false),
@@ -723,14 +724,14 @@ void RecMonitor::slotRecord()
            m_captureArgs << "-f" << "x11grab";
            if (KdenliveSettings::grab_follow_mouse()) m_captureArgs << "-follow_mouse" << "centered";
            if (!KdenliveSettings::grab_hide_frame()) m_captureArgs << "-show_region" << "1";
+           captureSize = ":0.0";
             if (KdenliveSettings::grab_capture_type() == 0) {
                 // Full screen capture
-                captureSize = ":0.0";
                m_captureArgs << "-s" << QString::number(screenSize.width()) + "x" + QString::number(screenSize.height());
            } else {
                 // Region capture
                 m_captureArgs << "-s" << QString::number(KdenliveSettings::grab_width()) + "x" + QString::number(KdenliveSettings::grab_height());
-                captureSize = ":" + QString::number(KdenliveSettings::grab_offsetx()) + "." + QString::number(KdenliveSettings::grab_offsetx());
+                captureSize.append("+" + QString::number(KdenliveSettings::grab_offsetx()) + "." + QString::number(KdenliveSettings::grab_offsetx()));
             }
             // fps
             m_captureArgs << "-r" << QString::number(KdenliveSettings::grab_fps());
@@ -970,7 +971,7 @@ void RecMonitor::manageCapturedFiles()
     kDebug() << "Found : " << capturedFiles.count() << " new capture files";
     kDebug() << capturedFiles;
 
-    if (capturedFiles.count() > 0) {
+    if (!capturedFiles.isEmpty()) {
         QPointer<ManageCapturesDialog> d = new ManageCapturesDialog(capturedFiles, this);
         if (d->exec() == QDialog::Accepted) {
             emit addProjectClipList(d->importFiles());