qmlui: bring back audio waveform preview in Show Manager

Author: mcallegari

qmlui/CMakeLists.txt

@@ -67,6 +67,7 @@ set(SRC_FILES
     uimanager.cpp uimanager.h
     videoeditor.cpp videoeditor.h
     videoprovider.cpp videoprovider.h
+    waveformimageprovider.cpp waveformimageprovider.h
     virtualconsole/vcanimation.cpp virtualconsole/vcanimation.h
     virtualconsole/vcaudiotriggers.cpp virtualconsole/vcaudiotriggers.h
     virtualconsole/vcbutton.cpp virtualconsole/vcbutton.h

qmlui/qml/showmanager/ShowItem.qml

@@ -115,6 +115,37 @@ Item
         visible: sfRef ? (sfRef.locked ? true : false) : false
     }
 
+    /* Waveform for audio items */
+    Image
+    {
+        id: waveformImage
+        z: 3
+        anchors.fill: parent
+        visible: funcRef && funcRef.type === QLCFunction.AudioType
+        cache: false
+        fillMode: Image.Stretch
+
+        source: (funcRef && funcRef.type === QLCFunction.AudioType) ? "image://waveform/" + funcRef.id : ""
+
+        function reload()
+        {
+            const old = source;
+            source = "";
+            source = old;
+        }
+
+        Connections
+        {
+            target: waveformProvider
+
+            function onWaveformUpdated(fid)
+            {
+                if (funcRef && fid === funcRef.id)
+                    waveformImage.reload()
+            }
+        }
+    }
+
     Canvas
     {
         id: prCanvas

qmlui/showmanager.cpp

@@ -19,6 +19,7 @@
 
 #include <QQmlContext>
 
+#include "waveformimageprovider.h"
 #include "showmanager.h"
 #include "sequence.h"
 #include "tardis.h"
@@ -43,6 +44,12 @@ ShowManager::ShowManager(QQuickView *view, Doc *doc, QObject *parent)
     qmlRegisterType<Track>("org.qlcplus.classes", 1, 0, "Track");
     qmlRegisterUncreatableType<ShowFunction>("org.qlcplus.classes", 1, 0, "ShowFunction", "Can't create a ShowFunction");
 
+
+    /* Create and register a Waveform image provider */
+    m_waveformProvider = new WaveformImageProvider(doc);
+    view->engine()->addImageProvider(QLatin1String("waveform"), m_waveformProvider);
+    view->rootContext()->setContextProperty("waveformProvider", m_waveformProvider);
+
     setContextResource("qrc:/ShowManager.qml");
     setContextTitle(tr("Show Manager"));
 }
@@ -52,6 +59,9 @@ void ShowManager::initialize()
     App *app = qobject_cast<App *>(m_view);
     m_tickSize = app->pixelDensity() * 18;
 
+    if (m_waveformProvider)
+        m_waveformProvider->setPixelDensity(app->pixelDensity());
+
     siComponent = new QQmlComponent(m_view->engine(), QUrl("qrc:/ShowItem.qml"));
     if (siComponent->isError())
         qDebug() << siComponent->errors();

qmlui/showmanager.h

@@ -30,6 +30,7 @@ class Doc;
 class Track;
 class Function;
 class ShowFunction;
+class WaveformImageProvider;
 
 typedef struct
 {
@@ -311,6 +312,8 @@ protected slots:
 
     /** Holds the item currently ready for pasting */
     QList<SelectedShowItem> m_clipboard;
+
+    WaveformImageProvider *m_waveformProvider;
 };
 
 #endif // SHOWMANAGER_H