Try to fix audio mixing bug ( http://www.kdenlive.org:80/mantis/view.php?id=228 )

[kdenlive] / src / clipmanager.cpp

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index a01e958f0016d51333660a02a76b32e6475df88c..e8bd52ae5916c6bc3e85637820cacc9754c6752b 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -26,9 +26,8 @@
 #include "docclipbase.h"
 #include "kdenlivedoc.h"
 
-ClipManager::ClipManager(KdenliveDoc *doc): m_doc(doc) {
+ClipManager::ClipManager(KdenliveDoc *doc): m_doc(doc), m_audioThumbsEnabled(false), m_audioThumbsQueue(QList <QString> ()), m_generatingAudioId(QString()) {
     m_clipIdCounter = 1;
-    m_audioThumbsEnabled = KdenliveSettings::audiothumbnails();
 }
 
 ClipManager::~ClipManager() {
@@ -39,9 +38,54 @@ void ClipManager::checkAudioThumbs() {
     if (m_audioThumbsEnabled == KdenliveSettings::audiothumbnails()) return;
     m_audioThumbsEnabled = KdenliveSettings::audiothumbnails();
     for (int i = 0; i < m_clipList.count(); i++) {
-        if (m_audioThumbsEnabled) m_clipList.at(i)->slotRequestAudioThumbs();
+        if (m_audioThumbsEnabled) m_audioThumbsQueue.append(m_clipList.at(i)->getId());
         else m_clipList.at(i)->slotClearAudioCache();
     }
+    if (m_audioThumbsEnabled) {
+        if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
+    } else {
+        m_audioThumbsQueue.clear();
+        m_generatingAudioId = QString();
+    }
+}
+
+void ClipManager::askForAudioThumb(const QString &id) {
+    DocClipBase *clip = getClipById(id);
+    if (clip && KdenliveSettings::audiothumbnails()) {
+        m_audioThumbsQueue.append(id);
+        if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
+    }
+}
+
+void ClipManager::startAudioThumbsGeneration() {
+    if (!KdenliveSettings::audiothumbnails()) {
+        m_audioThumbsQueue.clear();
+        m_generatingAudioId = QString();
+        return;
+    }
+    if (!m_audioThumbsQueue.isEmpty()) {
+        m_generatingAudioId = m_audioThumbsQueue.takeFirst();
+        DocClipBase *clip = getClipById(m_generatingAudioId);
+        if (!clip || !clip->slotGetAudioThumbs())
+            endAudioThumbsGeneration(m_generatingAudioId);
+    } else {
+        m_generatingAudioId = QString();
+    }
+}
+
+void ClipManager::endAudioThumbsGeneration(const QString &requestedId) {
+    if (!KdenliveSettings::audiothumbnails()) {
+        m_audioThumbsQueue.clear();
+        m_generatingAudioId = QString();
+        return;
+    }
+    if (!m_audioThumbsQueue.isEmpty()) {
+        if (m_generatingAudioId == requestedId) {
+            startAudioThumbsGeneration();
+        }
+    } else {
+        m_generatingAudioId = QString();
+    }
 }
 
 void ClipManager::setThumbsProgress(const QString &message, int progress) {
@@ -54,7 +98,7 @@ QList <DocClipBase*> ClipManager::documentClipList() {
 
 void ClipManager::addClip(DocClipBase *clip) {
     m_clipList.append(clip);
-    QString id = clip->getId();
+    const QString id = clip->getId();
     if (id.toInt() >= m_clipIdCounter) m_clipIdCounter = id.toInt() + 1;
 }
 
@@ -81,8 +125,9 @@ DocClipBase *ClipManager::getClipAt(int pos) {
     return m_clipList.at(pos);
 }
 
-DocClipBase *ClipManager::getClipById(const QString &clipId) {
+DocClipBase *ClipManager::getClipById(QString clipId) {
     //kDebug() << "++++  CLIP MAN, LOOKING FOR CLIP ID: " << clipId;
+    clipId = clipId.section('_', 0, 0);
     for (int i = 0; i < m_clipList.count(); i++) {
         if (m_clipList.at(i)->getId() == clipId) {
             //kDebug() << "++++  CLIP MAN, FOUND FOR CLIP ID: " << clipId;