Update audio

Author: CrSjimo

src/libs/3rdparty/svscraft

@@ -21,6 +21,7 @@ namespace dspx {
         Q_PROPERTY(QString fileName MEMBER fileName)
         Q_PROPERTY(QString formatEntryClassName MEMBER formatEntryClassName)
         Q_PROPERTY(QVariant userData MEMBER userData)
+        Q_PROPERTY(QString sha512 MEMBER sha512)
     public:
         QString absoluteDir;
         QString relativeDir;

src/libs/3rdparty/talcs

@@ -109,6 +109,16 @@ namespace dspx {
         }
         connectItem(item);
         selectedItems.insert(item);
+        const auto clipType = item->type();
+        selectedClipTypes[item] = clipType;
+        switch (clipType) {
+            case Clip::Singing:
+                ++selectedSingingClipCount;
+                break;
+            case Clip::Audio:
+                ++selectedAudioClipCount;
+                break;
+        }
 
         // Update clipToClipSequence
         auto clipSeq = item->clipSequence();
@@ -128,6 +138,18 @@ namespace dspx {
         if (!selectedItems.remove(item)) {
             return false;
         }
+        if (selectedClipTypes.contains(item)) {
+            const auto clipType = selectedClipTypes.value(item);
+            switch (clipType) {
+                case Clip::Singing:
+                    --selectedSingingClipCount;
+                    break;
+                case Clip::Audio:
+                    --selectedAudioClipCount;
+                    break;
+            }
+        }
+        selectedClipTypes.remove(item);
 
         // Update clipSequencesWithSelectedItems
         auto clipSeq = clipToClipSequence.value(item);
@@ -164,8 +186,12 @@ namespace dspx {
             return;
         }
         const int oldCount = selectedItems.size();
+        const int oldSingingClipCount = selectedSingingClipCount;
+        const int oldAudioClipCount = selectedAudioClipCount;
         bool selectionChanged = removeFromSelection(item);
         bool countChanged = selectionChanged && oldCount != selectedItems.size();
+        bool singingClipCountChanged = selectionChanged && oldSingingClipCount != selectedSingingClipCount;
+        bool audioClipCountChanged = selectionChanged && oldAudioClipCount != selectedAudioClipCount;
         bool currentChanged = false;
         bool clipSequencesChanged = selectionChanged;
 
@@ -181,6 +207,12 @@ namespace dspx {
             if (countChanged) {
                 Q_EMIT q_ptr->selectedCountChanged();
             }
+            if (singingClipCountChanged) {
+                Q_EMIT q_ptr->selectedSingingClipCountChanged();
+            }
+            if (audioClipCountChanged) {
+                Q_EMIT q_ptr->selectedAudioClipCountChanged();
+            }
         }
         if (clipSequencesChanged) {
             Q_EMIT q_ptr->clipSequencesWithSelectedItemsChanged();
@@ -231,6 +263,16 @@ namespace dspx {
         return d->selectedItems.size();
     }
 
+    int ClipSelectionModel::selectedSingingClipCount() const {
+        Q_D(const ClipSelectionModel);
+        return d->selectedSingingClipCount;
+    }
+
+    int ClipSelectionModel::selectedAudioClipCount() const {
+        Q_D(const ClipSelectionModel);
+        return d->selectedAudioClipCount;
+    }
+
     QList<ClipSequence *> ClipSelectionModel::clipSequencesWithSelectedItems() const {
         Q_D(const ClipSelectionModel);
         return d->clipSequencesWithSelectedItems.keys();
@@ -243,6 +285,8 @@ namespace dspx {
 
     void ClipSelectionModelPrivate::select(Clip *item, SelectionModel::SelectionCommand command) {
         const int oldCount = selectedItems.size();
+        const int oldSingingClipCount = selectedSingingClipCount;
+        const int oldAudioClipCount = selectedAudioClipCount;
         bool selectionChanged = false;
 
         if (command & SelectionModel::ClearPreviousSelection) {
@@ -270,6 +314,12 @@ namespace dspx {
             if (oldCount != selectedItems.size()) {
                 Q_EMIT q_ptr->selectedCountChanged();
             }
+            if (oldSingingClipCount != selectedSingingClipCount) {
+                Q_EMIT q_ptr->selectedSingingClipCountChanged();
+            }
+            if (oldAudioClipCount != selectedAudioClipCount) {
+                Q_EMIT q_ptr->selectedAudioClipCountChanged();
+            }
         }
         if (clipSequencesChanged) {
             Q_EMIT q_ptr->clipSequencesWithSelectedItemsChanged();

src/libs/application/dspxmodel/src/AudioClip.h

@@ -21,6 +21,8 @@ namespace dspx {
         Q_PROPERTY(Clip *currentItem READ currentItem NOTIFY currentItemChanged)
         Q_PROPERTY(QList<Clip *> selectedItems READ selectedItems NOTIFY selectedItemsChanged)
         Q_PROPERTY(int selectedCount READ selectedCount NOTIFY selectedCountChanged)
+        Q_PROPERTY(int selectedSingingClipCount READ selectedSingingClipCount NOTIFY selectedSingingClipCountChanged)
+        Q_PROPERTY(int selectedAudioClipCount READ selectedAudioClipCount NOTIFY selectedAudioClipCountChanged)
         Q_PROPERTY(QList<ClipSequence *> clipSequencesWithSelectedItems READ clipSequencesWithSelectedItems NOTIFY clipSequencesWithSelectedItemsChanged)
 
     public:
@@ -29,6 +31,8 @@ namespace dspx {
         Clip *currentItem() const;
         QList<Clip *> selectedItems() const;
         int selectedCount() const;
+        int selectedSingingClipCount() const;
+        int selectedAudioClipCount() const;
         QList<ClipSequence *> clipSequencesWithSelectedItems() const;
 
         Q_INVOKABLE bool isItemSelected(Clip *item) const;
@@ -37,6 +41,8 @@ namespace dspx {
         void currentItemChanged();
         void selectedItemsChanged();
         void selectedCountChanged();
+        void selectedSingingClipCountChanged();
+        void selectedAudioClipCountChanged();
         void clipSequencesWithSelectedItemsChanged();
         void itemSelected(Clip *item, bool selected);
 
@@ -48,4 +54,4 @@ namespace dspx {
 
 }
 
-#endif //DIFFSCOPE_DSPX_MODEL_CLIPSELECTIONMODEL_H
+#endif //DIFFSCOPE_DSPX_MODEL_CLIPSELECTIONMODEL_H

src/libs/application/dspxmodel/src/selectionmodel/ClipSelectionModel.cpp

@@ -1,6 +1,7 @@
 #ifndef DIFFSCOPE_DSPX_MODEL_CLIPSELECTIONMODEL_P_H
 #define DIFFSCOPE_DSPX_MODEL_CLIPSELECTIONMODEL_P_H
 
+#include <QHash>
 #include <QSet>
 
 #include <dspxmodel/ClipSelectionModel.h>
@@ -17,6 +18,9 @@ namespace dspx {
         ClipSelectionModel *q_ptr;
         SelectionModel *selectionModel;
         QSet<Clip *> selectedItems;
+        QHash<Clip *, Clip::ClipType> selectedClipTypes;
+        int selectedSingingClipCount = 0;
+        int selectedAudioClipCount = 0;
         Clip *currentItem = nullptr;
         QSet<Clip *> connectedItems;
 
@@ -37,4 +41,4 @@ namespace dspx {
 
 }
 
-#endif //DIFFSCOPE_DSPX_MODEL_CLIPSELECTIONMODEL_P_H
+#endif //DIFFSCOPE_DSPX_MODEL_CLIPSELECTIONMODEL_P_H

src/libs/application/dspxmodel/src/selectionmodel/ClipSelectionModel.h

@@ -12,7 +12,7 @@ import SVSCraft.UIComponents.impl
 
 MessageBoxDialog {
     id: dialog
-    width: 400
+    width: 600
     icon: SVS.Warning
     hasContextHelp: true
     text: qsTr("%1 exited abnormally during the last initialization").arg(Application.displayName)

src/libs/application/dspxmodel/src/selectionmodel/ClipSelectionModel_p.h

@@ -2,7 +2,7 @@
 #define DIFFSCOPE_AUDIO_AUDIOCLIPAUDIOCONTEXT_H
 
 #include <QObject>
-#include <QString>
+#include <qqmlintegration.h>
 
 namespace Core {
     class ProjectWindowInterface;
@@ -28,6 +28,8 @@ namespace Audio {
 
     class AudioClipAudioContext : public QObject {
         Q_OBJECT
+        QML_ELEMENT
+        QML_UNCREATABLE("")
         Q_DECLARE_PRIVATE(AudioClipAudioContext)
         Q_PROPERTY(Core::ProjectWindowInterface *windowHandle READ windowHandle CONSTANT)
         Q_PROPERTY(dspx::AudioClip *clip READ clip CONSTANT)

src/libs/application/uishell/src/qml/InitializationFailureWarningDialog.qml

@@ -21,7 +21,7 @@
 #include <audio/internal/AudioAndMidiPage.h>
 #include <audio/internal/AudioOutputPage.h>
 #include <audio/internal/AudioPreference.h>
-#include <audio/internal/InsertAudioClipAddOn.h>
+#include <audio/internal/AudioClipAddOn.h>
 #include <audio/internal/ProjectAudioAddOn.h>
 #include <audio/internal/PlaybackAddOn.h>
 #include <audio/internal/PlaybackPage.h>
@@ -48,6 +48,7 @@ namespace Audio::Internal {
         initializeAudioPreference();
         initializeSettings();
         initializeAudioSystem();
+        initializePropertyEditors();
         initializeHelpContents();
         initializeWindows();
         qCInfo(lcAudioPlugin) << "Initialized";
@@ -89,6 +90,14 @@ namespace Audio::Internal {
         sc->addPage(audioAndMidiPage);
     }
 
+    void AudioPlugin::initializePropertyEditors() {
+        auto component = new QQmlComponent(Core::RuntimeInterface::qmlEngine(), "DiffScope.Audio", "AudioPropertyEditor", this);
+        if (component->isError()) {
+            qFatal() << component->errorString();
+        }
+        Core::RuntimeInterface::instance()->addObject("org.diffscope.core.propertyeditor.clip", component);
+    }
+
     void AudioPlugin::initializeHelpContents() {
         auto component = new QQmlComponent(Core::RuntimeInterface::qmlEngine(), "DiffScope.Audio", "AudioOutputWelcomeWizardPage", this);
         if (component->isError()) {
@@ -99,7 +108,7 @@ namespace Audio::Internal {
 
     void AudioPlugin::initializeWindows() {
         Core::ProjectWindowInterfaceRegistry::instance()->attach<ProjectAudioAddOn>();
-        Core::ProjectWindowInterfaceRegistry::instance()->attach<InsertAudioClipAddOn>();
+        Core::ProjectWindowInterfaceRegistry::instance()->attach<AudioClipAddOn>();
         Core::ProjectWindowInterfaceRegistry::instance()->attach<PlaybackAddOn>();
     }
 }

src/plugins/audio/audiocontext/AudioClipAudioContext.h

@@ -22,6 +22,7 @@ namespace Audio::Internal {
         void initializeAudioPreference();
         void initializeAudioSystem();
         static void initializeSettings();
+        void initializePropertyEditors();
         void initializeHelpContents();
         static void initializeWindows();
     };