Update audio

Author: CrSjimo

src/libs/3rdparty/talcs

@@ -26,6 +26,7 @@ namespace dspx {
         Q_ASSERT(model->strategy()->getEntityType(handle) == ModelStrategy::EI_AudioClip);
         d->q_ptr = this;
         d->pModel = ModelPrivate::get(model);
+        d->path = d->pModel->strategy->getEntityProperty(handle, ModelStrategy::P_Path).value<AudioPathInfo>();
     }
 
     AudioClip::~AudioClip() = default;
@@ -69,7 +70,8 @@ namespace dspx {
             {"relativeDir", audioPathInfo.relativeDir.toStdString()},
             {"fileName", audioPathInfo.fileName.toStdString()},
             {"formatEntryClassName", audioPathInfo.formatEntryClassName.toStdString()},
-            {"userData", encodeUserData(audioPathInfo.userData)}
+            {"userData", encodeUserData(audioPathInfo.userData)},
+            {"sha512", audioPathInfo.sha512.toStdString()}
         });
         return clip;
     }
@@ -79,14 +81,16 @@ namespace dspx {
         control()->fromOpenDspx(clip.control);
         time()->fromOpenDspx(clip.time);
         workspace()->fromOpenDspx(clip.workspace);
-        auto diffscopeWorkspace = clip.workspace.contains("diffscope") ? QJsonObject() : JsonUtils::toQJsonValue(clip.workspace.at("diffscope")).toObject();
+        auto diffscopeWorkspace = clip.workspace.contains("diffscope") ? JsonUtils::toQJsonValue(clip.workspace.at("diffscope")).toObject() : QJsonObject();
         if (diffscopeWorkspace.contains("audio")) {
+            auto audio = diffscopeWorkspace["audio"].toObject();
             setPath({
-                .absoluteDir = diffscopeWorkspace["absoluteDir"].toString(),
-                .relativeDir = diffscopeWorkspace["relativeDir"].toString(),
-                .fileName = diffscopeWorkspace["fileName"].toString(),
-                .formatEntryClassName = diffscopeWorkspace["formatEntryClassName"].toString(),
-                .userData = decodeUserData(diffscopeWorkspace["userData"].toString().toUtf8())
+                .absoluteDir = audio["absoluteDir"].toString(),
+                .relativeDir = audio["relativeDir"].toString(),
+                .fileName = audio["fileName"].toString(),
+                .formatEntryClassName = audio["formatEntryClassName"].toString(),
+                .userData = decodeUserData(audio["userData"].toString().toUtf8()),
+                .sha512 = audio["sha512"].toString()
             });
         } else {
             auto fileInfo = QFileInfo(QString::fromStdString(clip.path));
@@ -95,7 +99,8 @@ namespace dspx {
                 .relativeDir = {},
                 .fileName = fileInfo.fileName(),
                 .formatEntryClassName = {},
-                .userData = {}
+                .userData = {},
+                .sha512 = {}
             });
         }
     }

src/libs/application/dspxmodel/src/AudioClip.cpp

