Fix keyframes waveform updates

Author: ddennedy

src/models/audiolevelstask.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2025 Meltytech, LLC
+ * Copyright (c) 2013-2026 Meltytech, LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,6 +45,7 @@ static void deleteQVariantList(QVariantList *list)
 AudioLevelsTask::AudioLevelsTask(Mlt::Producer &producer, QObject *object, const QModelIndex &index)
     : QRunnable()
     , m_object(object)
+    , m_qmlProducer(object)
     , m_isCanceled(false)
     , m_isForce(false)
 {
@@ -79,7 +80,11 @@ void AudioLevelsTask::start(Mlt::Producer &producer,
             if (*t == *task) {
                 // If so, then just add ourselves to be notified upon completion.
                 delete task;
-                task = 0;
+                task = nullptr;
+                if (index.isValid())
+                    t->m_object = object;
+                else
+                    t->m_qmlProducer = object;
                 t->m_producers << ProducerAndIndex(new Mlt::Producer(producer), index);
                 break;
             }
@@ -169,6 +174,22 @@ QString AudioLevelsTask::cacheKey()
     return key;
 }
 
+void AudioLevelsTask::notifyQObjects(const QPersistentModelIndex &index)
+{
+    if (index.isValid() && m_object) {
+        // LOG_DEBUG() << "calling audioLevelsReady" << m_object << index;
+        if (-1 != m_object->metaObject()->indexOfMethod("audioLevelsReady(QPersistentModelIndex)"))
+            QMetaObject::invokeMethod(m_object,
+                                      "audioLevelsReady",
+                                      Q_ARG(const QPersistentModelIndex &, index));
+    } else if (m_qmlProducer) {
+        // LOG_DEBUG() << "calling audioLevelsChanged" << m_qmlProducer;
+        if (-1 != m_qmlProducer->metaObject()->indexOfSignal("audioLevelsChanged()")) {
+            QMetaObject::invokeMethod(m_qmlProducer, "audioLevelsChanged");
+        }
+    }
+}
+
 void AudioLevelsTask::run()
 {
     // 2 channels interleaved of uchar values
@@ -223,12 +244,7 @@ void AudioLevelsTask::run()
                                  0,
                                  (mlt_destructor) deleteQVariantList);
                     p.first->unlock();
-                    if (-1
-                        != m_object->metaObject()->indexOfMethod(
-                            "audioLevelsReady(QPersistentModelIndex)"))
-                        QMetaObject::invokeMethod(m_object,
-                                                  "audioLevelsReady",
-                                                  Q_ARG(const QPersistentModelIndex &, p.second));
+                    notifyQObjects(p.second);
                 }
             }
         }
@@ -298,11 +314,7 @@ void AudioLevelsTask::run()
             p.first->lock();
             p.first->set(kAudioLevelsProperty, levelsCopy, 0, (mlt_destructor) deleteQVariantList);
             p.first->unlock();
-            if (-1
-                != m_object->metaObject()->indexOfMethod("audioLevelsReady(QPersistentModelIndex)"))
-                QMetaObject::invokeMethod(m_object,
-                                          "audioLevelsReady",
-                                          Q_ARG(const QPersistentModelIndex &, p.second));
+            notifyQObjects(p.second);
         }
     }
 }

src/models/audiolevelstask.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2013-2018 Meltytech, LLC
- * Author: Dan Dennedy <dan@dennedy.org>
+ * Copyright (c) 2013-2026 Meltytech, LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,8 +18,6 @@
 #ifndef AUDIOLEVELSTASK_H
 #define AUDIOLEVELSTASK_H
 
-#include "multitrackmodel.h"
-
 #include <MltProducer.h>
 #include <MltProfile.h>
 #include <QList>
@@ -45,8 +42,10 @@ class AudioLevelsTask : public QRunnable
 private:
     Mlt::Producer *tempProducer();
     QString cacheKey();
+    void notifyQObjects(const QPersistentModelIndex &index);
 
     QObject *m_object;
+    QObject *m_qmlProducer;
     typedef QPair<Mlt::Producer *, QPersistentModelIndex> ProducerAndIndex;
     QList<ProducerAndIndex> m_producers;
     QScopedPointer<Mlt::Producer> m_tempProducer;

src/qml/views/keyframes/KeyframeClip.qml

@@ -59,7 +59,8 @@ Rectangle {
         waveformRepeater.model = Math.ceil(waveform.innerWidth / waveform.maxWidth);
         for (let i = 0; i < waveformRepeater.count; i++) {
             var item = waveformRepeater.itemAt(i);
-            item.producer = producer;
+            if (item.producer !== producer)
+                item.producer = producer;
             item.update();
         }
     }

src/qmltypes/qmlproducer.cpp

@@ -177,12 +177,6 @@ void QmlProducer::launchGlaxnimate(const QString &filename) const
     }
 }
 
-void QmlProducer::audioLevelsReady(const QPersistentModelIndex &index)
-{
-    Q_UNUSED(index)
-    emit audioLevelsChanged();
-}
-
 void QmlProducer::remakeAudioLevels()
 {
     AudioLevelsTask::start(m_producer, this, QModelIndex(), true);

src/qmltypes/qmlproducer.h

@@ -71,7 +71,6 @@ class QmlProducer : public QObject
     void seek(int position);
     Mlt::Producer &producer() { return m_producer; }
     Q_INVOKABLE Mlt::Producer *getMltProducer() { return &m_producer; }
-    Q_INVOKABLE void audioLevelsReady(const QPersistentModelIndex &index);
     Q_INVOKABLE void remakeAudioLevels();
     double displayAspectRatio();
     Q_INVOKABLE QString get(QString name, int position = -1);