X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frecmonitor.cpp;h=e104426e1f03db10563f0796d4bf1596e8290fed;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=7fec57c302baeb098a1947293ffa8b69caf73682;hpb=0ae06f0aced73aef284d558c82f6978d402b3422;p=kdenlive

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index 7fec57c3..e104426e 100644
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -181,7 +181,7 @@ RecMonitor::~RecMonitor()
     m_spaceTimer.stop();
     delete m_captureProcess;
     delete m_displayProcess;
-    if (m_captureDevice) delete m_captureDevice;
+    delete m_captureDevice;
 }
 
 void RecMonitor::mouseDoubleClickEvent(QMouseEvent * event)
@@ -233,15 +233,15 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
 {
     QString capturefile;
     QString capturename;
-    if (m_infoMessage->isVisible()) {
 #if KDE_IS_VERSION(4,7,0)
+    if (m_infoMessage->isVisible()) {
 #if KDE_IS_VERSION(4,10,0)
-    m_infoMessage->animatedHide();
+	m_infoMessage->animatedHide();
 #else    
-    QTimer::singleShot(0, m_infoMessage, SLOT(animatedHide()));
-#endif
+	QTimer::singleShot(0, m_infoMessage, SLOT(animatedHide()));
 #endif
     }
+#endif
     m_previewSettings->setEnabled(ix == VIDEO4LINUX || ix == BLACKMAGIC);
     control_frame->setVisible(ix == VIDEO4LINUX);
     m_playAction->setVisible(ix != SCREENGRAB);
@@ -274,13 +274,13 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
 		// Check for libav version
 		exepath = KStandardDirs::findExe("avconv");
 	    }
-	    if (exepath.isEmpty()) showMessage(i18n("ffmpeg or avconv not found,\n please install it for screen grabs"), "dialog-warning");
+	    if (exepath.isEmpty()) showWarningMessage(i18n("ffmpeg or avconv not found,\n please install it for screen grabs"));
 	    else KdenliveSettings::setFfmpegpath(exepath);
 	}
         if (!KdenliveSettings::ffmpegpath().isEmpty()) {
 	    if (!Render::checkX11Grab()) {
 		// FFmpeg does not support screen grab
-		showMessage(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)));
@@ -314,7 +314,7 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
         if (KdenliveSettings::dvgrab_path().isEmpty()) {
             QString dvgrabpath = KStandardDirs::findExe("dvgrab");
             if (dvgrabpath.isEmpty()) {
-		showMessage(i18n("dvgrab utility not found,\n please install it for firewire capture"), "dialog-warning");
+		showWarningMessage(i18n("dvgrab utility not found,\n please install it for firewire capture"));
 	    }
             else KdenliveSettings::setDvgrab_path(dvgrabpath);
         } else {
@@ -427,7 +427,7 @@ void RecMonitor::slotStopCapture()
         break;
     case SCREENGRAB:
 	m_captureProcess->terminate();
-        QTimer::singleShot(1000, m_captureProcess, SLOT(kill()));
+        QTimer::singleShot(1500, m_captureProcess, SLOT(kill()));
         break;
     case VIDEO4LINUX:
     case BLACKMAGIC:
@@ -612,7 +612,7 @@ void RecMonitor::slotRecord()
         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);
 
@@ -764,7 +764,7 @@ void RecMonitor::slotRecord()
             m_captureProcess->start(KdenliveSettings::ffmpegpath(), m_captureArgs);
 	    if (!m_captureProcess->waitForStarted()) {
 		// Problem launching capture app
-		showMessage(i18n("Failed to start the capture application:\n%1", KdenliveSettings::ffmpegpath()), "dialog-warning");
+		showWarningMessage(i18n("Failed to start the capture application:\n%1", KdenliveSettings::ffmpegpath()));
 	    }
             //kDebug() << "// Screen grab params: " << m_captureArgs;
             break;
@@ -788,7 +788,7 @@ void RecMonitor::slotRecord()
 }
 
 
-void RecMonitor::showMessage(const QString &text, const QString &icon, bool logAction)
+void RecMonitor::showWarningMessage(const QString &text, bool logAction)
 {
 #if KDE_IS_VERSION(4,7,0)
     m_infoMessage->setText(text);
@@ -799,23 +799,24 @@ void RecMonitor::showMessage(const QString &text, const QString &icon, bool logA
 	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
     if (!logAction) {
-	video_frame->setPixmap(mergeSideBySide(KIcon(icon).pixmap(QSize(50, 50)), text));
+	video_frame->setPixmap(mergeSideBySide(KIcon("dialog-warning").pixmap(QSize(50, 50)), text));
 	
     }
     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()) {
@@ -901,14 +902,14 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status)
         m_stopAction->setEnabled(false);
         device_selector->setEnabled(true);
         if (m_captureProcess && m_captureProcess->exitStatus() == QProcess::CrashExit) {
-	    showMessage(i18n("Capture crashed, please check your parameters"), "dialog-warning", true);
+	    showWarningMessage(i18n("Capture crashed, please check your parameters"), true);
         } else {
             if (device_selector->currentIndex() != SCREENGRAB) {
                 video_frame->setText(i18n("Not connected"));
             } else {
 		int code = m_captureProcess->exitCode();
                 if (code != 0 && code != 255) {
-                    showMessage(i18n("Capture crashed, please check your parameters"), "dialog-warning", true);
+                    showWarningMessage(i18n("Capture crashed, please check your parameters"), true);
                 } 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)));
                 }
@@ -969,7 +970,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());