@@ -27,6 +27,7 @@ namespace dspx {
         QString fileName;
         QString formatEntryClassName;
         QVariant userData;
+        QString sha512;
     };
 
     class DSPX_MODEL_EXPORT AudioClip : public Clip {

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

@@ -306,7 +306,7 @@ namespace dspx {
                 {P_Length, QMetaType::Int, validateIntGreaterOrEqualZero},
                 {P_ClipStart, QMetaType::Int, validateIntGreaterOrEqualZero},
                 {P_ClipLength, QMetaType::Int, validateIntGreaterOrEqualZero},
-                {P_Path, QMetaType::QString}
+                {P_Path, QMetaType::UnknownType}
             };
             case EI_Global: return {
                 {P_Name, QMetaType::QString},

src/libs/application/dspxmodel/src/ModelStrategy.h

@@ -52,6 +52,16 @@ namespace Audio {
         return d->clip;
     }
 
+    AudioClipAudioContext::Status AudioClipAudioContext::status() const {
+        Q_D(const AudioClipAudioContext);
+        return d->status;
+    }
+
+    QString AudioClipAudioContext::realAudioPath() const {
+        Q_D(const AudioClipAudioContext);
+        return d->realAudioPath;
+    }
+
     talcs::PositionableMixerAudioSource *AudioClipAudioContext::controlMixer() const {
         Q_D(const AudioClipAudioContext);
         return d->clipContext->controlMixer();
@@ -75,6 +85,24 @@ namespace Audio {
         return q->d_func();
     }
 
+    void AudioClipAudioContextPrivate::setStatus(AudioClipAudioContext::Status status_) {
+        Q_Q(AudioClipAudioContext);
+        if (status == status_) {
+            return;
+        }
+        status = status_;
+        Q_EMIT q->statusChanged(status);
+    }
+
+    void AudioClipAudioContextPrivate::setRealAudioPath(const QString &realAudioPath_) {
+        Q_Q(AudioClipAudioContext);
+        if (realAudioPath == realAudioPath_) {
+            return;
+        }
+        realAudioPath = realAudioPath_;
+        Q_EMIT q->realAudioPathChanged(realAudioPath);
+    }
+
 }
 
 #include "moc_AudioClipAudioContext.cpp"

src/plugins/audio/audiocontext/AudioClipAudioContext.cpp

@@ -2,6 +2,7 @@
 #define DIFFSCOPE_AUDIO_AUDIOCLIPAUDIOCONTEXT_H
 
 #include <QObject>
+#include <QString>
 
 namespace Core {
     class ProjectWindowInterface;
@@ -30,19 +31,38 @@ namespace Audio {
         Q_DECLARE_PRIVATE(AudioClipAudioContext)
         Q_PROPERTY(Core::ProjectWindowInterface *windowHandle READ windowHandle CONSTANT)
         Q_PROPERTY(dspx::AudioClip *clip READ clip CONSTANT)
+        Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+        Q_PROPERTY(QString realAudioPath READ realAudioPath NOTIFY realAudioPathChanged)
 
     public:
+        enum Status {
+            Unknown,
+            Ready,
+            FileNotFound,
+            FileLoadFailed,
+            FileMoved,
+            FileContentChanged,
+        };
+        Q_ENUM(Status)
+
         ~AudioClipAudioContext() override;
 
         static AudioClipAudioContext *of(dspx::AudioClip *clip);
 
         Core::ProjectWindowInterface *windowHandle() const;
         dspx::AudioClip *clip() const;
 
+        Status status() const;
+        QString realAudioPath() const;
+
         talcs::PositionableMixerAudioSource *controlMixer() const;
         talcs::PositionableMixerAudioSource *clipMixer() const;
         talcs::PositionableAudioSource *contentSource() const;
 
+    Q_SIGNALS:
+        void statusChanged(Status status);
+        void realAudioPathChanged(const QString &realAudioPath);
+
     private:
         friend class AudioClipAudioContextPrivate;
         friend class Internal::ProjectAudioAddOn;

src/plugins/audio/audiocontext/AudioClipAudioContext.h

@@ -18,6 +18,11 @@ namespace Audio {
         dspx::AudioClip *clip{};
         talcs::DspxTrackContext *trackContext{};
         talcs::DspxAudioClipContext *clipContext{};
+        AudioClipAudioContext::Status status = AudioClipAudioContext::Unknown;
+        QString realAudioPath;
+
+        void setStatus(AudioClipAudioContext::Status status);
+        void setRealAudioPath(const QString &realAudioPath);
 
         static AudioClipAudioContext *create(Core::ProjectWindowInterface *windowHandle, dspx::AudioClip *clip, talcs::DspxTrackContext *trackContext);
         static AudioClipAudioContextPrivate *of(AudioClipAudioContext *q);

src/plugins/audio/audiocontext/AudioClipAudioContext_p.h

@@ -26,6 +26,20 @@ namespace Audio {
         return d->windowHandle;
     }
 
+    ProjectAudioContext::PlaybackStatus ProjectAudioContext::status() const {
+        Q_D(const ProjectAudioContext);
+        return d->status;
+    }
+
+    void ProjectAudioContext::setStatus(PlaybackStatus status) {
+        Q_D(ProjectAudioContext);
+        if (d->status == status) {
+            return;
+        }
+        d->status = status;
+        Q_EMIT statusChanged(status);
+    }
+
     talcs::MixerAudioSource *ProjectAudioContext::preMixer() const {
         Q_D(const ProjectAudioContext);
         return d->projectContext->preMixer();

src/plugins/audio/audiocontext/ProjectAudioContext.cpp

@@ -25,6 +25,7 @@ namespace Audio {
         Q_OBJECT
         Q_DECLARE_PRIVATE(ProjectAudioContext)
         Q_PROPERTY(Core::ProjectWindowInterface *windowHandle READ windowHandle CONSTANT)
+        Q_PROPERTY(PlaybackStatus status READ status WRITE setStatus NOTIFY statusChanged)
 
     public:
         ~ProjectAudioContext() override;
@@ -33,12 +34,24 @@ namespace Audio {
 
         Core::ProjectWindowInterface *windowHandle() const;
 
+        enum PlaybackStatus {
+            Stopped,
+            Playing,
+            Paused,
+        };
+        Q_ENUM(PlaybackStatus)
+        PlaybackStatus status() const;
+        void setStatus(PlaybackStatus status);
+
         talcs::MixerAudioSource *preMixer() const;
         talcs::TransportAudioSource *transport() const;
         talcs::PositionableMixerAudioSource *postMixer() const;
         talcs::PositionableMixerAudioSource *masterControlMixer() const;
         talcs::PositionableMixerAudioSource *masterTrackMixer() const;
 
+    Q_SIGNALS:
+        void statusChanged(PlaybackStatus status);
+
     private:
         friend class ProjectAudioContextPrivate;
         friend class Internal::ProjectAudioAddOn;

src/plugins/audio/audiocontext/ProjectAudioContext.h

@@ -16,6 +16,7 @@ namespace Audio {
     public:
         ProjectAudioContext *q_ptr{};
         Core::ProjectWindowInterface *windowHandle{};
+        ProjectAudioContext::PlaybackStatus status{ProjectAudioContext::Stopped};
         std::unique_ptr<talcs::DspxProjectContext> projectContext;
 
         static ProjectAudioContext *create(Core::ProjectWindowInterface *windowHandle);