fix: update to use toBeats() with new time units

Author: kunstmusik

blue-core/src/main/java/blue/soundObject/ObjectBuilder.java

@@ -92,14 +92,9 @@ public NoteList generateNotes(TimeContext context, BSBCompilationUnit bsbCompila
         String tempScore = null;
         NoteList nl;
 
-        Map<String, Object> initVals = new HashMap<>();
-
         File currentDirFile = BlueSystem.getCurrentProjectDirectory();
-
-        initVals.put("score", "");
-        initVals.put("blueDuration", getSubjectiveDuration());
-        initVals.put("commandline", this.commandLine);
-        initVals.put("blueProjectDir", currentDirFile);
+        Map<String, Object> initVals = createScoreScriptInitValues(context,
+                currentDirFile);
 
         ScoreScriptEngine engine
                 = ScoreScriptEngineManager.getInstance().getEngine(
@@ -137,6 +132,16 @@ public NoteList generateNotes(TimeContext context, BSBCompilationUnit bsbCompila
         return nl;
     }
 
+    Map<String, Object> createScoreScriptInitValues(TimeContext context,
+            File currentDirFile) {
+        Map<String, Object> initVals = new HashMap<>();
+        initVals.put("score", "");
+        initVals.put("blueDuration", getSubjectiveDuration().toBeats(context));
+        initVals.put("commandline", this.commandLine);
+        initVals.put("blueProjectDir", currentDirFile);
+        return initVals;
+    }
+
     private String getIOExceptionMessage() {
         System.out
                 .println("[Error] Score Generation failed in ObjectBuilder soundObject labeled "

blue-core/src/main/java/blue/soundObject/Sound.java

@@ -124,11 +124,22 @@ public final StringProperty commentProperty() {
         return comment;
     }
 
-    public NoteList generateNotes(int instrumentNumber, double renderStart, double renderEnd) throws SoundObjectException {
+    public NoteList generateNotes(TimeContext context, int instrumentNumber,
+            double renderStart, double renderEnd) throws SoundObjectException {
         NoteList n = new NoteList();
 
-        String noteText = "i" + instrumentNumber + "\t" + getStartTime() + "\t"
-                + getSubjectiveDuration();
+        final double subjectiveDuration = getSubjectiveDuration().toBeats(context);
+        double newDur = subjectiveDuration;
+
+        if (renderEnd > 0 && renderEnd < subjectiveDuration) {
+            newDur = renderEnd;
+        }
+
+        newDur = newDur - renderStart;
+
+        String noteText = "i" + instrumentNumber + "\t"
+                + (getStartTime().toBeats(context) + renderStart) + "\t"
+                + newDur;
 
         Note tempNote = null;
 
@@ -217,7 +228,7 @@ public NoteList generateForCSD(TimeContext context, CompileData compileData, dou
         bsbObj.getParameterList().clearCompilationVarNames();
         int instrNum = compileData.addInstrument(bsbObj);
 
-        return generateNotes(instrNum, startTime, endTime);
+        return generateNotes(context, instrNum, startTime, endTime);
 
     }
 

blue-core/src/test/java/blue/soundObject/ObjectBuilderTest.java

@@ -0,0 +1,25 @@
+package blue.soundObject;
+
+import blue.time.TimeContext;
+import blue.time.TimeDuration;
+import java.io.File;
+import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import org.junit.jupiter.api.Test;
+
+class ObjectBuilderTest {
+
+    @Test
+    void testCreateScoreScriptInitValuesUsesNumericBlueDuration() {
+        TimeContext context = new TimeContext();
+        ObjectBuilder objectBuilder = new ObjectBuilder();
+        objectBuilder.setSubjectiveDuration(TimeDuration.bbt(1, 0, 0));
+
+        Map<String, Object> initValues = objectBuilder.createScoreScriptInitValues(
+                context, new File("."));
+
+        assertInstanceOf(Double.class, initValues.get("blueDuration"));
+        assertEquals(4.0, (Double) initValues.get("blueDuration"), 0.0001);
+    }
+}

blue-core/src/test/java/blue/soundObject/SoundTest.java

@@ -0,0 +1,26 @@
+package blue.soundObject;
+
+import blue.CompileData;
+import blue.time.TimeContext;
+import blue.time.TimeDuration;
+import blue.time.TimePosition;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
+class SoundTest {
+
+    @Test
+    void testGenerateForCSDConvertsTimeUnitsAndClipsPartialRender() throws Exception {
+        TimeContext context = new TimeContext();
+        Sound sound = new Sound();
+        sound.setStartTime(TimePosition.bbt(2, 1, 0));
+        sound.setSubjectiveDuration(TimeDuration.bbt(1, 0, 0));
+
+        NoteList notes = sound.generateForCSD(context,
+                CompileData.createEmptyCompileData(), 1.0, 3.0);
+
+        assertEquals(1, notes.size());
+        assertEquals(5.0, notes.get(0).getStartTime(), 0.0001);
+        assertEquals(2.0, notes.get(0).getSubjectiveDuration(), 0.0001);
+    }
+}