X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frecmonitor.cpp;h=f54e678b17e4f869115834f9b8f5b6b0890fc3a4;hb=edb2e9a073ba73424d17da6e0821d0e1c0281a19;hp=8aaa60e2f8828952976e705284d4f277d41c5bed;hpb=cba3c6aa64ce5d6f2bb993eedcc4e39979e50343;p=kdenlive diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index 8aaa60e2..f54e678b 100644 --- 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 -#include +#include #include #include #include @@ -45,7 +46,7 @@ #include -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 d = new ManageCapturesDialog(capturedFiles, this); if (d->exec() == QDialog::Accepted) { emit addProjectClipList(d->importFiles());