From 68a4690524c0c7138c7fb51abd811105ae54e421 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Sat, 29 Dec 2012 17:53:08 +0100 Subject: [PATCH] Re-enable audio dubbing: http://kdenlive.org/mantis/view.php?id=2910 --- src/recmonitor.cpp | 3 ++- src/renderer.cpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index 35304225..6f5de9ec 100644 --- a/src/recmonitor.cpp +++ b/src/recmonitor.cpp @@ -386,6 +386,7 @@ void RecMonitor::slotStopCapture() if (!m_isCapturing && !m_isPlaying) return; videoBox->setHidden(true); control_frame->setEnabled(true); + slotActivateMonitor(); switch (device_selector->currentIndex()) { case FIREWIRE: m_captureProcess->write("\e", 2); @@ -597,7 +598,7 @@ void RecMonitor::slotRecord() switch (device_selector->currentIndex()) { case VIDEO4LINUX: - slotActivateMonitor(); + if (rec_video->isChecked()) slotActivateMonitor(); path = KStandardDirs::locateLocal("appdata", "profiles/video4linux"); profile = ProfilesDialog::getVideoProfile(path); //m_videoBox->setRatio((double) profile.display_aspect_num / profile.display_aspect_den); diff --git a/src/renderer.cpp b/src/renderer.cpp index ca7f0d82..64ed4da9 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -1562,8 +1562,9 @@ void Render::stop() m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); if (m_mltProducer == NULL) return; - if (m_mltConsumer && !m_mltConsumer->is_stopped()) { - m_mltConsumer->stop(); + if (m_mltConsumer) { + m_mltConsumer->set("refresh", 0); + if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); m_mltConsumer->purge(); } -- 2.39.2