Re-enable audio dubbing: http://kdenlive.org/mantis/view.php?id=2910

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index 3530422514ab60bd096fd3d20b2f1ebd61cad682..6f5de9ec66852c7e1f84b6942c92d8a3597b1919 100644 (file)
--- 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 ca7f0d82d3b71f6c1b08e056cf7e6afed8198397..64ed4da90437d0c0c8a2d818282215390b359875 100644 (file)
--- 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();
     }