Refactor opendspx

Author: CrSjimo

scripts/vcpkg

@@ -79,16 +79,16 @@ namespace dspx {
         model()->strategy()->setEntityProperty(handle(), ModelStrategy::P_Value, y);
     }
 
-    QDspx::AnchorNode AnchorNode::toQDspx() const {
+    opendspx::AnchorNode AnchorNode::toOpenDspx() const {
         Q_D(const AnchorNode);
         return {
-            .interp = static_cast<QDspx::AnchorNode::Interpolation>(d->interp),
+            .interp = static_cast<opendspx::AnchorNode::Interpolation>(d->interp),
             .x = d->x,
             .y = d->y,
         };
     }
 
-    void AnchorNode::fromQDspx(const QDspx::AnchorNode &node) {
+    void AnchorNode::fromOpenDspx(const opendspx::AnchorNode &node) {
         Q_D(AnchorNode);
         setInterp(static_cast<InterpolationMode>(node.interp));
         setX(node.x);

src/libs/3rdparty/choruskit

@@ -5,7 +5,7 @@
 
 #include <dspxmodel/EntityObject.h>
 
-namespace QDspx {
+namespace opendspx {
     struct AnchorNode;
 }
 
@@ -48,8 +48,8 @@ namespace dspx {
         int y() const;
         void setY(int y);
 
-        QDspx::AnchorNode toQDspx() const;
-        void fromQDspx(const QDspx::AnchorNode &node);
+        opendspx::AnchorNode toOpenDspx() const;
+        void fromOpenDspx(const opendspx::AnchorNode &node);
 
         AnchorNodeSequence *anchorNodeSequence() const;
         AnchorNode *previousItem() const;

src/libs/3rdparty/opendspx

@@ -71,23 +71,23 @@ namespace dspx {
         return d->pModel->strategy->takeFromSequenceContainer(handle(), item->handle());
     }
 
-    QList<QDspx::AnchorNode> AnchorNodeSequence::toQDspx() const {
+    std::vector<opendspx::AnchorNode> AnchorNodeSequence::toOpenDspx() const {
         Q_D(const AnchorNodeSequence);
-        QList<QDspx::AnchorNode> ret;
+        std::vector<opendspx::AnchorNode> ret;
         ret.reserve(d->container.size());
         for (const auto &[_, item] : d->container.m_items) {
-            ret.append(item->toQDspx());
+            ret.push_back(item->toOpenDspx());
         }
         return ret;
     }
 
-    void AnchorNodeSequence::fromQDspx(const QList<QDspx::AnchorNode> &nodes) {
+    void AnchorNodeSequence::fromOpenDspx(const std::vector<opendspx::AnchorNode> &nodes) {
         while (size()) {
             removeItem(firstItem());
         }
         for (const auto &node : nodes) {
             auto item = model()->createAnchorNode();
-            item->fromQDspx(node);
+            item->fromOpenDspx(node);
             insertItem(item);
         }
     }

src/libs/application/dspxmodel/src/AnchorNode.cpp

@@ -6,7 +6,7 @@
 #include <dspxmodel/EntityObject.h>
 #include <dspxmodel/rangehelpers.h>
 
-namespace QDspx {
+namespace opendspx {
     struct AnchorNode;
 }
 
@@ -41,8 +41,8 @@ namespace dspx {
         Q_INVOKABLE bool insertItem(AnchorNode *item);
         Q_INVOKABLE bool removeItem(AnchorNode *item);
 
-        QList<QDspx::AnchorNode> toQDspx() const;
-        void fromQDspx(const QList<QDspx::AnchorNode> &nodes);
+        std::vector<opendspx::AnchorNode> toOpenDspx() const;
+        void fromOpenDspx(const std::vector<opendspx::AnchorNode> &nodes);
 
         ParamCurveAnchor *paramCurveAnchor() const;
 

src/libs/application/dspxmodel/src/AnchorNode.h

@@ -37,22 +37,22 @@ namespace dspx {
         d->pModel->strategy->setEntityProperty(handle(), ModelStrategy::P_Path, path);
     }
 
-    QDspx::AudioClip AudioClip::toQDspx() const {
+    opendspx::AudioClip AudioClip::toOpenDspx() const {
         return {
-            name(),
-            control()->toQDspx(),
-            time()->toQDspx(),
-            workspace()->toQDspx(),
-            path()
+            name().toStdString(),
+            control()->toOpenDspx(),
+            time()->toOpenDspx(),
+            workspace()->toOpenDspx(),
+            path().toStdString()
         };
     }
 
-    void AudioClip::fromQDspx(const QDspx::AudioClip &clip) {
-        setName(clip.name);
-        control()->fromQDspx(clip.control);
-        time()->fromQDspx(clip.time);
-        workspace()->fromQDspx(clip.workspace);
-        setPath(clip.path);
+    void AudioClip::fromOpenDspx(const opendspx::AudioClip &clip) {
+        setName(QString::fromStdString(clip.name));
+        control()->fromOpenDspx(clip.control);
+        time()->fromOpenDspx(clip.time);
+        workspace()->fromOpenDspx(clip.workspace);
+        setPath(QString::fromStdString(clip.path));
     }
 
     void AudioClip::handleSetEntityProperty(int property, const QVariant &value) {

src/libs/application/dspxmodel/src/AnchorNodeSequence.cpp

@@ -5,7 +5,7 @@
 
 #include <dspxmodel/Clip.h>
 
-namespace QDspx {
+namespace opendspx {
     struct AudioClip;
 }
 
@@ -26,8 +26,8 @@ namespace dspx {
         QString path() const;
         void setPath(const QString &path);
 
-        QDspx::AudioClip toQDspx() const;
-        void fromQDspx(const QDspx::AudioClip &clip);
+        opendspx::AudioClip toOpenDspx() const;
+        void fromOpenDspx(const opendspx::AudioClip &clip);
 
     Q_SIGNALS:
         void pathChanged(const QString &path);

src/libs/application/dspxmodel/src/AnchorNodeSequence.h

@@ -9,15 +9,15 @@ namespace dspx {
 
     BusControl::~BusControl() = default;
 
-    QDspx::BusControl BusControl::toQDspx() const {
+    opendspx::BusControl BusControl::toOpenDspx() const {
         return {
             .gain = gain(),
             .pan = pan(),
             .mute = mute()
         };
     }
 
-    void BusControl::fromQDspx(const QDspx::BusControl &control) {
+    void BusControl::fromOpenDspx(const opendspx::BusControl &control) {
         setGain(control.gain);
         setPan(control.pan);
         setMute(control.mute);