More soundfiles localisation in faust2supercollider.

grame-cncm · Nov 23, 2023 · 215e72f · 215e72f
1 parent b97544c
commit 215e72f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/architecture/faust/gui/SoundUI.h b/architecture/faust/gui/SoundUI.h
@@ -68,7 +68,7 @@ class SoundUI : public SoundUIInterface
     protected:
 
         // The soundfile directories
-        std::vector<std::string> fSoundfileDir;
+        Soundfile::Directories fSoundfileDir;
         // Map to share loaded soundfiles
         std::map<std::string, std::shared_ptr<Soundfile>> fSoundfileMap;
         // The soundfile reader
@@ -109,7 +109,7 @@ class SoundUI : public SoundUIInterface
          *
          * @return the soundfile loader.
          */
-        SoundUI(const std::vector<std::string>& sound_directories, int sample_rate = -1, SoundfileReader* reader = nullptr, bool is_double = false)
+        SoundUI(const Soundfile::Directories& sound_directories, int sample_rate = -1, SoundfileReader* reader = nullptr, bool is_double = false)
         :fSoundfileDir(sound_directories)
         {
             fSoundReader = (reader)

diff --git a/architecture/faust/gui/Soundfile.h b/architecture/faust/gui/Soundfile.h
@@ -167,6 +167,8 @@ struct Soundfile {
         delete[] fOffset;
     }
 
+    typedef std::vector<std::string> Directories;
+
 } POST_PACKED_STRUCTURE;
 
 /*
@@ -180,7 +182,7 @@ class SoundfileReader {
     int fDriverSR;
 
     // Check if a soundfile exists and return its real path_name
-    std::string checkFile(const std::vector<std::string>& sound_directories, const std::string& file_name)
+    std::string checkFile(const Soundfile::Directories& sound_directories, const std::string& file_name)
     {
         if (checkFile(file_name)) {
             return file_name;
@@ -322,7 +324,7 @@ class SoundfileReader {
     }
 
     // Check if all soundfiles exist and return their real path_name
-    std::vector<std::string> checkFiles(const std::vector<std::string>& sound_directories,
+    std::vector<std::string> checkFiles(const Soundfile::Directories& sound_directories,
                                         const std::vector<std::string>& file_name_list)
     {
         std::vector<std::string> path_name_list;

diff --git a/architecture/supercollider.cpp b/architecture/supercollider.cpp
@@ -61,11 +61,19 @@ std::string defaultUserAppSupportDirectory()
 {
     return std::string(getenv("HOME")) + "/Library/Application Support/SuperCollider/Extensions";
 }
+std::string defaultSoundfilesDirectory1()
+{
+    return std::string(getenv("HOME")) + "/Library/Application Support/SuperCollider/Extensions/FaustSounds";
+}
 #else
 std::string defaultUserAppSupportDirectory()
 {
     return getenv("HOME");
 }
+std::string defaultSoundfilesDirectory1()
+{
+    return std::string(getenv("HOME")) + "/FaustSounds";
+}
 #endif
 
 using namespace std;
@@ -533,7 +541,12 @@ FAUST_EXPORT void load(InterfaceTable* inTable)
     name = normalizeClassName(name);
 
 #ifdef SOUNDFILE
-    std::vector<std::string> soundfile_dirs = { defaultUserAppSupportDirectory(), defaultSoundfilesDirectory(), SoundUI::getBinaryPath() };
+    Soundfile::Directories soundfile_dirs
+        = { defaultUserAppSupportDirectory(),
+            defaultSoundfilesDirectory(),
+            defaultSoundfilesDirectory1(),
+            SoundUI::getBinaryPath()
+        };
     g_SoundInterface = new SoundUI(soundfile_dirs);
     // Force soundfile loading at UGen load time
     tmp_dsp->buildUserInterface(g_SoundInterface);

diff --git a/tools/faust2appls/faust2supercollider b/tools/faust2appls/faust2supercollider
@@ -153,8 +153,7 @@ fi
 #
 if [[ $(uname) == Darwin || $CROSSTARGET == Darwin ]]; then
     EXT="scx"
-    #SCFLAGS="-DNO_LIBSNDFILE -DSC_DARWIN $DNDEBUG -bundle"
-    SCFLAGS="-DSC_DARWIN $DNDEBUG -bundle"
+    SCFLAGS="-DNO_LIBSNDFILE -DSC_DARWIN $DNDEBUG -bundle"
 elif [[ $(uname) == Linux ]]; then
     EXT="so"
     SCFLAGS="-DNO_LIBSNDFILE -DSC_LINUX $DNDEBUG -shared -fPIC"