diff --git a/docs/assets/bass/acoustic-guitar_75_25600.bass b/docs/assets/bass/acoustic-guitar_75_25600.bass new file mode 100644 index 0000000..d260f78 Binary files /dev/null and b/docs/assets/bass/acoustic-guitar_75_25600.bass differ diff --git a/docs/assets/bass/bluey_88_21818.bass b/docs/assets/bass/bluey_88_21818.bass new file mode 100644 index 0000000..126e841 Binary files /dev/null and b/docs/assets/bass/bluey_88_21818.bass differ diff --git a/docs/assets/bass/country-rock_180_10667.bass b/docs/assets/bass/country-rock_180_10667.bass new file mode 100644 index 0000000..38cc46e Binary files /dev/null and b/docs/assets/bass/country-rock_180_10667.bass differ diff --git a/docs/assets/bass/country_073_26300.bass b/docs/assets/bass/country_073_26300.bass new file mode 100644 index 0000000..a4e1dd3 Binary files /dev/null and b/docs/assets/bass/country_073_26300.bass differ diff --git a/docs/assets/bass/dream_85_22588.bass b/docs/assets/bass/dream_85_22588.bass new file mode 100644 index 0000000..82f1c53 Binary files /dev/null and b/docs/assets/bass/dream_85_22588.bass differ diff --git a/docs/assets/bass/funk_130_14769.bass b/docs/assets/bass/funk_130_14769.bass new file mode 100644 index 0000000..efdae91 Binary files /dev/null and b/docs/assets/bass/funk_130_14769.bass differ diff --git a/docs/assets/bass/gospel-funk_90_21333.bass b/docs/assets/bass/gospel-funk_90_21333.bass new file mode 100644 index 0000000..f6a5ca8 Binary files /dev/null and b/docs/assets/bass/gospel-funk_90_21333.bass differ diff --git a/docs/assets/bass/jazzy-funk_110_17455.bass b/docs/assets/bass/jazzy-funk_110_17455.bass new file mode 100644 index 0000000..c4810d7 Binary files /dev/null and b/docs/assets/bass/jazzy-funk_110_17455.bass differ diff --git a/docs/assets/bass/pop_100_19200.bass b/docs/assets/bass/pop_100_19200.bass deleted file mode 100644 index eae6f15..0000000 Binary files a/docs/assets/bass/pop_100_19200.bass and /dev/null differ diff --git a/docs/assets/bass/pop_100_19200_2.bass b/docs/assets/bass/pop_100_19200_2.bass new file mode 100644 index 0000000..db609d3 Binary files /dev/null and b/docs/assets/bass/pop_100_19200_2.bass differ diff --git a/docs/assets/bass/pop_90_10667.bass b/docs/assets/bass/pop_90_10667.bass new file mode 100644 index 0000000..d7b61c4 Binary files /dev/null and b/docs/assets/bass/pop_90_10667.bass differ diff --git a/docs/assets/bass/rock-ballad_80_24000.bass b/docs/assets/bass/rock-ballad_80_24000.bass new file mode 100644 index 0000000..4a750d1 Binary files /dev/null and b/docs/assets/bass/rock-ballad_80_24000.bass differ diff --git a/docs/assets/bass/soul-band_90_21333.bass b/docs/assets/bass/soul-band_90_21333.bass new file mode 100644 index 0000000..c622a62 Binary files /dev/null and b/docs/assets/bass/soul-band_90_21333.bass differ diff --git a/docs/assets/bass/u2-guitar_105_18286.bass b/docs/assets/bass/u2-guitar_105_18286.bass new file mode 100644 index 0000000..3d7bb5c Binary files /dev/null and b/docs/assets/bass/u2-guitar_105_18286.bass differ diff --git a/docs/assets/chords/country-rock_180_10667.bass b/docs/assets/chords/country-rock_180_10667.bass new file mode 100644 index 0000000..38cc46e Binary files /dev/null and b/docs/assets/chords/country-rock_180_10667.bass differ diff --git a/docs/assets/pedalboard.js b/docs/assets/pedalboard.js index 52a6269..0efac9b 100644 --- a/docs/assets/pedalboard.js +++ b/docs/assets/pedalboard.js @@ -82,18 +82,52 @@ window.setupPedalBoard = async function(guitarContext, guitarName, deviceId, use }) .catch(e => onError('Failed to load reverb impulse')); - $pedalboard.innerHTML = ""; + $pedalboard.innerHTML = ` + + Wah Wah + Compressor + Overdrive + Boost + Harmonic Tremolo + Chorus + Delay + Multi Head Delay + Tremolo + Reverb + + + + + + + + + + + + + + + + + + + + + + + `; const pedals = [ - //wahPedal, + wahPedal, compressorPedal, - //overdrivePedal, - //boostPedal, - //harmonicTremoloPedal, + overdrivePedal, + boostPedal, + harmonicTremoloPedal, chorusPedal, delayPedal, - //multiHeadDelay, - //tremoloPedal, + multiHeadDelay, + tremoloPedal, reverbPedal ]; diff --git a/docs/assets/src/pedals/boost.js b/docs/assets/src/pedals/boost.js index 086b6ab..09b6d5e 100644 --- a/docs/assets/src/pedals/boost.js +++ b/docs/assets/src/pedals/boost.js @@ -38,7 +38,7 @@ export const boostPedal = function(input, index) { value: defaults.gain }); - $pedalboard.appendChild(pedal); + document.querySelector('#boostPanel').appendChild(pedal); return output; }; \ No newline at end of file diff --git a/docs/assets/src/pedals/chorus.js b/docs/assets/src/pedals/chorus.js index b7ba309..a9fb3ce 100644 --- a/docs/assets/src/pedals/chorus.js +++ b/docs/assets/src/pedals/chorus.js @@ -86,7 +86,7 @@ export const chorusPedal = function(input, index) { } }); - $pedalboard.appendChild(pedal); + document.querySelector('#chorusPanel').appendChild(pedal); return output; }; diff --git a/docs/assets/src/pedals/compressor.js b/docs/assets/src/pedals/compressor.js index fd689a7..df4b9fe 100644 --- a/docs/assets/src/pedals/compressor.js +++ b/docs/assets/src/pedals/compressor.js @@ -78,7 +78,7 @@ export const compressorPedal = function(input, index) { onInput: updatePot(compressor.release) }); - $pedalboard.appendChild(pedal); + document.querySelector('#compressorPanel').appendChild(pedal); return output; }; \ No newline at end of file diff --git a/docs/assets/src/pedals/delay.js b/docs/assets/src/pedals/delay.js index 3de948f..ab7ef41 100644 --- a/docs/assets/src/pedals/delay.js +++ b/docs/assets/src/pedals/delay.js @@ -83,7 +83,7 @@ export const delayPedal = function(input, index) { value: defaults.tone }); - $pedalboard.appendChild(pedal); + document.querySelector('#delayPanel').appendChild(pedal); return output; }; \ No newline at end of file diff --git a/docs/assets/src/pedals/harmonic-tremolo.js b/docs/assets/src/pedals/harmonic-tremolo.js index 06ff050..b339c41 100644 --- a/docs/assets/src/pedals/harmonic-tremolo.js +++ b/docs/assets/src/pedals/harmonic-tremolo.js @@ -96,7 +96,7 @@ export const harmonicTremoloPedal = function(input, index) { } }) - $pedalboard.appendChild(pedal); + document.querySelector('#htPanel').appendChild(pedal); return output; }; \ No newline at end of file diff --git a/docs/assets/src/pedals/multihead-delay.js b/docs/assets/src/pedals/multihead-delay.js index aae6386..2b246cb 100644 --- a/docs/assets/src/pedals/multihead-delay.js +++ b/docs/assets/src/pedals/multihead-delay.js @@ -219,7 +219,7 @@ export const multiHeadDelay = function(input, index) { createDelayHead(fxSend, fxReturn, 0.5, 0.97561, 0.1); createDelayHead(fxSend, fxReturn, -0.5, 0.4878, 0.1); - $pedalboard.appendChild(pedal); + document.querySelector('#mhdPanel').appendChild(pedal); return output; }; diff --git a/docs/assets/src/pedals/overdrive.js b/docs/assets/src/pedals/overdrive.js index 0f56271..ff4a71e 100644 --- a/docs/assets/src/pedals/overdrive.js +++ b/docs/assets/src/pedals/overdrive.js @@ -70,7 +70,7 @@ export const overdrivePedal = function(input, index) { onInput: updatePot(volume.gain) }); - $pedalboard.appendChild(pedal); + document.querySelector('#overdrivePanel').appendChild(pedal); return output; }; \ No newline at end of file diff --git a/docs/assets/src/pedals/reverb.js b/docs/assets/src/pedals/reverb.js index 09af063..da11f66 100644 --- a/docs/assets/src/pedals/reverb.js +++ b/docs/assets/src/pedals/reverb.js @@ -67,7 +67,7 @@ export const reverbPedal = function(input, index) { value: defaults.tone }); - $pedalboard.appendChild(pedal); + document.querySelector('#reverbPanel').appendChild(pedal); return output; }; \ No newline at end of file diff --git a/docs/assets/src/pedals/tremolo.js b/docs/assets/src/pedals/tremolo.js index 3c3b3a8..c99c4e7 100644 --- a/docs/assets/src/pedals/tremolo.js +++ b/docs/assets/src/pedals/tremolo.js @@ -75,7 +75,7 @@ export const tremoloPedal = function(input, index) { ] }); - $pedalboard.appendChild(pedal); + document.querySelector('#tremoloPanel').appendChild(pedal); return output; }; \ No newline at end of file diff --git a/docs/assets/src/pedals/wah.js b/docs/assets/src/pedals/wah.js index 9afd191..fae822b 100644 --- a/docs/assets/src/pedals/wah.js +++ b/docs/assets/src/pedals/wah.js @@ -78,7 +78,7 @@ export const wahPedal = function(input, index) { value: defaults.boost }); - $pedalboard.appendChild(pedal); + document.querySelector('#wahPanel').appendChild(pedal); return output; }; \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index a52a133..178bed1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -19,19 +19,19 @@

- On - Normal - Color Tabs - Load - - - - Pedal Board - ChordPro - Lyrics - Save - - Refresh + On + Normal + Color Tabs + Load + + + + Pedal Board + ChordPro + Lyrics + Save + + Refresh
Tempo:100 @@ -49,7 +49,9 @@ - + @@ -58,8 +60,9 @@ + - + diff --git a/docs/js/main.js b/docs/js/main.js index d8b5129..d31a035 100644 --- a/docs/js/main.js +++ b/docs/js/main.js @@ -285,7 +285,7 @@ function messageHandler(evt) { } function handleLiberLive(selected) { - const liberlive = document.querySelector(".liber_live"); + const liberlive = document.querySelector("#liber_live"); liberlive.style.display = selected ? "" : "none"; let device; @@ -301,7 +301,7 @@ function handleLiberLive(selected) { } function handleRecordSong(selected) { - const recordSong = document.querySelector(".record_song"); + const recordSong = document.querySelector("#record_song"); recordSong.style.display = selected ? "" : "none"; recordSong.addEventListener("click", async (evt) => { @@ -945,16 +945,16 @@ function onChordaConnect() { // Set up event listener for when characteristic value changes. characteristic.addEventListener('characteristicvaluechanged', handleChordaMidiMessage); console.debug('Bluetooth MIDI Notifications have been started.') - document.querySelector(".chorda_bluetooth").innerHTML = "BT ON"; + document.querySelector("#chorda_bluetooth").innerHTML = "BT ON"; }) .catch(error => { console.error('ERRORCODE: ' + error); - document.querySelector(".chorda_bluetooth").innerHTML = "BT Error"; + document.querySelector("#chorda_bluetooth").innerHTML = "BT Error"; }); } function onChordaDisconnected(event) { - document.querySelector(".chorda_bluetooth").innerHTML = "BT OFF"; + document.querySelector("#chorda_bluetooth").innerHTML = "BT OFF"; if (!bluetoothDevice || !bluetoothDevice.gatt.connected) return; bluetoothDevice.gatt.disconnect(); let device = event.target; @@ -992,9 +992,9 @@ function onloadHandler() { if (!!chrome.runtime?.getManifest) version = chrome.runtime.getManifest().version; document.title = "Orin Ayo | " + version; - playButton = document.querySelector(".play"); - gamePadModeButton = document.querySelector(".gamepad_mode"); - styleType = document.querySelector(".style_type"); + playButton = document.querySelector("#play"); + gamePadModeButton = document.querySelector("#gamepad_mode"); + styleType = document.querySelector("#style_type"); tempoCanvas = orinayo = document.querySelector('#tempoCanvas'); orinayo = document.querySelector('#orinayo'); orinayo_section = document.querySelector('#orinayo-section'); @@ -1069,7 +1069,7 @@ function onloadHandler() { handleFileContent(event); }); - const deleteStyle = document.querySelector(".delete_style"); + const deleteStyle = document.querySelector("#delete_style"); deleteStyle.addEventListener('click', function(event) { if (arrSequence?.name) { @@ -1085,7 +1085,7 @@ function onloadHandler() { const chordpro = document.querySelector("#chordpro"); const settings = document.querySelector("#settings"); - const pedalBoard = document.querySelector(".pedal_board"); + const pedalBoard = document.querySelector("#pedal_board"); pedalBoard.addEventListener('click', function(event) { board.style.display = "none"; @@ -1103,7 +1103,7 @@ function onloadHandler() { } }); - const chordPro = document.querySelector(".chord_pro"); + const chordPro = document.querySelector("#chord_pro"); chordPro.addEventListener('click', function(event) { board.style.display = "none"; @@ -1120,7 +1120,7 @@ function onloadHandler() { } }); - const showLyrics = document.querySelector(".show_lyrics"); + const showLyrics = document.querySelector("#show_lyrics"); const lyricsContext = lyricsCanvas.getContext('2d'); lyricsContext.fillStyle = "#000000"; lyricsContext.fillRect(0, 0, lyricsCanvas.width, lyricsCanvas.height); @@ -1143,13 +1143,13 @@ function onloadHandler() { }); - const chordaBluetooth = document.querySelector(".chorda_bluetooth"); + const chordaBluetooth = document.querySelector("#chorda_bluetooth"); chordaBluetooth.addEventListener('click', function(event) { onChordaConnect(event); }); - const saveReg = document.querySelector(".save_reg") + const saveReg = document.querySelector("#save_reg") saveReg.addEventListener('click', function(event) { const slot = prompt("Enter save slot number"); @@ -1159,14 +1159,14 @@ function onloadHandler() { } }); - resetApp = document.querySelector(".reset_app") + resetApp = document.querySelector("#reset_app") resetApp.addEventListener('click', function(event) { registration = 0; location.reload(); }); - loadFile = document.querySelector(".load_file") + loadFile = document.querySelector("#load_file") loadFile.addEventListener('click', function(event) { upload.click(); @@ -2702,7 +2702,7 @@ async function setupUI(config,err) { midiGuitar = window["_tone_" + guitarName]; player.loader.decodeAfterLoading(guitarContext, '_tone_' + guitarName); - padsMode = config.padsMode || 2; + padsMode = config.padsMode || 3; orinayo_pad.innerHTML = "Pad " + padsMode; } @@ -3245,7 +3245,7 @@ async function setupUI(config,err) { window.tempConfig = config; // store config for later access arrSynth = {name: config.sf2Name}; getArrSequence(config.arrName, arrSequenceLoaded); - document.querySelector(".delete_style").style.display = ""; + document.querySelector("#delete_style").style.display = ""; } else { @@ -4146,7 +4146,8 @@ function playChord(chord, root, type, bass) { const guitarPosition = document.getElementById("guitarPosition").selectedIndex; const guitarDuration = 240 / tempo; const bassNote = (chord.length == 4 ? chord[0] : chord[0] - 12); - const rootNote = (chord.length == 4 ? chord[0] + 12 : chord[0]) + (guitarPosition * 12); + const rootNote = (chord.length == 4 ? chord[0] : chord[0] - 12) + (guitarPosition * 12); + const firstNote = (chord.length == 4 ? chord[1] : chord[0]); const thirdNote = (chord.length == 4 ? chord[2] : chord[1]); const fifthNote = (chord.length == 4 ? chord[3] : chord[2]); @@ -4156,7 +4157,7 @@ function playChord(chord, root, type, bass) { if (!activeChord) { const arrChord = (firstChord.length == 4 ? firstChord[1] : firstChord[0]) % 12; const key = "key" + arrChord + "_" + arrChordType + "_" + SECTION_IDS[sectionChange]; - const bassKey = "key" + (chord[0] % 12) + "_" + arrChordType + "_" + SECTION_IDS[sectionChange]; + const bassKey = "key" + (firstNote % 12) + "_" + arrChordType + "_" + SECTION_IDS[sectionChange]; if (guitarName != "none" && !guitarDeviceId) { diff --git a/docs/js/styles.js b/docs/js/styles.js index 0d548ed..a42ac8e 100644 --- a/docs/js/styles.js +++ b/docs/js/styles.js @@ -308,10 +308,22 @@ var drum_loops = [ ] var bass_loops = [ + "assets/bass/acoustic-guitar_75_25600.bass", + "assets/bass/bluey_88_21818.bass", + "assets/bass/country_073_26300.bass", "assets/bass/country-beat_124_15484.bass", + "assets/bass/country-rock_180_10667.bass", + "assets/bass/dream_85_22588.bass", + "assets/bass/funk_130_14769.bass", "assets/bass/funky-beat_95_10105.bass", "assets/bass/funky-groove_108_8889_4.bass", + "assets/bass/gospel-funk_90_21333.bass", + "assets/bass/jazzy-funk_110_17455.bass", "assets/bass/mystic-acoustic_75_12800.bass", - "assets/bass/pop_100_19200.bass", - "assets/bass/rock_120_8000.bass" + "assets/bass/pop_90_10667.bass", + "assets/bass/pop_100_19200_2.bass", + "assets/bass/rock_120_8000.bass", + "assets/bass/rock-ballad_80_24000.bass", + "assets/bass/soul-band_90_21333.bass", + "assets/bass/u2-guitar_105_18286.bass" ] \ No newline at end of file diff --git a/docs/manifest.json b/docs/manifest.json index 443c47f..36cff92 100644 --- a/docs/manifest.json +++ b/docs/manifest.json @@ -3,7 +3,7 @@ "name": "OrinAyo", "short_name": "OrinAyo", "description": "The Guitar Arranger", - "version": "0.9.6", + "version": "0.9.7", "background": { "service_worker": "./js/background.js"
Arranger Type
Arranger Type
Arranger Group
Arranger Style
Sound Font File