From 33dd51999c977bed21fb233a4018969827e45a67 Mon Sep 17 00:00:00 2001 From: Modrigue Date: Sat, 6 Jan 2024 20:31:38 +0100 Subject: [PATCH] minor refactoring --- js/song_generator/chord_progression.js | 6 +++--- js/song_generator/chord_progression.js.map | 2 +- js/song_generator/counterpoint_1_1.js | 6 +++--- js/song_generator/counterpoint_1_1.js.map | 2 +- js/song_generator/counterpoint_2_1.js | 12 ++++++------ js/song_generator/counterpoint_2_1.js.map | 2 +- js/song_generator/counterpoint_3_1.js | 14 +++++++------- js/song_generator/counterpoint_3_1.js.map | 2 +- js/song_generator/counterpoint_4_1.js | 8 ++++---- js/song_generator/counterpoint_4_1.js.map | 2 +- js/song_generator/counterpoint_4th_spec.js | 6 +++--- js/song_generator/counterpoint_4th_spec.js.map | 2 +- js/song_generator/midiTrack.js | 6 +++--- js/song_generator/midiTrack.js.map | 2 +- js/song_generator/sequence.js | 4 ++-- js/song_generator/sequence.js.map | 2 +- ts/song_generator/chord_progression.ts | 6 +++--- ts/song_generator/counterpoint_1_1.ts | 6 +++--- ts/song_generator/counterpoint_2_1.ts | 12 ++++++------ ts/song_generator/counterpoint_3_1.ts | 14 +++++++------- ts/song_generator/counterpoint_4_1.ts | 8 ++++---- ts/song_generator/counterpoint_4th_spec.ts | 6 +++--- ts/song_generator/midiTrack.ts | 6 +++--- ts/song_generator/sequence.ts | 4 ++-- 24 files changed, 70 insertions(+), 70 deletions(-) diff --git a/js/song_generator/chord_progression.js b/js/song_generator/chord_progression.js index ac46562..5cad176 100644 --- a/js/song_generator/chord_progression.js +++ b/js/song_generator/chord_progression.js @@ -73,7 +73,7 @@ function addChordAsArpeggios(track, chordValues, startPosition, duration, nbNote //console.log(chordValues); for (let indexNote = 0; indexNote < nbNotesPerBar; indexNote++) { const noteValue = chordValues[indexNote % nbNotesInChord]; - AddNoteValueEvent(track, noteValue, startPosition, duration); + AddNoteMonoValueEvent(track, noteValue, startPosition, duration); } } // bass @@ -103,7 +103,7 @@ function generateChordsProgBassTrackCandidate(tonic, scaleValues, nbBars, nbNote const duration = 4 * qNote / nbNotesPerBar; // 1st note appears? //if (noteAppears(freq)) - AddNoteEvent(track, tonic + startInterval, octave, 0, 4 * qNote / nbNotesPerBar); + AddNoteMonoEvent(track, tonic + startInterval, octave, 0, 4 * qNote / nbNotesPerBar); //else // startPosition += duration; // generate random notes in scale @@ -135,7 +135,7 @@ function generateChordsProgBassTrackCandidate(tonic, scaleValues, nbBars, nbNote break; } // ok, add note doubled at inferior octave - AddNoteValueEvent(track, noteNextValue, startPosition, duration); + AddNoteMonoValueEvent(track, noteNextValue, startPosition, duration); startPosition = 0; noteCurIndex = noteNextIndex; } diff --git a/js/song_generator/chord_progression.js.map b/js/song_generator/chord_progression.js.map index b3407a6..2837060 100644 --- a/js/song_generator/chord_progression.js.map +++ b/js/song_generator/chord_progression.js.map @@ -1 +1 @@ -{"version":3,"file":"chord_progression.js","sourceRoot":"","sources":["../../ts/song_generator/chord_progression.ts"],"names":[],"mappings":";AAAA,SAAS,uBAAuB,CAAC,KAAa,EAAE,WAA0B,EAAE,MAAc,EAAE,aAAqB,EAC7G,MAAc,EAAE,IAAY,EAAE,KAAa,EAAE,SAAiB;IAE9D,mDAAmD;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC;IACrB,IAAI,KAAK,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAChC;QACI,KAAK,GAAG,gCAAgC,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACpH,OAAO,GAAG,2BAA2B,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QACjE,IAAI,OAAO;YACP,OAAO,KAAK,CAAC;KACpB;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,gCAAgC,CAAC,KAAa,EAAE,WAA0B,EAAE,MAAc,EAC/F,aAAqB,EAAE,MAAc,EAAE,IAAY,EAAE,KAAa,EAAE,SAAiB;IAErF,IAAI,KAAK,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC;IAErC,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,CAAC;IAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAC,cAAc,CAAC,CAAC;IAErD,kCAAkC;IAClC,MAAM,gBAAgB,GAAG,8BAA8B,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAEpF,yDAAyD;IACzD,2EAA2E;IAC3E,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,MAAM,WAAW,GAAG,CAAC,GAAC,KAAK,CAAC;IAE5B,0CAA0C;IAC1C,4DAA4D;IAC5D,MAAM,cAAc,GAAG,CAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAE,CAAC;IACzF,IAAI,aAAa,IAAI,CAAC;QAClB,mBAAmB,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC;;QAE9D,mBAAmB,CAAC,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,GAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAExG,kCAAkC;IAClC,MAAM,OAAO,GAAG,KAAK,CAAC;IACtB,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,MAAM,EAAE,QAAQ,EAAE,EACpD;QACI,4BAA4B;QAC5B,yBAAyB;QACzB,GAAG;QACH,gCAAgC;QAChC,eAAe;QACf,GAAG;QAEH,IAAI,eAAe,GAAkB,EAAE,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAChC;YACI,eAAe,GAAG,EAAE,CAAC;YACrB,MAAM,cAAc,GAAG,CAAC,CAAC,CAAC,wBAAwB;YAClD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,cAAc,EAAE,KAAK,EAAE,EACnD;gBACI,kBAAkB;gBAClB,MAAM,iBAAiB,GAAG,eAAe,CAAC,CAAC,aAAa,GAAG,CAAC,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC;gBACjF,IAAI,SAAS,GAAG,gBAAgB,CAAC,CAAC,iBAAiB,GAAG,cAAc,CAAC,GAAG,cAAc,CAAC,CAAC;gBACxF,IAAI,iBAAiB,GAAG,CAAC;oBACrB,SAAS,IAAI,EAAE,CAAC;gBAEpB,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACnC;YAED,IAAI,uBAAuB,CAAC,eAAe,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC;gBACvF,MAAM;SACb;QAED,4BAA4B;QAC5B,IAAI,aAAa,IAAI,CAAC;YAClB,mBAAmB,CAAC,KAAK,EAAE,eAAe,EAAE,CAAC,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;;YAE3E,mBAAmB,CAAC,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,WAAW,GAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QAEzG,aAAa,GAAG,CAAC,CAAC;KACrB;IAGD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,uBAAuB,CAAC,YAA2B,EAAE,UAAkB,EAAE,QAAgB,EAAE,MAAc,EAC9G,KAAgB,EAAE,aAAqB;IAEvC,IAAI,kBAAkB,CAAC,YAAY,CAAC;QAChC,OAAO,KAAK,CAAC;IAEjB,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAgB,EAAE,WAA0B,EAAE,aAAqB,EAC5F,QAAiB,EAAE,aAAqB;IAExC,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAChD,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,CAAC;IAC1C,2BAA2B;IAE3B,KAAK,IAAI,SAAS,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,EAAE,SAAS,EAAE,EAC9D;QACI,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,GAAG,cAAc,CAAC,CAAC;QAC1D,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;KAChE;AACL,CAAC;AAGD,OAAO;AAEP,SAAS,2BAA2B,CAAC,KAAa,EAAE,WAA0B,EAAE,MAAc,EAAE,aAAqB,EACjH,MAAc,EAAE,IAAY,EAAE,KAAa,EAAE,SAAiB;IAE9D,mDAAmD;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC;IACrB,IAAI,KAAK,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAChC;QACI,KAAK,GAAG,oCAAoC,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACxH,OAAO,GAAG,IAAI,CAAC;QACf,IAAI,OAAO;YACP,OAAO,KAAK,CAAC;KACpB;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,oCAAoC,CAAC,KAAa,EAAE,WAA0B,EAAE,MAAc,EACnG,aAAqB,EAAE,MAAc,EAAE,IAAY,EAAE,KAAa,EAAE,SAAiB;IAErF,IAAI,KAAK,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC;IAErC,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,CAAC;IAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAC,cAAc,CAAC,CAAC;IAErD,kCAAkC;IAClC,MAAM,gBAAgB,GAAG,8BAA8B,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAEpF,0BAA0B;IAC1B,IAAI,cAAc,GAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc;IAEvD,MAAM,aAAa,GAAG,CAAC,CAAC,CAAC,gDAAgD;IACzE,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,MAAM,QAAQ,GAAG,CAAC,GAAC,KAAK,GAAC,aAAa,CAAC;IAEvC,oBAAoB;IACpB,wBAAwB;IACpB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,GAAC,KAAK,GAAC,aAAa,CAAC,CAAC;IACjF,MAAM;IACN,gCAAgC;IAEhC,iCAAiC;IACjC,MAAM,OAAO,GAAG,KAAK,CAAC;IACtB,IAAI,YAAY,GAAG,0BAA0B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7D,IAAI,YAAY,GAAG,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1D,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,aAAa,GAAC,MAAM,EAAE,QAAQ,EAAE,EAClE;QACI,4BAA4B;QAC5B,yBAAyB;QACzB,GAAG;QACH,gCAAgC;QAChC,eAAe;QACf,GAAG;QAEH,gCAAgC;QAChC,IAAI,aAAa,GAAG,CAAC,CAAC,CAAC;QACvB,IAAI,aAAa,GAAG,CAAC,CAAC,CAAC;QACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE;QAChC,wFAAwF;QACxF;YACI,kBAAkB;YAClB,IAAI,iBAAiB,GAAG,uBAAuB,CAAC,CAAC,aAAa,GAAG,CAAC,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC;YACvF,gCAAgC;YAChC,2EAA2E;YAE3E,aAAa,GAAG,YAAY,GAAG,iBAAiB,CAAC;YACjD,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;YAElF,aAAa,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;YAChD,6EAA6E;YAE7E,IAAI,0BAA0B,CAAC,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC;gBACxF,MAAM;SACb;QAED,0CAA0C;QAC1C,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;QACjE,aAAa,GAAG,CAAC,CAAC;QAClB,YAAY,GAAG,aAAa,CAAC;KAChC;IAED,sCAAsC;IACtC,IAAI,YAAY,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC;IAC5C,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,oBAAoB;IACnC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAChC;QACI,QAAQ,KAAK,CAAC,IAAI,EAClB;YACI,KAAK,kBAAkB,CAAC,OAAO,CAAC;YAChC,KAAK,kBAAkB,CAAC,QAAQ;gBAChC;oBACI,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;oBACxB,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;oBAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;oBACzB,6CAA6C;oBAE7C,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,YAAY,GAAG,EAAE,CAAC,CAAC;oBACtD,IAAI,KAAK,CAAC,IAAI,IAAI,kBAAkB,CAAC,OAAO;wBACxC,qBAAqB,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;yBAC1D,IAAI,KAAK,CAAC,IAAI,IAAI,kBAAkB,CAAC,QAAQ;wBAC9C,sBAAsB,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;oBAEvE,MAAM;iBACT;YAED,KAAK,kBAAkB,CAAC,UAAU;gBAClC;oBACI,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC;oBACvB,MAAM;iBACT;YAED;gBACI,MAAM;SACb;KACJ;IACD,OAAO,YAAY,CAAC;AACxB,CAAC;AAED,SAAS,0BAA0B,CAAC,SAAiB,EAAE,UAAkB,EAAE,QAAgB,EAAE,MAAc,EACvG,KAAgB,EAAE,aAAqB;IAEvC,IAAI,SAAS,GAAG,CAAC;QACb,OAAO,KAAK,CAAC;IAEjB,0DAA0D;IAC1D,IAAI,QAAQ,IAAI,MAAM,GAAG,CAAC,EAC1B;QACI,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC,GAAG,aAAa;YAC/C,OAAO,KAAK,CAAC;KACpB;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,2BAA2B,CAAC,KAAiB,EAAE,KAAa,EAAE,WAA0B;IAE7F,qCAAqC;IACrC,MAAM,OAAO,GAAuB,QAAQ,CAAC,cAAc,CAAC,sBAAsB,CAAE,CAAC,KAAK,CAAC;IAC3F,IAAI,OAAO,IAAI,IAAI;QACf,OAAO,IAAI,CAAC;IAEhB,oDAAoD;IACpD,MAAM,aAAa,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACrD,IAAI,aAAa,IAAI,IAAI,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC;QAClD,OAAO,IAAI,CAAC;IAEhB,IAAI,eAAe,GAAG,IAAI,KAAK,EAAU,CAAC;IAC1C,KAAK,MAAM,KAAK,IAAI,aAAa,EACjC;QACI,MAAM,aAAa,GAAG,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;QACxD,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;KACvC;IAED,0DAA0D;IAC1D,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAChC;QACI,QAAO,KAAK,CAAC,IAAI,EACjB;YACI,KAAK,kBAAkB,CAAC,OAAO;gBAC/B;oBACI,6CAA6C;oBAC7C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;oBACxB,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;oBAC7B,MAAM,SAAS,GAAG,YAAY,GAAG,SAAS,CAAC;oBAC3C,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC;oBACtD,IAAI,KAAK,IAAI,CAAC;wBACV,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;oBAErC,MAAM;iBACT;YAED,KAAK,kBAAkB,CAAC,UAAU;gBAClC;oBACI,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC;oBAC7B,SAAS,GAAG,KAAK,GAAG,GAAG,CAAC,CAAC,+BAA+B;oBACxD,MAAM;iBACT;SACJ;KACJ;IAED,OAAO,CAAC,eAAe,IAAI,IAAI,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;AACpE,CAAC"} \ No newline at end of file +{"version":3,"file":"chord_progression.js","sourceRoot":"","sources":["../../ts/song_generator/chord_progression.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/js/song_generator/counterpoint_1_1.js b/js/song_generator/counterpoint_1_1.js index da74ca2..992a24b 100644 --- a/js/song_generator/counterpoint_1_1.js +++ b/js/song_generator/counterpoint_1_1.js @@ -43,7 +43,7 @@ function generateCounterpointTrack11Candidate(tonic, scaleValues, nbBars, octave } } const startInterval = getRandomArrayElement(startIntervals); - AddNoteEvent(track, tonic + startInterval, octave, 0, 4 * qNote); + AddNoteMonoEvent(track, tonic + startInterval, octave, 0, 4 * qNote); // generate random notes in scale const nbTries = 10000; let noteCurValue = GetNoteValueFromNoteOctave(tonic, octave); @@ -66,7 +66,7 @@ function generateCounterpointTrack11Candidate(tonic, scaleValues, nbBars, octave break; } // ok, add note - AddNoteValueEvent(track, noteNextValue, 0, 4 * qNote); + AddNoteMonoValueEvent(track, noteNextValue, 0, 4 * qNote); noteCurIndex = noteNextIndex; } // last note: fetch nearest tonic @@ -81,7 +81,7 @@ function generateCounterpointTrack11Candidate(tonic, scaleValues, nbBars, octave octaveEnd = octaveCur; } } - AddNoteEvent(track, tonic, octaveEnd, 0, 4 * qNote); + AddNoteMonoEvent(track, tonic, octaveEnd, 0, 4 * qNote); //console.log(track.LogText()); return track; } diff --git a/js/song_generator/counterpoint_1_1.js.map b/js/song_generator/counterpoint_1_1.js.map index 295a3fb..8d2a588 100644 --- a/js/song_generator/counterpoint_1_1.js.map +++ b/js/song_generator/counterpoint_1_1.js.map @@ -1 +1 @@ -{"version":3,"file":"counterpoint_1_1.js","sourceRoot":"","sources":["../../ts/song_generator/counterpoint_1_1.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"counterpoint_1_1.js","sourceRoot":"","sources":["../../ts/song_generator/counterpoint_1_1.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/js/song_generator/counterpoint_2_1.js b/js/song_generator/counterpoint_2_1.js index 5946151..be1ee53 100644 --- a/js/song_generator/counterpoint_2_1.js +++ b/js/song_generator/counterpoint_2_1.js @@ -46,7 +46,7 @@ function generateCounterpointTrack21Candidate(tonic, scaleValues, nbBars, octave // 1st bar: start with delay to enhance separation effect if (index1 == 0 && hasTrackCF) { // no 1st note - AddNoteEvent(track21, note1, octave1, rhythmsFactor1 * duration, (1 - rhythmsFactor1) * duration); + AddNoteMonoEvent(track21, note1, octave1, rhythmsFactor1 * duration, (1 - rhythmsFactor1) * duration); } // last bar: replace 1st note by consonnant interval and set tonic as 2nd note else if (index1 == track11NbNotes - 1) { @@ -64,13 +64,13 @@ function generateCounterpointTrack21Candidate(tonic, scaleValues, nbBars, octave else // generate new note note1ValueNew = GetRandomNoteValueInScale(note2PrevIndex - 1, note1Index + 1, scaleNotesValues); } - AddNoteValueEvent(track21, note1ValueNew, 0, rhythmsFactor1 * duration); + AddNoteMonoValueEvent(track21, note1ValueNew, 0, rhythmsFactor1 * duration); // set tonic as 2nd note - AddNoteEvent(track21, note1, octave1, 0, (1 - rhythmsFactor1) * duration); + AddNoteMonoEvent(track21, note1, octave1, 0, (1 - rhythmsFactor1) * duration); } else { // keep existing note as 1st bar note - AddNoteEvent(track21, note1, octave1, 0, rhythmsFactor1 * duration); + AddNoteMonoEvent(track21, note1, octave1, 0, rhythmsFactor1 * duration); // create new 2nd note let note2ValueNew = -1; const nbTries = 10000; @@ -79,7 +79,7 @@ function generateCounterpointTrack21Candidate(tonic, scaleValues, nbBars, octave if (acceptNoteInCounterpoint21(note2ValueNew, tonic, index1, nbBars, track21, track11, trackCF)) break; } - AddNoteValueEvent(track21, note2ValueNew, 0, (1 - rhythmsFactor1) * duration); + AddNoteMonoValueEvent(track21, note2ValueNew, 0, (1 - rhythmsFactor1) * duration); } index1++; } @@ -215,7 +215,7 @@ function ReduceTrack21(track21, channelId) { continue; } const noteValue = track21.GetNoteValue(noteIndex); - AddNoteValueEvent(track11, noteValue, 0, 4 * qNote); + AddNoteMonoValueEvent(track11, noteValue, 0, 4 * qNote); noteIndex++; } return track11; diff --git a/js/song_generator/counterpoint_2_1.js.map b/js/song_generator/counterpoint_2_1.js.map index 13b4b32..f9d45a3 100644 --- a/js/song_generator/counterpoint_2_1.js.map +++ b/js/song_generator/counterpoint_2_1.js.map @@ -1 +1 @@ -{"version":3,"file":"counterpoint_2_1.js","sourceRoot":"","sources":["../../ts/song_generator/counterpoint_2_1.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"counterpoint_2_1.js","sourceRoot":"","sources":["../../ts/song_generator/counterpoint_2_1.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/js/song_generator/counterpoint_3_1.js b/js/song_generator/counterpoint_3_1.js index 2e91e12..ec3a708 100644 --- a/js/song_generator/counterpoint_3_1.js +++ b/js/song_generator/counterpoint_3_1.js @@ -45,7 +45,7 @@ function generateCounterpointTrack31Candidate(tonic, scaleValues, nbBars, octave // 1st bar: start with delay to enhance separation effect if (index1 == 0 && hasTrackCF) { // no 1st note - AddNoteEvent(track31, note1, octave1, (1 - rhythmsArray[2]) * duration, rhythmsArray[2] * duration); + AddNoteMonoEvent(track31, note1, octave1, (1 - rhythmsArray[2]) * duration, rhythmsArray[2] * duration); } // last bar: replace 1st note by consonnant interval and set tonic as 2nd note else if (index1 == track11NbNotes - 1) { @@ -63,13 +63,13 @@ function generateCounterpointTrack31Candidate(tonic, scaleValues, nbBars, octave else // generate new note note1ValueNew = GetRandomNoteValueInScale(note3PrevIndex - 1, note1Index + 1, scaleNotesValues); } - AddNoteValueEvent(track31, note1ValueNew, 0, rhythmsArray[0] * duration); + AddNoteMonoValueEvent(track31, note1ValueNew, 0, rhythmsArray[0] * duration); // set tonic as 2nd note - AddNoteEvent(track31, note1, octave1, 0, rhythmsArray[1] * duration); + AddNoteMonoEvent(track31, note1, octave1, 0, rhythmsArray[1] * duration); } else { // keep existing note as 1st bar note - AddNoteEvent(track31, note1, octave1, 0, rhythmsArray[0] * duration); + AddNoteMonoEvent(track31, note1, octave1, 0, rhythmsArray[0] * duration); // create new 2nd note in bar let note32ValueNew = -1; const nbTries = 10000; @@ -78,7 +78,7 @@ function generateCounterpointTrack31Candidate(tonic, scaleValues, nbBars, octave if (acceptNoteInCounterpoint31(note32ValueNew, tonic, index1, nbBars, track31, track11, trackCF)) break; } - AddNoteValueEvent(track31, note32ValueNew, 0, rhythmsArray[1] * duration); + AddNoteMonoValueEvent(track31, note32ValueNew, 0, rhythmsArray[1] * duration); // create new 3rd note in bat let note33ValueNew = -1; for (let i = 0; i < nbTries; i++) { @@ -86,7 +86,7 @@ function generateCounterpointTrack31Candidate(tonic, scaleValues, nbBars, octave if (acceptNoteInCounterpoint31(note33ValueNew, tonic, index1, nbBars, track31, track11, trackCF)) break; } - AddNoteValueEvent(track31, note33ValueNew, 0, rhythmsArray[2] * duration); + AddNoteMonoValueEvent(track31, note33ValueNew, 0, rhythmsArray[2] * duration); } index1++; } @@ -260,7 +260,7 @@ function ReduceTrack31(track31, channelId) { continue; } const noteValue = track31.GetNoteValue(noteIndex); - AddNoteValueEvent(track11, noteValue, 0, 4 * qNote); + AddNoteMonoValueEvent(track11, noteValue, 0, 4 * qNote); noteIndex++; } return track11; diff --git a/js/song_generator/counterpoint_3_1.js.map b/js/song_generator/counterpoint_3_1.js.map index a74d220..ac6dba8 100644 --- a/js/song_generator/counterpoint_3_1.js.map +++ b/js/song_generator/counterpoint_3_1.js.map @@ -1 +1 @@ -{"version":3,"file":"counterpoint_3_1.js","sourceRoot":"","sources":["../../ts/song_generator/counterpoint_3_1.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"counterpoint_3_1.js","sourceRoot":"","sources":["../../ts/song_generator/counterpoint_3_1.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/js/song_generator/counterpoint_4_1.js b/js/song_generator/counterpoint_4_1.js index f91e99d..7de042e 100644 --- a/js/song_generator/counterpoint_4_1.js +++ b/js/song_generator/counterpoint_4_1.js @@ -46,7 +46,7 @@ function generateCounterpointTrack41Candidate(tonic, scaleValues, nbBars, octave const rhythmsArray = rhythmFactorArray[barIndex % nbRhythms]; if (index21 == 0 && hasTrackCF) { // 1st note on 4th beat - AddNoteValueEvent(track41, note21Value, 3 * qNote, qNote); + AddNoteMonoValueEvent(track41, note21Value, 3 * qNote, qNote); //// 1st notes: 3rd and 4th beats //AddNoteValueEvent(track41, note21Value, 2*qNote, qNote); //AddNoteValueEvent(track41, note21Value, 0, qNote); @@ -65,8 +65,8 @@ function generateCounterpointTrack41Candidate(tonic, scaleValues, nbBars, octave break; } const note21PosInBar = ((index21 + 1) % 2); - AddNoteValueEvent(track41, note21Value, 0, rhythmsArray[2 * note21PosInBar] * 2 * duration); - AddNoteValueEvent(track41, note4ValueNew, 0, rhythmsArray[2 * note21PosInBar + 1] * 2 * duration); + AddNoteMonoValueEvent(track41, note21Value, 0, rhythmsArray[2 * note21PosInBar] * 2 * duration); + AddNoteMonoValueEvent(track41, note4ValueNew, 0, rhythmsArray[2 * note21PosInBar + 1] * 2 * duration); } index21++; } @@ -202,7 +202,7 @@ function ReduceTrack41(track41, channelId) { continue; } const noteValue = track41.GetNoteValue(noteIndex); - AddNoteValueEvent(track11, noteValue, 0, 4 * qNote); + AddNoteMonoValueEvent(track11, noteValue, 0, 4 * qNote); noteIndex++; } return track11; diff --git a/js/song_generator/counterpoint_4_1.js.map b/js/song_generator/counterpoint_4_1.js.map index d1bc60f..e3c9a58 100644 --- a/js/song_generator/counterpoint_4_1.js.map +++ b/js/song_generator/counterpoint_4_1.js.map @@ -1 +1 @@ -{"version":3,"file":"counterpoint_4_1.js","sourceRoot":"","sources":["../../ts/song_generator/counterpoint_4_1.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"counterpoint_4_1.js","sourceRoot":"","sources":["../../ts/song_generator/counterpoint_4_1.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/js/song_generator/counterpoint_4th_spec.js b/js/song_generator/counterpoint_4th_spec.js index 0921bf2..3be92a8 100644 --- a/js/song_generator/counterpoint_4th_spec.js +++ b/js/song_generator/counterpoint_4th_spec.js @@ -46,7 +46,7 @@ function generateCounterpointTrack4SCandidate(tonic, scaleValues, nbBars, octave // set rhythm in 1st and 2nd bars const rhythmsArray0 = rhythmFactorArray[0]; const rhythmsArray1 = rhythmFactorArray[1 % nbRhythms]; - AddNoteEvent(track, tonic + startInterval, octave, rhythmsArray0[0] * 4 * qNote, (rhythmsArray0[1] + rhythmsArray1[0]) * 4 * qNote); + AddNoteMonoEvent(track, tonic + startInterval, octave, rhythmsArray0[0] * 4 * qNote, (rhythmsArray0[1] + rhythmsArray1[0]) * 4 * qNote); // generate random notes in scale const nbTries = 10000; let noteCurValue = GetNoteValueFromNoteOctave(tonic, octave); @@ -71,7 +71,7 @@ function generateCounterpointTrack4SCandidate(tonic, scaleValues, nbBars, octave break; } // ok, add note - AddNoteValueEvent(track, noteNextValue, 0, (rhythmsArrayCur[1] + rhythmsArrayNext[0]) * 4 * qNote); + AddNoteMonoValueEvent(track, noteNextValue, 0, (rhythmsArrayCur[1] + rhythmsArrayNext[0]) * 4 * qNote); noteCurIndex = noteNextIndex; } // last note: fetch nearest tonic @@ -87,7 +87,7 @@ function generateCounterpointTrack4SCandidate(tonic, scaleValues, nbBars, octave } } const rhythmsArrayLast = rhythmFactorArray[(nbBars - 1) % nbRhythms]; - AddNoteEvent(track, tonic, octaveEnd, 0, rhythmsArrayLast[1] * 4 * qNote); + AddNoteMonoEvent(track, tonic, octaveEnd, 0, rhythmsArrayLast[1] * 4 * qNote); //console.log(track.LogText()); return track; } diff --git a/js/song_generator/counterpoint_4th_spec.js.map b/js/song_generator/counterpoint_4th_spec.js.map index 682ae00..8bb84d5 100644 --- a/js/song_generator/counterpoint_4th_spec.js.map +++ b/js/song_generator/counterpoint_4th_spec.js.map @@ -1 +1 @@ -{"version":3,"file":"counterpoint_4th_spec.js","sourceRoot":"","sources":["../../ts/song_generator/counterpoint_4th_spec.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"counterpoint_4th_spec.js","sourceRoot":"","sources":["../../ts/song_generator/counterpoint_4th_spec.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/js/song_generator/midiTrack.js b/js/song_generator/midiTrack.js index 4c0ce8e..83d802b 100644 --- a/js/song_generator/midiTrack.js +++ b/js/song_generator/midiTrack.js @@ -143,12 +143,12 @@ class MidiTrack { } } } -function AddNoteValueEvent(track, noteValue, start, duration) { +function AddNoteMonoValueEvent(track, noteValue, start, duration) { const note = GetNoteFromValue(noteValue); const octave = GetOctaveFromValue(noteValue); - AddNoteEvent(track, note, octave, start, duration); + AddNoteMonoEvent(track, note, octave, start, duration); } -function AddNoteEvent(track, note, octave, start, duration) { +function AddNoteMonoEvent(track, note, octave, start, duration) { const vel = 102; let noteValue = GetNoteValueFromNoteOctave(note, octave); let noteValueInt = ToNoteValueInt(noteValue); diff --git a/js/song_generator/midiTrack.js.map b/js/song_generator/midiTrack.js.map index 8fd9489..b08c4d8 100644 --- a/js/song_generator/midiTrack.js.map +++ b/js/song_generator/midiTrack.js.map @@ -1 +1 @@ -{"version":3,"file":"midiTrack.js","sourceRoot":"","sources":["../../ts/song_generator/midiTrack.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"midiTrack.js","sourceRoot":"","sources":["../../ts/song_generator/midiTrack.ts"],"names":[],"mappings":";AAAA,MAAM,SAAS;IAUX,YAAY,OAAe;QAEvB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,EAAkB,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,iBAAiB;QACxC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEzC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAEnB,yBAAyB;QACzB,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;QAE/B,uBAAuB;QACvB,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC;IAEM,QAAQ,CAAC,KAAqB;QAEjC,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI;YACnB,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,EAAkB,CAAC;QAE9C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;QACjC,IAAI,MAAM,IAAI,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAE5B;YACI,mCAAmC;YACnC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;SAC5C;IACL,CAAC;IAEM,MAAM;QAET,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM;YAC3B,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QAE7B,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,OAAO;QAGV,IAAI,UAAU,GAAG,IAAI,WAAW,EAAE,CAAC;QACnC,IAAI,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,kCAAkC;QAElC,IAAI,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAC9C,2CAA2C;QAC3C,oCAAoC;QAEpC,IAAI,UAAU,GAAG,IAAI,UAAU,CAAC,CAAE,GAAG,SAAS,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;QAEjE,gBAAgB;QAChB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAC/B;YACI,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;YACnC,UAAU,GAAG,IAAI,UAAU,CAAC,CAAE,GAAG,UAAU,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC;SAChE;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,GAAW,EAAE,SAAiB;QAEvC,MAAM,KAAK,GAAmB,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACzD,wCAAwC;QACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAED,8BAA8B;IACvB,WAAW,CAAC,MAAc,EAAE,eAAuB;QAEtD,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,EAC7B;YACI,IAAI,KAAK,CAAC,IAAI,IAAI,kBAAkB,CAAC,KAAK,EAC1C;gBACI,IAAI,UAAU,IAAI,eAAe,EACjC;oBACI,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;oBAClC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,gBAAgB;oBACpE,qBAAqB;oBACrB,2BAA2B;oBAE3B,MAAM;iBACT;gBAED,UAAU,EAAE,CAAC;aAChB;YAED,KAAK,EAAE,CAAC;SACX;IACL,CAAC;IAEM,aAAa,CAAC,SAAiB,EAAE,WAAmB,EAAE,SAAiB;QAE1E,MAAM,KAAK,GAAmB,kBAAkB,CAAC,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QACpF,wCAAwC;QACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAEM,MAAM,CAAC,IAAY,EAAE,SAAiB,EAAE,QAAgB;QAE3D,MAAM,KAAK,GAAmB,gBAAgB,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC5F,wCAAwC;QACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAEM,OAAO,CAAC,IAAY,EAAE,SAAiB;QAE1C,MAAM,KAAK,GAAmB,iBAAiB,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QACnF,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAEM,SAAS,CAAC,KAAa,EAAE,SAAiB;QAE7C,MAAM,KAAK,GAAmB,cAAc,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACjF,wCAAwC;QACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAEM,wBAAwB,CAAC,WAAmB,CAAC;QAEhD,MAAM,KAAK,GAAmB,6BAA6B,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;QACxF,wCAAwC;QACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAEM,mBAAmB,CAAC,SAAiB,CAAC;QAEzC,MAAM,KAAK,GAAmB,wBAAwB,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;QACjF,wCAAwC;QACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAEM,iBAAiB,CAAC,WAAmB,CAAC;QAEzC,MAAM,KAAK,GAAmB,sBAAsB,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;QACjF,wCAAwC;QACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAEM,mBAAmB,CAAC,WAAmB,CAAC;QAE3C,MAAM,KAAK,GAAmB,wBAAwB,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;QACnF,wCAAwC;QACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAEM,UAAU;QAEb,sBAAsB;QACtB,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM;YAC3B,IAAI,KAAK,CAAC,IAAI,IAAI,kBAAkB,CAAC,OAAO;gBACxC,OAAO,EAAE,CAAC;QAElB,wBAAwB;QACxB,OAAO,OAAO,CAAC;IACnB,CAAC;IAGM,YAAY,CAAC,KAAa;QAE7B,iCAAiC;QACjC,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM;YAC3B,IAAI,KAAK,CAAC,IAAI,IAAI,kBAAkB,CAAC,OAAO,EAC5C;gBACI,IAAI,QAAQ,IAAI,KAAK;oBACjB,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAEzB,QAAQ,EAAE,CAAC;aACd;QAEL,wBAAwB;QACxB,OAAO,CAAC,CAAC,CAAC;IACd,CAAC;IAEM,gBAAgB,CAAC,eAAuB,CAAC;QAE5C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,GAAG,YAAY,GAAG,CAAC,CAAC;QAEvD,0BAA0B;QAC1B,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,EAC7B;YACI,IAAI,KAAK,CAAC,IAAI,IAAI,kBAAkB,CAAC,UAAU,EAC/C;gBACI,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;gBAClC,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;gBAC/D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC;aAE9B;YACD,KAAK,EAAE,CAAC;SACX;IACL,CAAC;CACJ;AAED,SAAS,qBAAqB,CAAC,KAAiB,EAAE,SAAiB,EAAE,KAAa,EAAE,QAAgB;IAEhG,MAAM,IAAI,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAE7C,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAiB,EAAE,IAAY,EAAE,MAAc,EAAE,KAAa,EAAE,QAAgB;IAEtG,MAAM,GAAG,GAAG,GAAG,CAAC;IAChB,IAAI,SAAS,GAAG,0BAA0B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACzD,IAAI,YAAY,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IAE7C,iCAAiC;IACjC,IAAI,KAAK,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,YAAY,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;IAClC,IAAI,YAAY;QACZ,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAE9B,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IACvC,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAEtC,IAAI,YAAY;QACZ,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS;AAET,SAAS,mBAAmB,CAAC,KAAiB,EAAE,WAA0B,EAAE,KAAa,EAAE,KAAa,EAAE,QAAgB;IAEtH,MAAM,GAAG,GAAG,GAAG,CAAC;IAEhB,iCAAiC;IACjC,MAAM,YAAY,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;IAClC,IAAI,YAAY;QACZ,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAE9B,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,SAAS,IAAI,WAAW,EACnC;QACI,MAAM,SAAS,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;QACxD,KAAK,EAAE,CAAC;KACX;IAED,KAAK,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,SAAS,IAAI,WAAW,EACnC;QACI,MAAM,YAAY,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACjD,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC,CAAC;QACvD,KAAK,EAAE,CAAC;KACX;IAED,IAAI,YAAY;QACZ,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAiB,EAAE,WAA0B,EAAE,KAAa,EAAE,KAAa;IAEtG,MAAM,GAAG,GAAG,GAAG,CAAC;IAEhB,iCAAiC;IACjC,MAAM,YAAY,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;IAClC,IAAI,YAAY;QACZ,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAE9B,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,SAAS,IAAI,WAAW,EACnC;QACI,MAAM,SAAS,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;QACxD,KAAK,EAAE,CAAC;KACX;AACL,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAiB,EAAE,WAA0B,EAAE,KAAa,EAAE,QAAgB;IAE1G,MAAM,GAAG,GAAG,GAAG,CAAC;IAEhB,iCAAiC;IACjC,MAAM,YAAY,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;IAElC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,SAAS,IAAI,WAAW,EACnC;QACI,MAAM,YAAY,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACjD,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC,CAAC;QACvD,KAAK,EAAE,CAAC;KACX;IAED,IAAI,YAAY;QACZ,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9B,CAAC"} \ No newline at end of file diff --git a/js/song_generator/sequence.js b/js/song_generator/sequence.js index ecb2495..c5f93db 100644 --- a/js/song_generator/sequence.js +++ b/js/song_generator/sequence.js @@ -31,7 +31,7 @@ function generateSequenceTrackCandidate(tonic, scaleValues, nbBars, nbNotesPerBa const duration = 4 * qNote / nbNotesPerBar; // 1st note appears? if (noteAppears(freq)) - AddNoteEvent(track, tonic + startInterval, octave, 0, 4 * qNote / nbNotesPerBar); + AddNoteMonoEvent(track, tonic + startInterval, octave, 0, 4 * qNote / nbNotesPerBar); else startPosition += duration; // generate random notes in scale @@ -62,7 +62,7 @@ function generateSequenceTrackCandidate(tonic, scaleValues, nbBars, nbNotesPerBa // break; } // ok, add note - AddNoteValueEvent(track, noteNextValue, startPosition, duration); + AddNoteMonoValueEvent(track, noteNextValue, startPosition, duration); startPosition = 0; noteCurIndex = noteNextIndex; } diff --git a/js/song_generator/sequence.js.map b/js/song_generator/sequence.js.map index 020e3c4..96700fe 100644 --- a/js/song_generator/sequence.js.map +++ b/js/song_generator/sequence.js.map @@ -1 +1 @@ -{"version":3,"file":"sequence.js","sourceRoot":"","sources":["../../ts/song_generator/sequence.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"sequence.js","sourceRoot":"","sources":["../../ts/song_generator/sequence.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/ts/song_generator/chord_progression.ts b/ts/song_generator/chord_progression.ts index 7314b59..bb3067d 100644 --- a/ts/song_generator/chord_progression.ts +++ b/ts/song_generator/chord_progression.ts @@ -103,7 +103,7 @@ function addChordAsArpeggios(track: MidiTrack, chordValues: Array, start for (let indexNote = 0; indexNote < nbNotesPerBar; indexNote++) { const noteValue = chordValues[indexNote % nbNotesInChord]; - AddNoteValueEvent(track, noteValue, startPosition, duration); + AddNoteMonoValueEvent(track, noteValue, startPosition, duration); } } @@ -148,7 +148,7 @@ function generateChordsProgBassTrackCandidate(tonic: number, scaleValues: Array< // 1st note appears? //if (noteAppears(freq)) - AddNoteEvent(track, tonic + startInterval, octave, 0, 4*qNote/nbNotesPerBar); + AddNoteMonoEvent(track, tonic + startInterval, octave, 0, 4*qNote/nbNotesPerBar); //else // startPosition += duration; @@ -187,7 +187,7 @@ function generateChordsProgBassTrackCandidate(tonic: number, scaleValues: Array< } // ok, add note doubled at inferior octave - AddNoteValueEvent(track, noteNextValue, startPosition, duration); + AddNoteMonoValueEvent(track, noteNextValue, startPosition, duration); startPosition = 0; noteCurIndex = noteNextIndex; } diff --git a/ts/song_generator/counterpoint_1_1.ts b/ts/song_generator/counterpoint_1_1.ts index 7926abf..b70eb8d 100644 --- a/ts/song_generator/counterpoint_1_1.ts +++ b/ts/song_generator/counterpoint_1_1.ts @@ -63,7 +63,7 @@ function generateCounterpointTrack11Candidate(tonic: number, scaleValues: Array< } const startInterval = getRandomArrayElement(startIntervals); - AddNoteEvent(track, tonic + startInterval, octave, 0, 4*qNote); + AddNoteMonoEvent(track, tonic + startInterval, octave, 0, 4*qNote); // generate random notes in scale const nbTries = 10000; @@ -92,7 +92,7 @@ function generateCounterpointTrack11Candidate(tonic: number, scaleValues: Array< } // ok, add note - AddNoteValueEvent(track, noteNextValue, 0, 4*qNote); + AddNoteMonoValueEvent(track, noteNextValue, 0, 4*qNote); noteCurIndex = noteNextIndex; } @@ -111,7 +111,7 @@ function generateCounterpointTrack11Candidate(tonic: number, scaleValues: Array< } } - AddNoteEvent(track, tonic, octaveEnd, 0, 4*qNote); + AddNoteMonoEvent(track, tonic, octaveEnd, 0, 4*qNote); //console.log(track.LogText()); return track; diff --git a/ts/song_generator/counterpoint_2_1.ts b/ts/song_generator/counterpoint_2_1.ts index 701187b..99e9b2c 100644 --- a/ts/song_generator/counterpoint_2_1.ts +++ b/ts/song_generator/counterpoint_2_1.ts @@ -66,7 +66,7 @@ function generateCounterpointTrack21Candidate(tonic: number, scaleValues: Array< if (index1 == 0 && hasTrackCF) { // no 1st note - AddNoteEvent(track21, note1, octave1, rhythmsFactor1*duration, (1 - rhythmsFactor1)*duration); + AddNoteMonoEvent(track21, note1, octave1, rhythmsFactor1*duration, (1 - rhythmsFactor1)*duration); } // last bar: replace 1st note by consonnant interval and set tonic as 2nd note else if (index1 == track11NbNotes - 1) @@ -90,15 +90,15 @@ function generateCounterpointTrack21Candidate(tonic: number, scaleValues: Array< note1ValueNew = GetRandomNoteValueInScale(note2PrevIndex - 1, note1Index + 1, scaleNotesValues); } - AddNoteValueEvent(track21, note1ValueNew, 0, rhythmsFactor1*duration); + AddNoteMonoValueEvent(track21, note1ValueNew, 0, rhythmsFactor1*duration); // set tonic as 2nd note - AddNoteEvent(track21, note1, octave1, 0, (1 - rhythmsFactor1)*duration); + AddNoteMonoEvent(track21, note1, octave1, 0, (1 - rhythmsFactor1)*duration); } else { // keep existing note as 1st bar note - AddNoteEvent(track21, note1, octave1, 0, rhythmsFactor1*duration); + AddNoteMonoEvent(track21, note1, octave1, 0, rhythmsFactor1*duration); // create new 2nd note let note2ValueNew = -1; @@ -110,7 +110,7 @@ function generateCounterpointTrack21Candidate(tonic: number, scaleValues: Array< break; } - AddNoteValueEvent(track21, note2ValueNew, 0, (1 - rhythmsFactor1)*duration); + AddNoteMonoValueEvent(track21, note2ValueNew, 0, (1 - rhythmsFactor1)*duration); } index1++; @@ -292,7 +292,7 @@ function ReduceTrack21(track21: MidiTrack, channelId: number): MidiTrack } const noteValue = track21.GetNoteValue(noteIndex); - AddNoteValueEvent(track11, noteValue, 0, 4*qNote) + AddNoteMonoValueEvent(track11, noteValue, 0, 4*qNote) noteIndex++; } diff --git a/ts/song_generator/counterpoint_3_1.ts b/ts/song_generator/counterpoint_3_1.ts index cdf98d9..293fb79 100644 --- a/ts/song_generator/counterpoint_3_1.ts +++ b/ts/song_generator/counterpoint_3_1.ts @@ -65,7 +65,7 @@ function generateCounterpointTrack31Candidate(tonic: number, scaleValues: Array< if (index1 == 0 && hasTrackCF) { // no 1st note - AddNoteEvent(track31, note1, octave1, (1 - rhythmsArray[2])*duration, rhythmsArray[2]*duration); + AddNoteMonoEvent(track31, note1, octave1, (1 - rhythmsArray[2])*duration, rhythmsArray[2]*duration); } // last bar: replace 1st note by consonnant interval and set tonic as 2nd note else if (index1 == track11NbNotes - 1) @@ -89,15 +89,15 @@ function generateCounterpointTrack31Candidate(tonic: number, scaleValues: Array< note1ValueNew = GetRandomNoteValueInScale(note3PrevIndex - 1, note1Index + 1, scaleNotesValues); } - AddNoteValueEvent(track31, note1ValueNew, 0, rhythmsArray[0]*duration); + AddNoteMonoValueEvent(track31, note1ValueNew, 0, rhythmsArray[0]*duration); // set tonic as 2nd note - AddNoteEvent(track31, note1, octave1, 0, rhythmsArray[1]*duration); + AddNoteMonoEvent(track31, note1, octave1, 0, rhythmsArray[1]*duration); } else { // keep existing note as 1st bar note - AddNoteEvent(track31, note1, octave1, 0, rhythmsArray[0]*duration); + AddNoteMonoEvent(track31, note1, octave1, 0, rhythmsArray[0]*duration); // create new 2nd note in bar let note32ValueNew = -1; @@ -108,7 +108,7 @@ function generateCounterpointTrack31Candidate(tonic: number, scaleValues: Array< if (acceptNoteInCounterpoint31(note32ValueNew, tonic, index1, nbBars, track31, track11, trackCF)) break; } - AddNoteValueEvent(track31, note32ValueNew, 0, rhythmsArray[1]*duration); + AddNoteMonoValueEvent(track31, note32ValueNew, 0, rhythmsArray[1]*duration); // create new 3rd note in bat let note33ValueNew = -1; @@ -119,7 +119,7 @@ function generateCounterpointTrack31Candidate(tonic: number, scaleValues: Array< break; } - AddNoteValueEvent(track31, note33ValueNew, 0, rhythmsArray[2]*duration); + AddNoteMonoValueEvent(track31, note33ValueNew, 0, rhythmsArray[2]*duration); } index1++; @@ -351,7 +351,7 @@ function ReduceTrack31(track31: MidiTrack, channelId: number): MidiTrack } const noteValue = track31.GetNoteValue(noteIndex); - AddNoteValueEvent(track11, noteValue, 0, 4*qNote) + AddNoteMonoValueEvent(track11, noteValue, 0, 4*qNote) noteIndex++; } diff --git a/ts/song_generator/counterpoint_4_1.ts b/ts/song_generator/counterpoint_4_1.ts index 27233ba..0c93701 100644 --- a/ts/song_generator/counterpoint_4_1.ts +++ b/ts/song_generator/counterpoint_4_1.ts @@ -66,7 +66,7 @@ function generateCounterpointTrack41Candidate(tonic: number, scaleValues: Array< if (index21 == 0 && hasTrackCF) { // 1st note on 4th beat - AddNoteValueEvent(track41, note21Value, 3*qNote, qNote); + AddNoteMonoValueEvent(track41, note21Value, 3*qNote, qNote); //// 1st notes: 3rd and 4th beats //AddNoteValueEvent(track41, note21Value, 2*qNote, qNote); @@ -90,8 +90,8 @@ function generateCounterpointTrack41Candidate(tonic: number, scaleValues: Array< } const note21PosInBar = ((index21 + 1) % 2); - AddNoteValueEvent(track41, note21Value, 0, rhythmsArray[2*note21PosInBar]*2*duration); - AddNoteValueEvent(track41, note4ValueNew, 0, rhythmsArray[2*note21PosInBar + 1]*2*duration); + AddNoteMonoValueEvent(track41, note21Value, 0, rhythmsArray[2*note21PosInBar]*2*duration); + AddNoteMonoValueEvent(track41, note4ValueNew, 0, rhythmsArray[2*note21PosInBar + 1]*2*duration); } index21++; @@ -273,7 +273,7 @@ function ReduceTrack41(track41: MidiTrack, channelId: number): MidiTrack } const noteValue = track41.GetNoteValue(noteIndex); - AddNoteValueEvent(track11, noteValue, 0, 4*qNote) + AddNoteMonoValueEvent(track11, noteValue, 0, 4*qNote) noteIndex++; } diff --git a/ts/song_generator/counterpoint_4th_spec.ts b/ts/song_generator/counterpoint_4th_spec.ts index 1f883a0..22bb4cf 100644 --- a/ts/song_generator/counterpoint_4th_spec.ts +++ b/ts/song_generator/counterpoint_4th_spec.ts @@ -66,7 +66,7 @@ function generateCounterpointTrack4SCandidate(tonic: number, scaleValues: Array< // set rhythm in 1st and 2nd bars const rhythmsArray0 = rhythmFactorArray[0]; const rhythmsArray1 = rhythmFactorArray[1 % nbRhythms]; - AddNoteEvent(track, tonic + startInterval, octave, rhythmsArray0[0]*4*qNote, + AddNoteMonoEvent(track, tonic + startInterval, octave, rhythmsArray0[0]*4*qNote, (rhythmsArray0[1] + rhythmsArray1[0])*4*qNote); // generate random notes in scale @@ -100,7 +100,7 @@ function generateCounterpointTrack4SCandidate(tonic: number, scaleValues: Array< } // ok, add note - AddNoteValueEvent(track, noteNextValue, 0, (rhythmsArrayCur[1] + rhythmsArrayNext[0])*4*qNote); + AddNoteMonoValueEvent(track, noteNextValue, 0, (rhythmsArrayCur[1] + rhythmsArrayNext[0])*4*qNote); noteCurIndex = noteNextIndex; } @@ -120,7 +120,7 @@ function generateCounterpointTrack4SCandidate(tonic: number, scaleValues: Array< } const rhythmsArrayLast = rhythmFactorArray[(nbBars - 1) % nbRhythms]; - AddNoteEvent(track, tonic, octaveEnd, 0, rhythmsArrayLast[1]*4*qNote); + AddNoteMonoEvent(track, tonic, octaveEnd, 0, rhythmsArrayLast[1]*4*qNote); //console.log(track.LogText()); return track; diff --git a/ts/song_generator/midiTrack.ts b/ts/song_generator/midiTrack.ts index 4c8d164..d87dcf4 100644 --- a/ts/song_generator/midiTrack.ts +++ b/ts/song_generator/midiTrack.ts @@ -212,15 +212,15 @@ class MidiTrack } } -function AddNoteValueEvent(track : MidiTrack, noteValue: number, start: number, duration: number) +function AddNoteMonoValueEvent(track : MidiTrack, noteValue: number, start: number, duration: number) { const note = GetNoteFromValue(noteValue); const octave = GetOctaveFromValue(noteValue); - AddNoteEvent(track, note, octave, start, duration); + AddNoteMonoEvent(track, note, octave, start, duration); } -function AddNoteEvent(track : MidiTrack, note: number, octave: number, start: number, duration: number) +function AddNoteMonoEvent(track : MidiTrack, note: number, octave: number, start: number, duration: number) { const vel = 102; let noteValue = GetNoteValueFromNoteOctave(note, octave); diff --git a/ts/song_generator/sequence.ts b/ts/song_generator/sequence.ts index d6683b9..f0ff791 100644 --- a/ts/song_generator/sequence.ts +++ b/ts/song_generator/sequence.ts @@ -44,7 +44,7 @@ function generateSequenceTrackCandidate(tonic: number, scaleValues: Array