Add singer info fundementals

Author: CrSjimo

src/plugins/audio/CMakeLists.txt

@@ -30,10 +30,16 @@ diffscope_add_builtin_plugin(${PROJECT_NAME}
         internal/**
 )
 
-file(GLOB _res_icons res/soundfx/*)
-
+file(GLOB _res_soundfx res/soundfx/*)
 qt_add_resources(${PROJECT_NAME} soundfx
     PREFIX /diffscope/audio/soundfx
     BASE res/soundfx
-    FILES ${_res_icons}
+    FILES ${_res_soundfx}
+)
+
+file(GLOB _res_singeravatar res/singeravatar/*)
+qt_add_resources(${PROJECT_NAME} singeravatar
+    PREFIX /diffscope/audio/singeravatar
+    BASE res/singeravatar
+    FILES ${_res_singeravatar}
 )

src/plugins/audio/internal/AudioSystem.cpp

@@ -1,6 +1,9 @@
 #include "AudioSystem.h"
 
 #include <audio/internal/OutputSystem.h>
+#include <audio/internal/WaveformSingerMetadata.h>
+
+#include <coreplugin/CoreInterface.h>
 
 namespace Audio::Internal {
 
@@ -10,6 +13,7 @@ namespace Audio::Internal {
         Q_ASSERT(!m_instance);
         m_instance = this;
         m_outputSystem = new OutputSystem(this);
+        m_singerRegistrationSuccessful = WaveformSingerMetadata::registerAll(Core::CoreInterface::singerRegistry());
     }
 
     AudioSystem::~AudioSystem() {
@@ -24,4 +28,9 @@ namespace Audio::Internal {
         Q_ASSERT(m_instance);
         return m_instance->m_outputSystem;
     }
+
+    bool AudioSystem::isSingerRegistrationSuccessful() {
+        Q_ASSERT(m_instance);
+        return m_instance->m_singerRegistrationSuccessful;
+    }
 }

src/plugins/audio/internal/AudioSystem.h

@@ -17,8 +17,11 @@ namespace Audio::Internal {
 
         static OutputSystem *outputSystem();
 
+        static bool isSingerRegistrationSuccessful();
+
     private:
         OutputSystem *m_outputSystem;
+        bool m_singerRegistrationSuccessful{};
     };
 
 }

src/plugins/audio/internal/waveformsinger/WaveformSingerMetadata.cpp

@@ -0,0 +1,55 @@
+#include "WaveformSingerMetadata.h"
+
+#include <coreplugin/SingerRegistry.h>
+
+namespace Audio::Internal {
+
+    QString WaveformSingerMetadata::architectureId() {
+        return QStringLiteral("org.diffscope.waveform");
+    }
+
+    Core::ArchitectureInfo WaveformSingerMetadata::architectureInfo() {
+        Core::ArchitectureInfo info;
+        info.setName(tr("Waveform"));
+
+        Core::ArchitectureInfo::Parameter directParameter;
+        Core::ArchitectureInfo::ParameterMap parameters;
+        parameters.insert(QStringLiteral("pitch"), directParameter);
+        parameters.insert(QStringLiteral("energy"), directParameter);
+        info.setParameters(parameters);
+        return info;
+    }
+
+    QList<WaveformSingerMetadata::SingerEntry> WaveformSingerMetadata::singers() {
+        const auto createSinger = [](const QString &name, const QUrl &avatar) {
+            Core::SingerInfo info;
+            info.setName(name);
+            info.setMixGroup(QStringLiteral("waveform"));
+            info.setAvatarUrl(avatar);
+            return info;
+        };
+
+        return {
+            {QStringLiteral("piano"), createSinger(tr("Electric Piano"), QUrl("qrc:/diffscope/audio/singeravatar/piano.png"))},
+            {QStringLiteral("sinewave"), createSinger(tr("Sine Wave"), QUrl("qrc:/diffscope/audio/singeravatar/sinewave.png"))},
+            {QStringLiteral("choir"), createSinger(tr("Choir"), QUrl("qrc:/diffscope/audio/singeravatar/choir.png"))},
+        };
+    }
+
+    bool WaveformSingerMetadata::registerAll(Core::SingerRegistry *registry) {
+        if (!registry)
+            return false;
+
+        const auto id = architectureId();
+        if (!registry->registerArchitecture(id, architectureInfo()))
+            return false;
+
+        bool success = true;
+        for (const auto &singer : singers()) {
+            const bool singerRegistered = registry->registerSinger(id, singer.id, singer.info);
+            success = singerRegistered && success;
+        }
+        return success;
+    }
+
+}

src/plugins/audio/internal/waveformsinger/WaveformSingerMetadata.h

@@ -0,0 +1,35 @@
+#ifndef DIFFSCOPE_AUDIO_WAVEFORMSINGERMETADATA_H
+#define DIFFSCOPE_AUDIO_WAVEFORMSINGERMETADATA_H
+
+#include <QCoreApplication>
+#include <QList>
+#include <QString>
+
+#include <coreplugin/ArchitectureInfo.h>
+#include <coreplugin/SingerInfo.h>
+
+namespace Core {
+    class SingerRegistry;
+}
+
+namespace Audio::Internal {
+
+    class WaveformSingerMetadata {
+        Q_DECLARE_TR_FUNCTIONS(Audio::Internal::WaveformSingerMetadata)
+
+    public:
+        struct SingerEntry {
+            QString id;
+            Core::SingerInfo info;
+        };
+
+        static QString architectureId();
+        static Core::ArchitectureInfo architectureInfo();
+        static QList<SingerEntry> singers();
+
+        static bool registerAll(Core::SingerRegistry *registry);
+    };
+
+}
+
+#endif // DIFFSCOPE_AUDIO_WAVEFORMSINGERMETADATA_H

src/plugins/audio/res/singeravatar/choir.png

@@ -49,6 +49,7 @@
 #include <coreplugin/ProjectWindowInterface.h>
 #include <coreplugin/TrackColorSchema.h>
 #include <coreplugin/DefaultLyricManager.h>
+#include <coreplugin/SingerRegistry.h>
 
 namespace Core {
 
@@ -65,6 +66,7 @@ namespace Core {
         DspxCheckerRegistry *dspxCheckerRegistry;
         TrackColorSchema *trackColorSchema;
         DefaultLyricManager *defaultLyricManager;
+        SingerRegistry *singerRegistry;
 
         void init() {
             Q_Q(CoreInterface);
@@ -73,6 +75,7 @@ namespace Core {
             dspxCheckerRegistry = new DspxCheckerRegistry(q);
             trackColorSchema = new TrackColorSchema(q);
             defaultLyricManager = new DefaultLyricManager(q);
+            singerRegistry = new SingerRegistry(q);
         }
     };
 
@@ -107,6 +110,11 @@ namespace Core {
         return instance()->d_func()->defaultLyricManager;
     }
 
+    SingerRegistry *CoreInterface::singerRegistry() {
+        Q_ASSERT(instance());
+        return instance()->d_func()->singerRegistry;
+    }
+
     int CoreInterface::execSettingsDialog(const QString &id, QWindow *parent) {
         static std::unique_ptr<QWindow> dlg;
 

src/plugins/audio/res/singeravatar/piano.png

@@ -28,6 +28,7 @@ namespace Core {
     class PropertyEditorManager;
     class TrackColorSchema;
     class DefaultLyricManager;
+    class SingerRegistry;
 
     class CoreInterfacePrivate;
 
@@ -39,6 +40,7 @@ namespace Core {
         Q_PROPERTY(QAK::ActionRegistry *actionRegistry READ actionRegistry CONSTANT)
         Q_PROPERTY(TrackColorSchema *trackColorSchema READ trackColorSchema CONSTANT)
         Q_PROPERTY(DefaultLyricManager *defaultLyricManager READ defaultLyricManager CONSTANT)
+        Q_PROPERTY(SingerRegistry *singerRegistry READ singerRegistry CONSTANT)
     public:
         static CoreInterface *instance();
         static inline CoreInterface *create(QQmlEngine *, QJSEngine *) { return instance(); }
@@ -51,6 +53,8 @@ namespace Core {
 
         static DefaultLyricManager *defaultLyricManager();
 
+        static SingerRegistry *singerRegistry();
+
         static constexpr const char *dspxEditorId() {
             return "org.diffscope.diffscope";
         }