#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>
#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),
m_spaceTimer.stop();
delete m_captureProcess;
delete m_displayProcess;
- if (m_captureDevice) delete m_captureDevice;
+ delete m_captureDevice;
}
void RecMonitor::mouseDoubleClickEvent(QMouseEvent * event)
if (!KdenliveSettings::ffmpegpath().isEmpty()) {
if (!Render::checkX11Grab()) {
// FFmpeg does not support screen grab
- showWarningMessage(i18n("Your FFmpeg / Libav installation\n does not support screen grab"), "dialog-warning");
+ showWarningMessage(i18n("Your FFmpeg / Libav installation\n does not support screen grab"));
m_recAction->setEnabled(false);
}
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", m_capturePath)));
while (QFile::exists(path)) {
QString num = QString::number(i).rightJustified(4, '0', false);
path = KUrl(m_capturePath).path(KUrl::AddTrailingSlash) + "capture" + num + '.' + extension;
- i++;
+ ++i;
}
m_captureFile = KUrl(path);
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());
m_infoMessage->addAction(manualAction);
}
#if KDE_IS_VERSION(4,10,0)
- m_infoMessage->animatedShow();
+ if (isVisible())
+ m_infoMessage->animatedShow();
#else
QTimer::singleShot(0, m_infoMessage, SLOT(animatedShow()));
#endif
}
else {
video_frame->setText(QString("<qt>" + text + "<br><a href=\"http://kde.org\">" + i18n("Show log") + "</a>"));
- connect(video_frame, SIGNAL(linkActivated (const QString &)), this, SLOT(slotShowLog()));
+ connect(video_frame, SIGNAL(linkActivated(QString)), this, SLOT(slotShowLog()));
}
#endif
}
-const QString RecMonitor::getV4lXmlPlaylist(MltVideoProfile profile, bool *isXml)
+const QString RecMonitor::getV4lXmlPlaylist(const MltVideoProfile &profile, bool *isXml)
{
QString playlist;
if (rec_video->isChecked() && rec_audio->isChecked()) {
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());