WIP: added functions for track volume in song generation (TS only)

Modrigue · Dec 26, 2023 · aae4ecd · aae4ecd
1 parent 2fc3c8b
commit aae4ecd
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 19 deletions.
diff --git a/ts/song_generator/counterpoint_1_1.ts b/ts/song_generator/counterpoint_1_1.ts
@@ -1,3 +1,5 @@
+// source: https://www.youtube.com/@JacobGran
+
 const perfectConsonances   = [0, 7];                 // unison, 8ves and 5ths
 const imperfectConsonances = [3, 4, 8, 9];           // 3rds and 6ths
 const dissonances          = [1, 2, 5, 6, 10, 11];   // 2nds, 4ths and 7ths

diff --git a/ts/song_generator/midiFile.ts b/ts/song_generator/midiFile.ts
@@ -91,6 +91,16 @@ class MidiFile
         this.Tracks[trackIndex].PitchBend(cents, deltaTime);
     }
 
+    public ControlChangeEntrySlider(trackIndex: number, refParam: number = 0)
+    {
+        this.Tracks[trackIndex].ControlChangeEntrySlider(refParam);
+    }
+
+    public ControlChangeVolume(trackIndex: number, volume: number = 0)
+    {
+        this.Tracks[trackIndex].ControlChangeVolume(volume);
+    }
+
     public ControlChangeFine(trackIndex: number, refParam: number = 0)
     {
         this.Tracks[trackIndex].ControlChangeFine(refParam);
@@ -101,11 +111,6 @@ class MidiFile
         this.Tracks[trackIndex].ControlChangeCoarse(refParam);
     }
 
-    public ControlChangeEntrySlider(trackIndex: number, refParam: number = 0)
-    {
-        this.Tracks[trackIndex].ControlChangeEntrySlider(refParam);
-    }
-
     public ToBytes(): Uint8Array
     {
         let headerBytes : Uint8Array = this.Header.ToBytes();

diff --git a/ts/song_generator/midiTrack.ts b/ts/song_generator/midiTrack.ts
@@ -6,6 +6,7 @@ class MidiTrack
 
     public Channel: number;    // 4 bytes
     public InstrumentId: number;
+    public Volume: number;
 
     constructor(channel: number)
     {
@@ -15,6 +16,7 @@ class MidiTrack
         this.InstrumentId = 1; // default, piano
         this.UpdateInstrument(this.InstrumentId);
 
+        this.Volume = 80;
         this.Muted = false;
 
         // add end of track event
@@ -131,23 +133,30 @@ class MidiTrack
         this.AddEvent(event);
     }
 
-    public ControlChangeFine(refParam: number = 0): void
+    public ControlChangeEntrySlider(refParam: number = 0): void
     {
-        const event: MidiTrackEvent = ControlChangeFineEvent(this.Channel - 1, refParam);
+        const event: MidiTrackEvent = ControlChangeEntrySliderEvent(this.Channel - 1, refParam);
         //DisplayHexBytesArray(event.ToBytes());
         this.AddEvent(event);
     }
 
-    public ControlChangeCoarse(refParam: number = 0): void
+    public ControlChangeVolume(volume: number = 0): void
     {
-        const event: MidiTrackEvent = ControlChangeCoarseEvent(this.Channel - 1, refParam);
+        const event: MidiTrackEvent = ControlChangeVolumeEvent(this.Channel - 1, volume);
         //DisplayHexBytesArray(event.ToBytes());
         this.AddEvent(event);
     }
 
-    public ControlChangeEntrySlider(refParam: number = 0): void
+    public ControlChangeFine(refParam: number = 0): void
     {
-        const event: MidiTrackEvent = ControlChangeEntrySliderEvent(this.Channel - 1, refParam);
+        const event: MidiTrackEvent = ControlChangeFineEvent(this.Channel - 1, refParam);
+        //DisplayHexBytesArray(event.ToBytes());
+        this.AddEvent(event);
+    }
+
+    public ControlChangeCoarse(refParam: number = 0): void
+    {
+        const event: MidiTrackEvent = ControlChangeCoarseEvent(this.Channel - 1, refParam);
         //DisplayHexBytesArray(event.ToBytes());
         this.AddEvent(event);
     }

diff --git a/ts/song_generator/midiTrackEvent.ts b/ts/song_generator/midiTrackEvent.ts
@@ -108,6 +108,23 @@ function PitchBendEvent(channel: number, cents: number, deltaTime: number): Midi
     return new MidiTrackEvent(deltaTime, data, MidiTrackEventType.PICTH_BEND, cents);
 }
 
+function ControlChangeEntrySliderEvent(channel: number, refParam: number = 0): MidiTrackEvent
+{
+    const start: number = 0xB0 + (channel & 0xF);
+    const data : Array<number> = [start, 6, refParam];
+
+    return new MidiTrackEvent(0, data, MidiTrackEventType.CONTROL_CHANGE_ENTRY_SLIDER);
+}
+
+function ControlChangeVolumeEvent(channel: number, volume: number = 0): MidiTrackEvent
+{
+    const start: number = 0xB0 + (channel & 0xF);
+    const data : Array<number> = [start, 7, volume];
+    //console.log(DisplayHexArray(data));
+
+    return new MidiTrackEvent(0, data, MidiTrackEventType.CONTROL_CHANGE_ENTRY_SLIDER);
+}
+
 function ControlChangeFineEvent(channel: number, refParam: number = 0): MidiTrackEvent
 {
     const start: number = 0xB0 + (channel & 0xF);
@@ -122,12 +139,4 @@ function ControlChangeCoarseEvent(channel: number, refParam: number = 0): MidiTr
     const data : Array<number> = [start, 101, refParam];
 
     return new MidiTrackEvent(0, data, MidiTrackEventType.CONTROL_CHANGE_COARSE);
-}
-
-function ControlChangeEntrySliderEvent(channel: number, refParam: number = 0): MidiTrackEvent
-{
-    const start: number = 0xB0 + (channel & 0xF);
-    const data : Array<number> = [start, 6, refParam];
-
-    return new MidiTrackEvent(0, data, MidiTrackEventType.CONTROL_CHANGE_ENTRY_SLIDER);
 }