chore: update to CsoundFFM 1.0.1 (uses new Csound 7 API)

kunstmusik · Sep 8, 2024 · 3963f6a · 3963f6a
1 parent accf6c8
commit 3963f6a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 27 deletions.
diff --git a/blue-csnd6/pom.xml b/blue-csnd6/pom.xml
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>com.kunstmusik</groupId>
             <artifactId>csoundffm</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </dependency>
     </dependencies>
     <distributionManagement>

diff --git a/blue-csnd6/src/main/java/blue/csnd6/render/CS6DiskRenderServiceFactory.java b/blue-csnd6/src/main/java/blue/csnd6/render/CS6DiskRenderServiceFactory.java
@@ -42,6 +42,6 @@ public boolean isAvailable() {
 
     @Override 
     public String toString() {
-        return "Csound 6 API";
+        return "Csound 7 API";
     }
 }
diff --git a/blue-csnd6/src/main/java/blue/csnd6/render/CS6DiskRendererService.java b/blue-csnd6/src/main/java/blue/csnd6/render/CS6DiskRendererService.java
@@ -44,7 +44,7 @@ public CS6DiskRendererService() {
 
     @Override
     public String toString() {
-        return "Csound 6 API";
+        return "Csound 7 API";
     }
 
     @Override
@@ -108,12 +108,11 @@ private void exec(String[] args,
 
         if (retVal != 0) {
             notifyPlayModeListeners(PlayModeListener.PLAY_MODE_STOP);
-            csound.stop();
-            csound.cleanup();
             csound.setMessageCallback(null);
             csound.reset();
             return;
         }
+        csound.start();
 
         int updateRate = (int) (csound.getKr()
                 / PlaybackSettings.getInstance().getPlaybackFPS());
@@ -161,10 +160,9 @@ private void exec(String[] args,
                 }
             }
         } while (csound.performKsmps() == 0 && keepRunning);
-        csound.stop();
-        csound.cleanup();
-        csound.setMessageCallback(null);
+
         csound.reset();
+        csound.setMessageCallback(null);
 
 
         manager.endRender();
@@ -215,19 +213,18 @@ public String execWaitAndCollect(String[] args,
 
         if (retVal != 0) {
             blueCallbackWrapper.setStringBuffer(null);
-            csound.stop();
-            csound.cleanup();
-            csound.setMessageCallback(null);
             csound.reset();
+            csound.setMessageCallback(null);
+
             return buffer.toString();
         }
+
+        csound.start();
 
 
         while (csound.performKsmps() == 0 && keepRunning) {
             // empty
         }
-        csound.stop();
-        csound.cleanup();
         csound.setMessageCallback(null);
         csound.reset();
 
@@ -347,21 +344,20 @@ public void renderToDisk(DiskRenderJob job) {
 
         if (retVal != 0) {
             notifyPlayModeListeners(PlayModeListener.PLAY_MODE_STOP);
-            csound.stop();
-            csound.cleanup();
             csound.setMessageCallback(null);
             csound.reset();
             return;
         }
+
+        csound.start();
 
         while (csound.performKsmps() == 0 && keepRunning) {
 
         }
-        csound.stop();
-        csound.cleanup();
+
         csound.setMessageCallback(null);
         csound.reset();
-
+        
         keepRunning = false;
 
         notifyPlayModeListeners(PlayModeListener.PLAY_MODE_STOP);
@@ -371,6 +367,6 @@ public void renderToDisk(DiskRenderJob job) {
 
     @Override
     public int getCsoundVersion(String csoundCommand) {
-        return 6;
+        return 7;
     }
 }
diff --git a/blue-csnd6/src/main/java/blue/csnd6/render/CS6RealtimeRenderService.java b/blue-csnd6/src/main/java/blue/csnd6/render/CS6RealtimeRenderService.java
@@ -71,7 +71,7 @@ public CS6RealtimeRenderService() {
 
     @Override
     public String toString() {
-        return "Csound 6 API";
+        return "Csound 7 API";
     }
 
     @Override
@@ -152,14 +152,15 @@ public void play(BlueData blueData, CsdRenderResult result,
 
             }
             notifyPlayModeListeners(PlayModeListener.PLAY_MODE_STOP);
-            csound.stop();
-            csound.cleanup();
+            csound.reset();
             csound.setMessageCallback(null);
             csound = null;
             blueCallbackWrapper = null;
             return;
 
         }
+
+        csound.start();
 
         runnerThread = new APIRunnerThread(blueData, csound, this,
                 result.getParameters(), result.getStringChannels(),
@@ -501,10 +502,10 @@ public void run() {
                     Message m = buffer.getMessage(i % capacity);
                     switch (m.messageType) {
                         case 0:
-                            csound.readScore(m.payload);
+                            csound.eventString(m.payload, 0);
                             break;
                         case 1:
-                            csound.compileOrc(m.payload);
+                            csound.compileOrc(m.payload, 0);
                             break;
                     }
 
@@ -576,8 +577,7 @@ public void run() {
 
             bindings.clear();
 
-            csound.stop();
-            csound.cleanup();
+            csound.reset();
             csound.setMessageCallback(null);
 
             if (renderUpdatesTime) {

diff --git a/blue-csnd6/src/main/java/blue/csnd6/render/CS6RealtimeRenderServiceFactory.java b/blue-csnd6/src/main/java/blue/csnd6/render/CS6RealtimeRenderServiceFactory.java
@@ -44,7 +44,7 @@ public RealtimeRenderService createInstance() {
 
     @Override 
     public String toString() {
-        return "Csound 6 API";
+        return "Csound 7 API";
     }
 
     @Override