1st version of bass + melody song type in song generator

Modrigue · Jan 8, 2024 · dd031be · dd031be
1 parent 9c62ac2
commit dd031be
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 10 deletions.
diff --git a/js/gui/interface.js b/js/gui/interface.js
diff --git a/js/gui/interface.js.map b/js/gui/interface.js.map
diff --git a/js/gui/strings.js b/js/gui/strings.js
diff --git a/js/gui/strings.js.map b/js/gui/strings.js.map
diff --git a/js/song_generator/song_generator.js b/js/song_generator/song_generator.js
diff --git a/js/song_generator/song_generator.js.map b/js/song_generator/song_generator.js.map
diff --git a/ts/gui/interface.ts b/ts/gui/interface.ts
@@ -229,11 +229,12 @@ function updateSelectors(resetScaleExplorer = false, resetScaleFinder = false, r
     //(<HTMLSelectElement>document.getElementById(`song_generator_type`)).selectedIndex = 3;
     updateNoteSelector(`song_generator_tonic`, 0, false);
     const selectedTypeId = getSelectedSongType('song_generator_type');
+    const isBassMelody = (selectedTypeId == "bass+melody");
     const isArpeggiosProg = (selectedTypeId == "arpeggios_progression");
     const isSequence = (selectedTypeId == "sequence");
     const isCounterpoint = selectedTypeId.startsWith("counterpoint");
-    updateScaleSelector(`song_generator_scale`, "7major_nat,1", true, (isSequence || isArpeggiosProg || isCounterpoint),
-        (isSequence || isArpeggiosProg), resetSongGeneration);
+    updateScaleSelector(`song_generator_scale`, "7major_nat,1", true, (isSequence || isArpeggiosProg || isBassMelody || isCounterpoint),
+        (isSequence || isBassMelody || isArpeggiosProg), resetSongGeneration);
 
     if (resetSongGeneration)
         resetGeneratedSong();

diff --git a/ts/gui/strings.ts b/ts/gui/strings.ts
@@ -6,6 +6,7 @@ stringsDict_int.set("arpeggios_progression", "Arpeggios progression");
 stringsDict_int.set("audio_not_supported", "⚠ Audio features may not work with your browser ⚠\nYou can use either Chrome, Edge or Brave to enable audio on the website");
 stringsDict_int.set("bass", "Bass");
 stringsDict_int.set("bass_chord_explorer", "Bass:");
+stringsDict_int.set("bass+melody", "Bass + melody");
 stringsDict_int.set("chord", "Chord");
 stringsDict_int.set("chord_explorer_nb_strings_max_text", "strings played");
 stringsDict_int.set("chord_neapolitan", "Neapolitan chord:");
@@ -98,6 +99,7 @@ stringsDict_fr.set("arpeggios_progression", "Progression d'arpèges");
 stringsDict_fr.set("audio_not_supported", "⚠ Les fonctionnalités audio pourraient ne pas marcher votre navigateur web ⚠\nVous pouvez utiliser  Chrome, Edge ou Brave pour activer l'audio sur le site");
 stringsDict_fr.set("bass", "Basse");
 stringsDict_fr.set("bass_chord_explorer", "Basse :");
+stringsDict_fr.set("bass+melody", "Basse + mélodie");
 stringsDict_fr.set("chord", "Accord");
 stringsDict_fr.set("chord_explorer_nb_strings_max_text", "cordes jouées");
 stringsDict_fr.set("chord_neapolitan", "Accord napolitain :");

diff --git a/ts/song_generator/song_generator.ts b/ts/song_generator/song_generator.ts
@@ -1,5 +1,6 @@
 const generatedSongTypes: Map<string, string> = new Map<string, string>();
 generatedSongTypes.set("chords+melody"            , "chords+melody");
+generatedSongTypes.set("bass+melody"            , "bass+melody");
 generatedSongTypes.set("chords_progression"       , "chords_progression");
 generatedSongTypes.set("arpeggios_progression"    , "arpeggios_progression");
 generatedSongTypes.set("sequence"                 , "sequence");
@@ -148,6 +149,13 @@ function generateNewTrack(trackIndex: number = 0 /* offset 1, 0 = all tracks */)
                 trackCandidate = GenerateChordsProgTrack(tonic, scaleValues, nbBars, 1, octaves[trackIndex - 1], frequencies[trackIndex - 1], qNote, trackIndex);
             break;
 
+        case "bass+melody":
+            if (trackIndex == 1)
+                trackCandidate = GenerateMelodyTrack(tonic, scaleValues, nbBars, nbNotesPerBar, octaves[trackIndex - 1], frequencies[trackIndex - 1], qNote, trackIndex);
+            else
+                trackCandidate = GenerateChordsProgBassTrack(tonic, scaleValues, nbBars, 1, octaves[trackIndex - 1], frequencies[trackIndex - 1], qNote, trackIndex);
+            break;
+
         case "chords_progression":
             if (trackIndex == 1)
                 trackCandidate = GenerateChordsProgTrack(tonic, scaleValues, nbBars, 1, octaves[trackIndex - 1], frequencies[trackIndex - 1], qNote, trackIndex);
@@ -329,13 +337,14 @@ function updateSongGeneratorPage(): void
     {
         const isCounterpoint = selectedTypeId.startsWith("counterpoint");
         const isChordsMelody = (selectedTypeId == "chords+melody");
+        const isBassMelody = (selectedTypeId == "bass+melody");
         const isChordsProg = (selectedTypeId == "chords_progression");
         const isArpeggiosProg = (selectedTypeId == "arpeggios_progression");
         const isSequence = (selectedTypeId == "sequence");
 
-        setEnabled("song_generator_nb_notes_per_bar", (isSequence || isChordsMelody || isArpeggiosProg));
+        setEnabled("song_generator_nb_notes_per_bar", (isSequence || isChordsMelody || isBassMelody || isArpeggiosProg));
         setEnabled("song_generator_generate_track2", !regexCounterpoint4_5S.test(selectedTypeId));
-        setEnabled(`song_generator_freq_track1`, (isSequence || isChordsMelody));
+        setEnabled(`song_generator_freq_track1`, (isSequence || isChordsMelody || isBassMelody));
         setEnabled(`song_generator_freq_track2`, isSequence);
 
         // update track texts
@@ -347,6 +356,11 @@ function updateSongGeneratorPage(): void
             track1Text.innerText = getString("melody");
             track2Text.innerText = getString("chords");
         }
+        else if (isBassMelody)
+        {
+            track1Text.innerText = getString("melody");
+            track2Text.innerText = getString("bass");
+        }
         else if (isChordsProg)
         {
             track1Text.innerText = getString("chords");