From 56feb190bbda181112a25e2cc7c0afc8afcd266c Mon Sep 17 00:00:00 2001 From: Steven Yi Date: Sun, 26 Nov 2023 19:40:41 -0500 Subject: [PATCH] fix(blueLive): do not generate e-statement as it now appears to halt Csound with BlueLive --- ChangeLog.md | 3 +++ .../src/main/java/blue/ui/core/render/CSDRender.java | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 0559ba5b..39f59c8f 100755 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -28,6 +28,9 @@ information. * Show parameter name in the popup for setting visibility of parameters +* BlueLive: + + * Do not generate e-statement when generating CSD for BlueLive ## [2.9.1] - 2023-09-10 diff --git a/blue-ui-core/src/main/java/blue/ui/core/render/CSDRender.java b/blue-ui-core/src/main/java/blue/ui/core/render/CSDRender.java index c88653cc..8158f14f 100644 --- a/blue-ui-core/src/main/java/blue/ui/core/render/CSDRender.java +++ b/blue-ui-core/src/main/java/blue/ui/core/render/CSDRender.java @@ -175,7 +175,7 @@ protected synchronized CsdRenderResult generateCSDForBlueLiveImpl( appendCsInstruments(compileData, data, udos, arrangement, globalOrcSco, score, mixer, true); - appendCsScore(globalSco, ftables, generatedNotes, totalDur, score); + appendCsScore(score, globalSco, ftables, generatedNotes, totalDur, false); score.append(""); @@ -418,7 +418,7 @@ protected CsdRenderResult generateCSDImpl(BlueData data, appendCsInstruments(compileData, data, udos, arrangement, globalOrcSco, csd, mixer, isRealTime); - appendCsScore(globalSco, ftables, generatedNotes, totalDur, csd); + appendCsScore(csd, globalSco, ftables, generatedNotes, totalDur, true); csd.append(""); @@ -605,8 +605,8 @@ private void appendProjectInfo(BlueData data, StrBuilder score) { score.append(";\n\n"); } - private void appendCsScore(String globalSco, String ftables, - NoteList generatedNotes, double totalDur, StrBuilder score) { + private void appendCsScore(StrBuilder score, String globalSco, String ftables, + NoteList generatedNotes, double totalDur, boolean useEStatement) { score.append("\n\n"); score.append(ftables).append("\n"); @@ -619,7 +619,9 @@ private void appendCsScore(String globalSco, String ftables, } else { score.append("f0 ").append(totalDur).append("\n"); } - score.append("e\n\n"); + if(useEStatement) { + score.append("e\n\n"); + } score.append("\n\n"); }