From 0ae06f0aced73aef284d558c82f6978d402b3422 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Fri, 4 Jan 2013 12:32:44 +0100 Subject: [PATCH] Small cleanup in screen capture --- src/recmonitor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index b0ff2eac..7fec57c3 100644 --- a/src/recmonitor.cpp +++ b/src/recmonitor.cpp @@ -233,6 +233,7 @@ void RecMonitor::slotVideoDeviceChanged(int ix) { QString capturefile; QString capturename; + if (m_infoMessage->isVisible()) { #if KDE_IS_VERSION(4,7,0) #if KDE_IS_VERSION(4,10,0) m_infoMessage->animatedHide(); @@ -240,6 +241,7 @@ void RecMonitor::slotVideoDeviceChanged(int ix) 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); @@ -278,7 +280,7 @@ void RecMonitor::slotVideoDeviceChanged(int ix) if (!KdenliveSettings::ffmpegpath().isEmpty()) { if (!Render::checkX11Grab()) { // FFmpeg does not support screen grab - showMessage("dialog-warning", i18n("Your FFmpeg / Libav installation\n does not support screen grab")); + showMessage(i18n("Your FFmpeg / Libav installation\n does not support screen grab"), "dialog-warning"); 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))); @@ -424,9 +426,7 @@ void RecMonitor::slotStopCapture() m_isPlaying = false; break; case SCREENGRAB: - m_captureProcess->write("q\n", 3); - m_captureProcess->terminate(); - //video_frame->setText(i18n("Encoding captured video...")); + m_captureProcess->terminate(); QTimer::singleShot(1000, m_captureProcess, SLOT(kill())); break; case VIDEO4LINUX: -- 2.39.5