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 2ecef0cb94cea52f0c418c959cc5bec82c5a1e61..e8bd52ae5916c6bc3e85637820cacc9754c6752b 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -42,11 +42,10 @@ void ClipManager::checkAudioThumbs() {
         else m_clipList.at(i)->slotClearAudioCache();
     }
     if (m_audioThumbsEnabled) {
-       if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
-    }
-    else {
-       m_audioThumbsQueue.clear();
-       m_generatingAudioId = QString();
+        if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
+    } else {
+        m_audioThumbsQueue.clear();
+        m_generatingAudioId = QString();
     }
 }
 
@@ -60,15 +59,15 @@ void ClipManager::askForAudioThumb(const QString &id) {
 
 void ClipManager::startAudioThumbsGeneration() {
     if (!KdenliveSettings::audiothumbnails()) {
-       m_audioThumbsQueue.clear();
-       m_generatingAudioId = QString();
-       return;
+        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);
+        m_generatingAudioId = m_audioThumbsQueue.takeFirst();
+        DocClipBase *clip = getClipById(m_generatingAudioId);
+        if (!clip || !clip->slotGetAudioThumbs())
+            endAudioThumbsGeneration(m_generatingAudioId);
     } else {
         m_generatingAudioId = QString();
     }
@@ -76,9 +75,9 @@ void ClipManager::startAudioThumbsGeneration() {
 
 void ClipManager::endAudioThumbsGeneration(const QString &requestedId) {
     if (!KdenliveSettings::audiothumbnails()) {
-       m_audioThumbsQueue.clear();
-       m_generatingAudioId = QString();
-       return;
+        m_audioThumbsQueue.clear();
+        m_generatingAudioId = QString();
+        return;
     }
     if (!m_audioThumbsQueue.isEmpty()) {
         if (m_generatingAudioId == requestedId) {
@@ -126,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;