breaking change: renamed getBlobValue() to getBlobData(). getBlobValu…

…e() now does actual value semantics.
madronalabs · Jul 10, 2024 · bfdefc6 · bfdefc6
1 parent bcb7ee0
commit bfdefc6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/Tests/treeTest.cpp b/Tests/treeTest.cpp
@@ -449,10 +449,7 @@ TEST_CASE("madronalib/core/serialization", "[serialization]")
   v["a"] = 0.4f;
   v["b"] = "hello";
   v["a/b/c"] = "hello again";
-
-  std::array<uint8_t, 5> testArray{1, 3, 5, 7, 9};
-  auto testBytes = testArray.size() * sizeof(uint8_t);
-  v["blobtest"] = Value(testArray.data(), testBytes);
+  v["blobtest"] = std::vector<uint8_t> {1, 3, 5, 7, 9};
 
   Tree< Value > v2 = JSONToValueTree(valueTreeToJSON(v));
 

diff --git a/source/app/MLValue.cpp b/source/app/MLValue.cpp
@@ -132,6 +132,12 @@ Value::Value(const void* pData, size_t n) : mType(kBlobValue)
   copyBlob(pData, n);
 }
 
+Value::Value(const std::vector<uint8_t>& dataVec) : mType(kBlobValue)
+{
+  copyBlob(dataVec.data(), dataVec.size());
+}
+
+
 Value::~Value()
 {
   // if we have external data, free it

diff --git a/source/app/MLValue.h b/source/app/MLValue.h
@@ -62,6 +62,7 @@ class Value
   // Blob constructors.
   // if data size > kBlobSizeBytes, blob values will allocate heap.
   explicit Value(const void* pData, size_t n);
+  Value(const std::vector<uint8_t>& dataVec);
   // TODO make array-like ctor using gsl::span
 
   // matrix type constructor via initializer_list
@@ -165,6 +166,18 @@ class Value
       return 0;
     }
   }
+
+  inline std::vector<uint8_t> getBlobValue() const
+  {
+    if (mType == kBlobValue)
+    {
+      return std::vector<uint8_t>(pBlobData, pBlobData + _blobSizeInBytes);
+    }
+    else
+    {
+      return std::vector<uint8_t>();
+    }
+  }
 
   // For each type of property, a setValue method must exist
   // to set the value of the property to that of the argument.