Allow setting the open file callback from cpp library

csound · Apr 28, 2024 · 78850d7 · 78850d7
1 parent 6d44ef0
commit 78850d7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/include/csound.h b/include/csound.h
@@ -1174,8 +1174,8 @@ extern "C" {
 
   PUBLIC void csoundSetOpenSoundFileCallback(CSOUND *p,
                                              void *(*openSoundFileCallback)(CSOUND*,
-                                                                          const char*,
-                                                                          int, void*));
+                                                                            const char*,
+                                                                            int, void*));
 
   /**
    * Sets an external callback for opening a file.
@@ -1188,8 +1188,9 @@ extern "C" {
    * This callback is retained after a csoundReset() call.
    */
   PUBLIC void csoundSetOpenFileCallback(CSOUND *p,
-                                        FILE *(*func)(CSOUND*, const char*,
-                                                     const char*));
+                                        FILE *(*openFileCallback)(CSOUND*,
+                                                                  const char*,
+                                                                  const char*));
 
 #if !defined(SWIG)
   /**

diff --git a/include/csound.hpp b/include/csound.hpp
@@ -172,9 +172,24 @@ class PUBLIC Csound
   virtual void SetMIDIOutput(const char *name){
      csoundSetMIDIOutput(csound,name);
   }
-   virtual void SetMIDIFileOutput(const char *name){
-    csoundSetMIDIFileOutput(csound,name);
+  virtual void SetMIDIFileOutput(const char *name){
+     csoundSetMIDIFileOutput(csound,name);
   }
+
+  virtual void SetOpenSoundFileCallback(
+     void *(*openSoundFileCallback_)(CSOUND*, const char *name,
+                                     int flags, void *sf_info))
+  {
+     csoundSetOpenSoundFileCallback(csound, openSoundFileCallback_);
+  }
+
+  virtual void SetOpenFileCallback(
+     FILE *(*openFileCallback_)(CSOUND*, const char*,
+                                const char*))
+  {
+     csoundSetOpenFileCallback(csound, openFileCallback_);
+  }
+
   virtual TREE *ParseOrc(const char *str)
   {
     return csoundParseOrc(csound, str);