Add 'declare soundfiles' in faust-dynamic-engine.

grame-cncm · Jun 11, 2024 · 0c484de · 0c484de
1 parent 59bc7bb
commit 0c484de
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/architecture/faust/dsp/faust-dynamic-engine.cpp b/architecture/faust/dsp/faust-dynamic-engine.cpp
@@ -243,8 +243,29 @@ struct dsp_aux {
             fDriver->init(fNameApp, fDSP);
             fDSP->buildUserInterface(&fParams);
     #if SOUNDFILE
+
+            // Analyse 'soundfiles' metadata to extract the list of URLs.
+            struct SoundfilesMeta : Meta
+            {
+                vector<string> fURLs;
+
+                void declare(const char* key, const char* value)
+                {
+                    if (string(key) == "soundfiles") {
+                        stringstream ss(value);
+                        string item;
+                        // Use getline with ';' as the delimiter to split the string
+                        while (getline(ss, item, ';')) { fURLs.push_back(item); }
+                    }
+                }
+
+            };
+
             // Use bundle path
-            fSoundInterface = new SoundUI(SoundUI::getBinaryPath());
+            SoundfilesMeta sf;
+            fDSP->metadata(&sf);
+            sf.fURLs.push_back(SoundUI::getBinaryPath());
+            fSoundInterface = new SoundUI(sf.fURLs);
             fDSP->buildUserInterface(fSoundInterface);
     #endif
             return true;

diff --git a/compiler/global.cpp b/compiler/global.cpp
@@ -472,8 +472,7 @@ void global::reset()
 
     gInputString = "";
     gInputFiles.clear();
-    gMetaDataSet.clear();
-
+
     // Backend configuration : default values
     gAllowForeignFunction = true;
     gAllowForeignConstant = true;

diff --git a/tests/llvm-tests/faust-dynamic-engine-test.cpp b/tests/llvm-tests/faust-dynamic-engine-test.cpp
@@ -36,7 +36,7 @@ using namespace std;
 void test1()
 {
     // Create an osc DSP using a code string
-    const char* code = "import(\"stdfaust.lib\"); process = os.osc(500);";
+    const char* code = "import(\"stdfaust.lib\"); declare soundfiles \"https://url1;https://url2;https://url3\"; process = os.osc(500);";
     dsp* DSP = createDsp("Test1", code, 0, NULL, "", -1);
     if (!DSP) {
         printf("ERROR in createDsp : %s", getLastError());
@@ -64,9 +64,9 @@ void test2()
         char error_msg[4096];
 
         // Create an osc DSP using a code string
-        Box osc = CDSPToBoxes("FaustDSP", "import(\"stdfaust.lib\"); process = os.osc(500);", 0, nullptr, &inputs, &outputs, error_msg);
+        Box osc = CDSPToBoxes("FaustDSP", "import(\"stdfaust.lib\"); declare soundfiles \"https://url1;https://url2;https://url3\"; process = os.osc(500);", 0, nullptr, &inputs, &outputs, error_msg);
         if (!osc) {
-            printf("ERROR in CDSPToBoxes : %s\n", error_msg);
+            printf("ERROR in CDSPToBoxes : %s", error_msg);
             destroyLibContext();
             return;
         }
@@ -104,9 +104,10 @@ void test3()
         char error_msg[4096];
 
         // Create an osc DSP using a code string
-        Box osc = CDSPToBoxes("FaustDSP", "import(\"stdfaust.lib\"); process = os.osc(500);", 0, nullptr, &inputs, &outputs, error_msg);
+        Box osc = CDSPToBoxes("FaustDSP", "import(\"stdfaust.lib\"); declare soundfiles \"https://url1;https://url2;https://url3\"; process = os.osc(500);", 0, nullptr, &inputs, &outputs, error_msg);
+
         if (!osc) {
-            printf("ERROR in CDSPToBoxes : %s\n", error_msg);
+            printf("ERROR in CDSPToBoxes : %s", error_msg);
             destroyLibContext();
             return;
         }