diff --git a/code/__defines/dcs/signals/signals_atom/signals_atom_main.dm b/code/__defines/dcs/signals/signals_atom/signals_atom_main.dm index 06d8b734a4..52a5559ec0 100644 --- a/code/__defines/dcs/signals/signals_atom/signals_atom_main.dm +++ b/code/__defines/dcs/signals/signals_atom/signals_atom_main.dm @@ -2,5 +2,8 @@ // When the signal is called: (signal arguments) // All signals send the source datum of the signal as the first argument +///when an atom starts playing a song datum (datum/song) +#define COMSIG_ATOM_STARTING_INSTRUMENT "atom_starting_instrument" + ///When the transform or an atom is varedited through vv topic. #define COMSIG_ATOM_VV_MODIFY_TRANSFORM "atom_vv_modify_transform" diff --git a/code/__defines/dcs/signals/signals_music.dm b/code/__defines/dcs/signals/signals_music.dm new file mode 100644 index 0000000000..2f15f4e632 --- /dev/null +++ b/code/__defines/dcs/signals/signals_music.dm @@ -0,0 +1,12 @@ +// /datum/song signals + +///sent to the instrument when a song starts playing: (datum/starting_song, atom/player) +#define COMSIG_INSTRUMENT_START "instrument_start" +///sent to the instrument when a song stops playing +#define COMSIG_INSTRUMENT_END "instrument_end" +///sent to the instrument on /should_stop_playing(): (atom/player). Return values can be found in DEFINES/song.dm +#define COMSIG_INSTRUMENT_SHOULD_STOP_PLAYING "instrument_should_stop_playing" +///sent to the instrument (and player if available) when a song repeats (datum/song) +#define COMSIG_INSTRUMENT_REPEAT "instrument_repeat" +///sent to the instrument when tempo changes, skipped on new. (datum/song) +#define COMSIG_INSTRUMENT_TEMPO_CHANGE "instrument_tempo_change" diff --git a/code/__defines/instruments.dm b/code/__defines/instruments.dm index fa09eee0dd..bf54ddf1b9 100644 --- a/code/__defines/instruments.dm +++ b/code/__defines/instruments.dm @@ -6,6 +6,8 @@ /// Max number of playing notes per instrument. #define CHANNELS_PER_INSTRUMENT 128 +/// Minimum length a note should ever go for +#define INSTRUMENT_MIN_TOTAL_SUSTAIN 0.1 /// Maximum length a note should ever go for #define INSTRUMENT_MAX_TOTAL_SUSTAIN (5 SECONDS) @@ -16,8 +18,8 @@ /// Minimum volume for when the sound is considered dead. #define INSTRUMENT_MIN_SUSTAIN_DROPOFF 0 -#define SUSTAIN_LINEAR 1 -#define SUSTAIN_EXPONENTIAL 2 +#define SUSTAIN_LINEAR "Linear" +#define SUSTAIN_EXPONENTIAL "Exponential" // /datum/instrument instrument_flags #define INSTRUMENT_LEGACY (1<<0) //Legacy instrument. Implies INSTRUMENT_DO_NOT_AUTOSAMPLE diff --git a/code/__defines/song.dm b/code/__defines/song.dm new file mode 100644 index 0000000000..782a7923ea --- /dev/null +++ b/code/__defines/song.dm @@ -0,0 +1,17 @@ +#define MUSICIAN_HEARCHECK_MINDELAY 4 +#define MUSIC_MAXLINES 1000 +#define MUSIC_MAXLINECHARS 300 + +#define BPM_TO_TEMPO_SETTING(value) (600 / round(value, 1)) + +//Return values of song/should_stop_playing() + +///When the song should stop being played +#define STOP_PLAYING 1 +///Will ignore the instrument checks and play the song anyway. +#define IGNORE_INSTRUMENT_CHECKS 2 + +///it's what monkeys play! +#define MONKEY_SONG "BPM: 200\nC4/0,14,C,A4-F2,F3,A3,F-F2,A-F,F4,G4,F,D4-Bb2-G2\nD3,G3,D-G2,G3-G2,D,D4-G3,D,B4-B2,G,B3,G-B2,B3-B2\nG4,A4,G,E4-C3,E3,G3,E-C,G-C,E,E4-G,E,C5-E-A3,C4\nA-E3,C,E4-C3,A4-C4,B4-A3-A2,C5-C4,D5-F-B3,D4,B-F3\nD,F4-D3,D4,F-B-B2,G4-D,A4-C-F3,F,C/2,B3/2,A3-C3/2\nB/2,C4,E-C3,F4,G-C,F-F3,F-C,C4/2,B/2,A-A2/2,G3/2\nF/I" +///song played by the mook bard +#define MOOK_SONG "BPM: 240\nA5,B5,C#6,D6,E6/0.17,A/0.5,A/0.25,A3/0.25\nA4/0.25,C#5/0.25,E5/0.25,A/0.25,C#/0.25,E/0.12\nC#6/0.25,C#/0.25,E6/0.25,A3/0.25,A4/0.25\nC#5/0.25,E5/0.25,A/0.25,C#/0.25,E/0.25,D/0.25\nG6/0.25,D/0.17,F6/0.17,C#6/0.5,E6/0.5,D4/0.25\nA/0.25,D5/0.25,F5/0.25,A/0.25,D/0.25,F/0.25\nD6/0.08,F6/0.08,D4/0.25,A/0.25,D5/0.25,F5/0.25\nCn4/0.2,B/0.17,D6/0.17,G5/0.5,G/0.25,B3/0.25\nD4/0.25,G4/0.25,B4/0.25,D/0.25,G/0.25,B/0.12\nB5/0.25,B/0.25,D6/0.25,G3/0.25,G4/0.25,B4/0.25\nF/0.25,G/0.25,B/0.25,F/0.25,D/0.25,F6/0.25\nC6/0.17,E/0.17,B5/0.5,D#/0.5,C4/0.25,G/0.25\nC5/0.25,E5/0.25,G/0.25,C/0.25,E/0.25,C6/0.08\nE6/0.08,C4/0.25,Dn4/0.25,E4/0.25,A5/0.17,B/0.5\nC6/0.25,F5/0.08,F4/0.08,C5/0.08,E5/0.12,G5/0.12\nC6/0.25,E6/0.25,E4/0.08,C5/0.08,B/0.17,F6/0.17\nE6/0.5,B/0.25,E4/0.08,G#4/0.08,C6/0.17,D6/0.5\nE6/0.25,A3/0.25,E4/0.25,C5/0.25,Gn3/0.25\nF5/0.12,A5/0.12,A6/0.25,F3/0.25,F4/0.12,A4/0.12\nC/0.12,F6/0.17,A6/0.17,G#6/0.5,A/0.25,F3/0.25\nF4/0.12,A4/0.12,D#5/0.12,B/0.17,G#/0.17,B6/0.5\nB5/0.25,G#/0.25,E3/0.25,E4/0.12,G#4/0.12\nDn/0.12,E6/0.08,E3/0.25,F#3/0.25,G#3/0.25\nE5/0.17,A5/0.17,E/0.5,E/0.25,A3/0.25,C#4/0.25\nE4/0.25,C#/0.25,E/0.12,A5/0.5,B/0.5,C#6/0.5\nD6/0.5,A3/0.25,C#4/0.25,E/0.25,C#/0.25,E/0.25\nE6/0.08,Gn/0.25,E4/0.25,A4/0.25,C#5/0.25,E/0.25\nA/0.25,C#/0.25,E6/0.17,E/0.5,Fn6/0.5,G6/0.5\nG3/0.25,E4/0.25,A/0.25,C#/0.25,E/0.25,A/0.25\nC#/0.25,F/0.08,A6/0.08,F3/0.25,F4/0.25,A4/0.25\nCn/0.25,F/0.25,A/0.25,C/0.25,G6/0.12,A6/0.12\nG A G F6 G3/0.25 D4/0.25 G4/0.25 B4/0.25 D/0.25\nG/0.25 B/0.25 E6/0.12 G6/0.12 F/0.71 G/0.71 F/0.71\nE3/0.25 E4/0.25 G4/0.25 B/0.25 E/0.25 G/0.25 B/0.25\nA5/0.08 E6/0.08 A3/0.25 E4/0.25 A4/0.25 C#/0.25 E/0.25 A/0.25 C#/0.25 D6/0.17 E6/0.5 F/0.25 B3/0.25 D4/0.12 F4/0.12 B4/0.12 F6/0.25 E/0.25 D6/0.25 G#3/0.25 E4/0.12 G#4/0.12 B/0.12 Cn6/0.12 D/0.25 A3/0.25 A4/0.25 C5/0.25 E5/0.25 G#3/0.25 Gn/0.25 C4/0.25 E4/0.25 A/" diff --git a/code/__defines/text.dm b/code/__defines/text.dm index 35b085e043..f1bbca73a4 100644 --- a/code/__defines/text.dm +++ b/code/__defines/text.dm @@ -15,6 +15,10 @@ /// Removes everything enclose in < and > inclusive of the bracket, and limits the length of the message. #define STRIP_HTML_FULL(text, limit) (GLOB.html_tags.Replace(copytext(text, 1, limit), "")) +/// BYOND's string procs don't support being used on datum references (as in it doesn't look for a name for stringification) +/// We just use this macro to ensure that we will only pass strings to this BYOND-level function without developers needing to really worry about it. +#define LOWER_TEXT(thing) lowertext(UNLINT("[thing]")) + /// Removes characters incompatible with file names. #define SANITIZE_FILENAME(text) (GLOB.filename_forbidden_chars.Replace(text, "")) diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm index 400959bfa4..35d0441b11 100644 --- a/code/_helpers/text.dm +++ b/code/_helpers/text.dm @@ -601,6 +601,113 @@ GLOBAL_LIST_EMPTY(text_tag_cache) else return trim(html_encode(user_input), max_length) +#define NO_CHARS_DETECTED 0 +#define SPACES_DETECTED 1 +#define SYMBOLS_DETECTED 2 +#define NUMBERS_DETECTED 3 +#define LETTERS_DETECTED 4 + +/** + * Filters out undesirable characters from names. + * + * * strict - return null immediately instead of filtering out + * * allow_numbers - allows numbers and common special characters - used for silicon/other weird things names + * * cap_after_symbols - words like Bob's will be capitalized to Bob'S by default. False is good for titles. + */ +/proc/reject_bad_name(t_in, allow_numbers = FALSE, max_length = MAX_NAME_LEN, ascii_only = TRUE, strict = FALSE, cap_after_symbols = TRUE) + if(!t_in) + return //Rejects the input if it is null + + var/number_of_alphanumeric = 0 + var/last_char_group = NO_CHARS_DETECTED + var/t_out = "" + var/t_len = length(t_in) + var/charcount = 0 + var/char = "" + + // This is a sanity short circuit, if the users name is three times the maximum allowable length of name + // We bail out on trying to process the name at all, as it could be a bug or malicious input and we don't + // Want to iterate all of it. + if(t_len > 3 * MAX_NAME_LEN) + return + for(var/i = 1, i <= t_len, i += length(char)) + char = t_in[i] + switch(text2ascii(char)) + + // A .. Z + if(65 to 90) //Uppercase Letters + number_of_alphanumeric++ + last_char_group = LETTERS_DETECTED + + // a .. z + if(97 to 122) //Lowercase Letters + if(last_char_group == NO_CHARS_DETECTED || last_char_group == SPACES_DETECTED || cap_after_symbols && last_char_group == SYMBOLS_DETECTED) //start of a word + char = uppertext(char) + number_of_alphanumeric++ + last_char_group = LETTERS_DETECTED + + // 0 .. 9 + if(48 to 57) //Numbers + if(!allow_numbers) //allow name to start with number if AI/Borg + if(strict) + return + continue + number_of_alphanumeric++ + last_char_group = NUMBERS_DETECTED + // ' - . + if(39,45,46) //Common name punctuation + if(last_char_group == NO_CHARS_DETECTED) + if(strict) + return + continue + last_char_group = SYMBOLS_DETECTED + + // ~ | @ : # $ % & * + + if(126,124,64,58,35,36,37,38,42,43) //Other symbols that we'll allow (mainly for AI) + if(last_char_group == NO_CHARS_DETECTED || !allow_numbers) //suppress at start of string + if(strict) + return + continue + last_char_group = SYMBOLS_DETECTED + + //Space + if(32) + if(last_char_group == NO_CHARS_DETECTED || last_char_group == SPACES_DETECTED) //suppress double-spaces and spaces at start of string + if(strict) + return + continue + last_char_group = SPACES_DETECTED + + if(127 to INFINITY) + if(ascii_only) + if(strict) + return + continue + last_char_group = SYMBOLS_DETECTED //for now, we'll treat all non-ascii characters like symbols even though most are letters + + else + continue + t_out += char + charcount++ + if(charcount >= max_length) + break + + if(number_of_alphanumeric < 2) + return //protects against tiny names like "A" and also names like "' ' ' ' ' ' ' '" + + if(last_char_group == SPACES_DETECTED) + t_out = copytext_char(t_out, 1, -1) //removes the last character (in this case a space) + + //if(!filter_name_ic(t_out)) FIXME + // return + + return t_out + +#undef NO_CHARS_DETECTED +#undef SPACES_DETECTED +#undef NUMBERS_DETECTED +#undef LETTERS_DETECTED + //Adds 'char' ahead of 'text' until there are 'count' characters total /proc/add_leading(text, count, char = " ") text = "[text]" diff --git a/code/controllers/subsystems/processing/instruments.dm b/code/controllers/subsystems/processing/instruments.dm index af6bacc2fc..fd486d419e 100644 --- a/code/controllers/subsystems/processing/instruments.dm +++ b/code/controllers/subsystems/processing/instruments.dm @@ -19,6 +19,10 @@ PROCESSING_SUBSYSTEM_DEF(instruments) var/static/current_instrument_channels = 0 /// Single cached list for synthesizer instrument ids, so you don't have to have a new list with every synthesizer. var/static/list/synthesizer_instrument_ids + var/static/list/note_sustain_modes = list( + SUSTAIN_LINEAR, + SUSTAIN_EXPONENTIAL, + ) /datum/controller/subsystem/processing/instruments/Initialize() initialize_instrument_data() @@ -32,10 +36,11 @@ PROCESSING_SUBSYSTEM_DEF(instruments) songs -= S /datum/controller/subsystem/processing/instruments/proc/initialize_instrument_data() - for(var/datum/instrument/I as anything in subtypesof(/datum/instrument)) - if(initial(I.instrument_type) == I) + for(var/path in subtypesof(/datum/instrument)) + var/datum/instrument/I = path + if(initial(I.abstract_type) == path) continue - I = new I + I = new path I.Initialize() if(!I.id) qdel(I) diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm index f67fd9bd0b..2847023a8c 100644 --- a/code/game/objects/items/devices/hacktool.dm +++ b/code/game/objects/items/devices/hacktool.dm @@ -119,7 +119,7 @@ if(hack_result && in_hack_mode) to_chat(user, span_notice("Your hacking attempt was succesful!")) - user.playsound_local(get_turf(src), 'sound/instruments/piano/An6.ogg', 50) + user.playsound_local(get_turf(src), 'sound/runtime/instruments/piano/An6.ogg', 50) else to_chat(user, span_warning("Your hacking attempt failed!")) return 0 diff --git a/code/modules/client/preferences/types/game/sound.dm b/code/modules/client/preferences/types/game/sound.dm index a4f03bde4e..9008db96d3 100644 --- a/code/modules/client/preferences/types/game/sound.dm +++ b/code/modules/client/preferences/types/game/sound.dm @@ -255,3 +255,17 @@ /datum/preference/numeric/living/jukebox_volume/apply_to_client_updated(client/client, value) client?.media?.update_volume(value) + +/datum/preference/numeric/volume + abstract_type = /datum/preference/numeric/volume + minimum = 0 + maximum = 100 + +/datum/preference/numeric/volume/create_default_value() + return maximum + +/// Controls hearing instruments +/datum/preference/numeric/volume/sound_instruments + category = PREFERENCE_CATEGORY_GAME_PREFERENCES + savefile_key = "sound_instruments" + savefile_identifier = PREFERENCE_PLAYER diff --git a/code/modules/instruments/instrument_data/_instrument_data.dm b/code/modules/instruments/instrument_data/_instrument_data.dm index cf37e25c9b..2f3929fdfa 100644 --- a/code/modules/instruments/instrument_data/_instrument_data.dm +++ b/code/modules/instruments/instrument_data/_instrument_data.dm @@ -17,14 +17,14 @@ * Since songs cache them while playing, there isn't realistic issues regarding performance from accessing. */ /datum/instrument + /// Used for categorization subtypes + abstract_type = /datum/instrument /// Name of the instrument var/name = "Generic instrument" /// Uniquely identifies this instrument so runtime changes are possible as opposed to paths. If this is unset, things will use path instead. var/id /// Category var/category = "Unsorted" - /// Used for categorization subtypes - var/instrument_type = /datum/instrument /// Write here however many samples, follow this syntax: "%note num%"='%sample file%' eg. "27"='synthesizer/e2.ogg'. Key must never be lower than 0 and higher than 127 var/list/real_samples /// assoc list key = /datum/instrument_key. do not fill this yourself! @@ -70,7 +70,8 @@ /datum/instrument/Destroy() SSinstruments.instrument_data -= id - for(var/datum/song/S as anything in songs_using) + for(var/i in songs_using) + var/datum/song/S = i S.set_instrument(null) real_samples = null samples = null diff --git a/code/modules/instruments/instrument_data/brass.dm b/code/modules/instruments/instrument_data/brass.dm index 37cd981aa2..f40a2fd571 100644 --- a/code/modules/instruments/instrument_data/brass.dm +++ b/code/modules/instruments/instrument_data/brass.dm @@ -1,26 +1,26 @@ /datum/instrument/brass name = "Generic brass instrument" category = "Brass" - instrument_type = /datum/instrument/brass + abstract_type = /datum/instrument/brass /datum/instrument/brass/crisis_section name = "Crisis Brass Section" id = "crbrass" - real_samples = list("36"='sound/instruments/synthesis_samples/brass/crisis_brass/c2.ogg', - "48"='sound/instruments/synthesis_samples/brass/crisis_brass/c3.ogg', - "60"='sound/instruments/synthesis_samples/brass/crisis_brass/c4.ogg', - "72"='sound/instruments/synthesis_samples/brass/crisis_brass/c5.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/brass/crisis_brass/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/brass/crisis_brass/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/brass/crisis_brass/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/brass/crisis_brass/c5.ogg') /datum/instrument/brass/crisis_trombone name = "Crisis Trombone" id = "crtrombone" - real_samples = list("36"='sound/instruments/synthesis_samples/brass/crisis_trombone/c2.ogg', - "48"='sound/instruments/synthesis_samples/brass/crisis_trombone/c3.ogg', - "60"='sound/instruments/synthesis_samples/brass/crisis_trombone/c4.ogg', - "72"='sound/instruments/synthesis_samples/brass/crisis_trombone/c5.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/brass/crisis_trombone/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/brass/crisis_trombone/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/brass/crisis_trombone/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/brass/crisis_trombone/c5.ogg') /datum/instrument/brass/crisis_trumpet name = "Crisis Trumpet" id = "crtrumpet" - real_samples = list("60"='sound/instruments/synthesis_samples/brass/crisis_trumpet/c4.ogg', - "72"='sound/instruments/synthesis_samples/brass/crisis_trumpet/c5.ogg') + real_samples = list("60"='sound/runtime/instruments/synthesis_samples/brass/crisis_trumpet/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/brass/crisis_trumpet/c5.ogg') diff --git a/code/modules/instruments/instrument_data/chromatic_percussion.dm b/code/modules/instruments/instrument_data/chromatic_percussion.dm index 3a5bed2396..c4554a1d5c 100644 --- a/code/modules/instruments/instrument_data/chromatic_percussion.dm +++ b/code/modules/instruments/instrument_data/chromatic_percussion.dm @@ -1,31 +1,31 @@ /datum/instrument/chromatic name = "Generic chromatic percussion instrument" category = "Chromatic percussion" - instrument_type = /datum/instrument/chromatic + abstract_type = /datum/instrument/chromatic /datum/instrument/chromatic/vibraphone1 name = "Crisis Vibraphone" id = "crvibr" - real_samples = list("36"='sound/instruments/synthesis_samples/chromatic/vibraphone1/c2.ogg', - "48"='sound/instruments/synthesis_samples/chromatic/vibraphone1/c3.ogg', - "60"='sound/instruments/synthesis_samples/chromatic/vibraphone1/c4.ogg', - "72"='sound/instruments/synthesis_samples/chromatic/vibraphone1/c5.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/chromatic/vibraphone1/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/chromatic/vibraphone1/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/chromatic/vibraphone1/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/chromatic/vibraphone1/c5.ogg') /datum/instrument/chromatic/musicbox1 name = "SGM Music Box" id = "sgmmbox" - real_samples = list("36"='sound/instruments/synthesis_samples/chromatic/sgmbox/c2.ogg', - "48"='sound/instruments/synthesis_samples/chromatic/sgmbox/c3.ogg', - "60"='sound/instruments/synthesis_samples/chromatic/sgmbox/c4.ogg', - "72"='sound/instruments/synthesis_samples/chromatic/sgmbox/c5.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/chromatic/sgmbox/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/chromatic/sgmbox/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/chromatic/sgmbox/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/chromatic/sgmbox/c5.ogg') /datum/instrument/chromatic/fluid_celeste name = "FluidR3 Celeste" id = "r3celeste" - real_samples = list("36"='sound/instruments/synthesis_samples/chromatic/fluid_celeste/c2.ogg', - "48"='sound/instruments/synthesis_samples/chromatic/fluid_celeste/c3.ogg', - "60"='sound/instruments/synthesis_samples/chromatic/fluid_celeste/c4.ogg', - "72"='sound/instruments/synthesis_samples/chromatic/fluid_celeste/c5.ogg', - "84"='sound/instruments/synthesis_samples/chromatic/fluid_celeste/c6.ogg', - "96"='sound/instruments/synthesis_samples/chromatic/fluid_celeste/c7.ogg', - "108"='sound/instruments/synthesis_samples/chromatic/fluid_celeste/c8.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/c5.ogg', + "84"='sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/c6.ogg', + "96"='sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/c7.ogg', + "108"='sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/c8.ogg') diff --git a/code/modules/instruments/instrument_data/fun.dm b/code/modules/instruments/instrument_data/fun.dm index 0b6fc696d8..8ab844cfad 100644 --- a/code/modules/instruments/instrument_data/fun.dm +++ b/code/modules/instruments/instrument_data/fun.dm @@ -1,7 +1,7 @@ /datum/instrument/fun name = "Generic Fun Instrument" category = "Fun" - instrument_type = /datum/instrument/fun + abstract_type = /datum/instrument/fun /datum/instrument/fun/honk name = "!!HONK!!" @@ -18,6 +18,15 @@ id = "chime" real_samples = list("79"='sound/machines/chime.ogg') +/datum/instrument/fun/meowsynth + name = "MeowSynth" + id = "meowsynth" + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/meowsynth/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/meowsynth/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/meowsynth/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/meowsynth/c5.ogg', + "84"='sound/runtime/instruments/synthesis_samples/meowsynth/c6.ogg') + /datum/instrument/fun/mothscream name = "Moth Scream" id = "mothscream" diff --git a/code/modules/instruments/instrument_data/guitar.dm b/code/modules/instruments/instrument_data/guitar.dm index 07532aa8be..bc34cf61bc 100644 --- a/code/modules/instruments/instrument_data/guitar.dm +++ b/code/modules/instruments/instrument_data/guitar.dm @@ -1,36 +1,36 @@ /datum/instrument/guitar name = "Generic guitar-like instrument" category = "Guitar" - instrument_type = /datum/instrument/guitar + abstract_type = /datum/instrument/guitar /datum/instrument/guitar/steel_crisis name = "Crisis Steel String Guitar" id = "csteelgt" - real_samples = list("36"='sound/instruments/synthesis_samples/guitar/crisis_steel/c2.ogg', - "48"='sound/instruments/synthesis_samples/guitar/crisis_steel/c3.ogg', - "60"='sound/instruments/synthesis_samples/guitar/crisis_steel/c4.ogg', - "72"='sound/instruments/synthesis_samples/guitar/crisis_steel/c5.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/guitar/crisis_steel/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/guitar/crisis_steel/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/guitar/crisis_steel/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/guitar/crisis_steel/c5.ogg') /datum/instrument/guitar/nylon_crisis name = "Crisis Nylon String Guitar" id = "cnylongt" - real_samples = list("36"='sound/instruments/synthesis_samples/guitar/crisis_nylon/c2.ogg', - "48"='sound/instruments/synthesis_samples/guitar/crisis_nylon/c3.ogg', - "60"='sound/instruments/synthesis_samples/guitar/crisis_nylon/c4.ogg', - "72"='sound/instruments/synthesis_samples/guitar/crisis_nylon/c5.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/guitar/crisis_nylon/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/guitar/crisis_nylon/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/guitar/crisis_nylon/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/guitar/crisis_nylon/c5.ogg') /datum/instrument/guitar/clean_crisis name = "Crisis Clean Guitar" id = "ccleangt" - real_samples = list("36"='sound/instruments/synthesis_samples/guitar/crisis_clean/c2.ogg', - "48"='sound/instruments/synthesis_samples/guitar/crisis_clean/c3.ogg', - "60"='sound/instruments/synthesis_samples/guitar/crisis_clean/c4.ogg', - "72"='sound/instruments/synthesis_samples/guitar/crisis_clean/c5.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/guitar/crisis_clean/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/guitar/crisis_clean/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/guitar/crisis_clean/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/guitar/crisis_clean/c5.ogg') /datum/instrument/guitar/muted_crisis name = "Crisis Muted Guitar" id = "cmutedgt" - real_samples = list("36"='sound/instruments/synthesis_samples/guitar/crisis_muted/c2.ogg', - "48"='sound/instruments/synthesis_samples/guitar/crisis_muted/c3.ogg', - "60"='sound/instruments/synthesis_samples/guitar/crisis_muted/c4.ogg', - "72"='sound/instruments/synthesis_samples/guitar/crisis_muted/c5.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/guitar/crisis_muted/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/guitar/crisis_muted/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/guitar/crisis_muted/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/guitar/crisis_muted/c5.ogg') diff --git a/code/modules/instruments/instrument_data/hardcoded.dm b/code/modules/instruments/instrument_data/hardcoded.dm index 1138fd7d8c..28423d88b8 100644 --- a/code/modules/instruments/instrument_data/hardcoded.dm +++ b/code/modules/instruments/instrument_data/hardcoded.dm @@ -2,7 +2,7 @@ //SONGS WILL BE AUTOMATICALLY SWITCHED TO LEGACY MODE IF THEY USE THIS KIND OF INSTRUMENT! //I'd prefer these stayed. They sound different from the mechanical synthesis of synthed instruments, and I quite like them that way. It's not legacy, it's hardcoded, old style. - kevinz000 /datum/instrument/hardcoded - instrument_type = /datum/instrument/hardcoded + abstract_type = /datum/instrument/hardcoded category = "Non-Synthesized" instrument_flags = INSTRUMENT_LEGACY volume_multiplier = 1 //not as loud as synth'd @@ -23,7 +23,7 @@ name = "Electric Guitar" id = "eguitar" legacy_instrument_ext = "ogg" - legacy_instrument_path = "eguitar" + legacy_instrument_path = "electric_guitar" /datum/instrument/hardcoded/glockenspiel name = "Glockenspiel" diff --git a/code/modules/instruments/instrument_data/organ.dm b/code/modules/instruments/instrument_data/organ.dm index c8a4c069e3..6a4112437f 100644 --- a/code/modules/instruments/instrument_data/organ.dm +++ b/code/modules/instruments/instrument_data/organ.dm @@ -1,43 +1,43 @@ /datum/instrument/organ name = "Generic organ" category = "Organ" - instrument_type = /datum/instrument/organ + abstract_type = /datum/instrument/organ /datum/instrument/organ/crisis_church name = "Crisis Church Organ" id = "crichugan" - real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_church/c2.ogg', - "48"='sound/instruments/synthesis_samples/organ/crisis_church/c3.ogg', - "60"='sound/instruments/synthesis_samples/organ/crisis_church/c4.ogg', - "72"='sound/instruments/synthesis_samples/organ/crisis_church/c5.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/organ/crisis_church/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/organ/crisis_church/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/organ/crisis_church/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/organ/crisis_church/c5.ogg') /datum/instrument/organ/crisis_hammond name = "Crisis Hammond Organ" id = "crihamgan" - real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_hammond/c2.ogg', - "48"='sound/instruments/synthesis_samples/organ/crisis_hammond/c3.ogg', - "60"='sound/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg', - "72"='sound/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/organ/crisis_hammond/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/organ/crisis_hammond/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg') /datum/instrument/organ/crisis_accordian name = "Crisis Accordian" id = "crack" - real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg', - "48"='sound/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg', - "60"='sound/instruments/synthesis_samples/organ/crisis_accordian/c4.ogg', - "72"='sound/instruments/synthesis_samples/organ/crisis_accordian/c5.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/organ/crisis_accordian/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/organ/crisis_accordian/c5.ogg') /datum/instrument/organ/crisis_harmonica name = "Crisis Harmonica" id = "crharmony" - real_samples = list("48"='sound/instruments/synthesis_samples/organ/crisis_harmonica/c3.ogg', - "60"='sound/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg', - "72"='sound/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg') + real_samples = list("48"='sound/runtime/instruments/synthesis_samples/organ/crisis_harmonica/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg') /datum/instrument/organ/crisis_tango_accordian name = "Crisis Tango Accordian" id = "crtango" - real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg', - "48"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg', - "60"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c4.ogg', - "72"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c5.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/organ/crisis_tangaccordian/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/organ/crisis_tangaccordian/c5.ogg') diff --git a/code/modules/instruments/instrument_data/piano.dm b/code/modules/instruments/instrument_data/piano.dm index e8aac71dae..9f2aeb063a 100644 --- a/code/modules/instruments/instrument_data/piano.dm +++ b/code/modules/instruments/instrument_data/piano.dm @@ -1,56 +1,56 @@ /datum/instrument/piano name = "Generic piano" category = "Piano" - instrument_type = /datum/instrument/piano + abstract_type = /datum/instrument/piano /datum/instrument/piano/fluid_piano name = "FluidR3 Grand Piano" id = "r3grand" - real_samples = list("36"='sound/instruments/synthesis_samples/piano/fluid_piano/c2.ogg', - "48"='sound/instruments/synthesis_samples/piano/fluid_piano/c3.ogg', - "60"='sound/instruments/synthesis_samples/piano/fluid_piano/c4.ogg', - "72"='sound/instruments/synthesis_samples/piano/fluid_piano/c5.ogg', - "84"='sound/instruments/synthesis_samples/piano/fluid_piano/c6.ogg', - "96"='sound/instruments/synthesis_samples/piano/fluid_piano/c7.ogg', - "108"='sound/instruments/synthesis_samples/piano/fluid_piano/c8.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c5.ogg', + "84"='sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c6.ogg', + "96"='sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c7.ogg', + "108"='sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c8.ogg') /datum/instrument/piano/fluid_harpsichord name = "FluidR3 Harpsichord" id = "r3harpsi" - real_samples = list("36"='sound/instruments/synthesis_samples/piano/fluid_harpsi/c2.ogg', - "48"='sound/instruments/synthesis_samples/piano/fluid_harpsi/c3.ogg', - "60"='sound/instruments/synthesis_samples/piano/fluid_harpsi/c4.ogg', - "72"='sound/instruments/synthesis_samples/piano/fluid_harpsi/c5.ogg', - "84"='sound/instruments/synthesis_samples/piano/fluid_harpsi/c6.ogg', - "96"='sound/instruments/synthesis_samples/piano/fluid_harpsi/c7.ogg', - "108"='sound/instruments/synthesis_samples/piano/fluid_harpsi/c8.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/c5.ogg', + "84"='sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/c6.ogg', + "96"='sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/c7.ogg', + "108"='sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/c8.ogg') /datum/instrument/piano/crisis_harpsichord name = "Crisis Harpsichord" id = "crharpsi" - real_samples = list("36"='sound/instruments/synthesis_samples/piano/crisis_harpsichord/c2.ogg', - "48"='sound/instruments/synthesis_samples/piano/crisis_harpsichord/c3.ogg', - "60"='sound/instruments/synthesis_samples/piano/crisis_harpsichord/c4.ogg', - "72"='sound/instruments/synthesis_samples/piano/crisis_harpsichord/c5.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/piano/crisis_harpsichord/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/piano/crisis_harpsichord/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/piano/crisis_harpsichord/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/piano/crisis_harpsichord/c5.ogg') /datum/instrument/piano/crisis_grandpiano_uni name = "Crisis Grand Piano One" id = "crgrand1" - real_samples = list("36"='sound/instruments/synthesis_samples/piano/crisis_grand_piano/c2.ogg', - "48"='sound/instruments/synthesis_samples/piano/crisis_grand_piano/c3.ogg', - "60"='sound/instruments/synthesis_samples/piano/crisis_grand_piano/c4.ogg', - "72"='sound/instruments/synthesis_samples/piano/crisis_grand_piano/c5.ogg', - "84"='sound/instruments/synthesis_samples/piano/crisis_grand_piano/c6.ogg', - "96"='sound/instruments/synthesis_samples/piano/crisis_grand_piano/c7.ogg', - "108"='sound/instruments/synthesis_samples/piano/crisis_grand_piano/c8.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c5.ogg', + "84"='sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c6.ogg', + "96"='sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c7.ogg', + "108"='sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c8.ogg') /datum/instrument/piano/crisis_brightpiano_uni name = "Crisis Bright Piano One" id = "crbright1" - real_samples = list("36"='sound/instruments/synthesis_samples/piano/crisis_bright_piano/c2.ogg', - "48"='sound/instruments/synthesis_samples/piano/crisis_bright_piano/c3.ogg', - "60"='sound/instruments/synthesis_samples/piano/crisis_bright_piano/c4.ogg', - "72"='sound/instruments/synthesis_samples/piano/crisis_bright_piano/c5.ogg', - "84"='sound/instruments/synthesis_samples/piano/crisis_bright_piano/c6.ogg', - "96"='sound/instruments/synthesis_samples/piano/crisis_bright_piano/c7.ogg', - "108"='sound/instruments/synthesis_samples/piano/crisis_bright_piano/c8.ogg') + real_samples = list("36"='sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c2.ogg', + "48"='sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c3.ogg', + "60"='sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c4.ogg', + "72"='sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c5.ogg', + "84"='sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c6.ogg', + "96"='sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c7.ogg', + "108"='sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c8.ogg') diff --git a/code/modules/instruments/instrument_data/synth_tones.dm b/code/modules/instruments/instrument_data/synth_tones.dm index d3a78a081c..9ab25e79e7 100644 --- a/code/modules/instruments/instrument_data/synth_tones.dm +++ b/code/modules/instruments/instrument_data/synth_tones.dm @@ -1,19 +1,19 @@ /datum/instrument/tones name = "Ideal tone" category = "Tones" - instrument_type = /datum/instrument/tones + abstract_type = /datum/instrument/tones /datum/instrument/tones/square_wave name = "Ideal square wave" id = "square" - real_samples = list("81"='sound/instruments/synthesis_samples/tones/Square.ogg') + real_samples = list("81"='sound/runtime/instruments/synthesis_samples/tones/Square.ogg') /datum/instrument/tones/sine_wave name = "Ideal sine wave" id = "sine" - real_samples = list("81"='sound/instruments/synthesis_samples/tones/Sine.ogg') + real_samples = list("81"='sound/runtime/instruments/synthesis_samples/tones/Sine.ogg') /datum/instrument/tones/saw_wave name = "Ideal sawtooth wave" id = "saw" - real_samples = list("81"='sound/instruments/synthesis_samples/tones/Sawtooth.ogg') + real_samples = list("81"='sound/runtime/instruments/synthesis_samples/tones/Sawtooth.ogg') diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index cb760a656c..4954e37e65 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -9,7 +9,7 @@ slot_l_hand_str = 'icons/mob/items/lefthand_instruments.dmi', slot_r_hand_str = 'icons/mob/items/righthand_instruments.dmi', ) - + abstract_type = /obj/item/instrument /// Our song datum. var/datum/song/handheld/song /// Our allowed list of instrument ids. This is nulled on initialize. @@ -20,27 +20,30 @@ /obj/item/instrument/Initialize(mapload) . = ..() song = new(src, allowed_instrument_ids, instrument_range) - allowed_instrument_ids = null //We don't need this clogging memory after it's used. + allowed_instrument_ids = null //We don't need this clogging memory after its used. /obj/item/instrument/Destroy() QDEL_NULL(song) return ..() -/obj/item/instrument/proc/should_stop_playing(mob/user) - return user.incapacitated() || !((loc == user) || (isturf(loc) && Adjacent(user))) // sorry, no more TK playing. +/obj/item/instrument/proc/can_play(atom/music_player) + if(!ismob(music_player)) + return FALSE + var/mob/user = music_player + if(user.incapacitated()) + return FALSE + if(!Adjacent(user)) + return FALSE + return TRUE -/obj/item/instrument/attack_self(mob/user) - if(!user.IsAdvancedToolUser()) - to_chat(user, span_warning("You don't have the dexterity to do this!")) - return TRUE - interact(user) - -/obj/item/instrument/interact(mob/living/user) - if(!isliving(user) || user.incapacitated()) +/obj/item/instrument/attack_self(mob/M) + if(!M.IsAdvancedToolUser()) return - user.set_machine(src) - song.interact(user) + tgui_interact(M) + +/obj/item/instrument/tgui_interact(mob/user, datum/tgui/ui) + return song.tgui_interact(user) /obj/item/instrument/violin name = "space violin" @@ -60,67 +63,6 @@ icon_state = "xylophone" allowed_instrument_ids = "xylophone" -/obj/item/instrument/piano_synth - name = "synthesizer" - desc = "An advanced electronic synthesizer that can be used as various instruments." - icon_state = "synth" - allowed_instrument_ids = "piano" - -/obj/item/instrument/piano_synth/Initialize(mapload) - . = ..() - song.allowed_instrument_ids = SSinstruments.synthesizer_instrument_ids - -/obj/item/instrument/piano_synth/headphones - name = "headphones" - desc = "Unce unce unce unce. Boop!" - icon_state = "headphones" - slot_flags = SLOT_EARS | SLOT_HEAD - force = 0 - w_class = ITEMSIZE_SMALL - instrument_range = 1 - -/obj/item/instrument/piano_synth/headphones/Initialize(mapload) - . = ..() - RegisterSignal(src, COMSIG_SONG_START, PROC_REF(start_playing)) - RegisterSignal(src, COMSIG_SONG_END, PROC_REF(stop_playing)) - -/** - * Called by a component signal when our song starts playing. - */ -/obj/item/instrument/piano_synth/headphones/proc/start_playing() - SIGNAL_HANDLER - - icon_state = "[initial(icon_state)]_on" - if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - if(H.l_ear == src || H.r_ear == src) - H.update_inv_ears() - else if(H.head == src) - H.update_inv_head() - -/** - * Called by a component signal when our song stops playing. - */ -/obj/item/instrument/piano_synth/headphones/proc/stop_playing() - SIGNAL_HANDLER - - icon_state = "[initial(icon_state)]" - if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - if(H.l_ear == src || H.r_ear == src) - H.update_inv_ears() - else if(H.head == src) - H.update_inv_head() - - -/obj/item/instrument/piano_synth/headphones/spacepods - name = "\improper Nanotrasen space pods" - desc = "Flex your money, AND ignore what everyone else says, all at once!" - icon_state = "spacepods" - slot_flags = SLOT_EARS - //strip_delay = 100 //air pods don't fall out - instrument_range = 0 //you're paying for quality here - /obj/item/instrument/banjo name = "banjo" desc = "A 'Mura' brand banjo. It's pretty much just a drum with a neck and strings." @@ -177,7 +119,7 @@ AddComponent(/datum/component/spooky) */ /obj/item/instrument/trumpet/spectral/attack(mob/living/carbon/C, mob/user) - playsound (src, 'sound/instruments/trombone/En4.mid', 100,1,-1) + playsound (src, 'sound/runtime/instruments/trombone/En4.mid', 100,1,-1) ..() /obj/item/instrument/saxophone @@ -200,7 +142,7 @@ */ /obj/item/instrument/saxophone/spectral/attack(mob/living/carbon/C, mob/user) - playsound (src, 'sound/instruments/saxophone/En4.mid', 100,1,-1) + playsound (src, 'sound/runtime/instruments/saxophone/En4.mid', 100,1,-1) ..() /obj/item/instrument/trombone @@ -223,7 +165,7 @@ */ /obj/item/instrument/trombone/spectral/attack(mob/living/carbon/C, mob/user) - playsound (src, 'sound/instruments/trombone/Cn4.mid', 100,1,-1) + playsound (src, 'sound/runtime/instruments/trombone/Cn4.mid', 100,1,-1) ..() /obj/item/instrument/recorder diff --git a/code/modules/instruments/piano_synth.dm b/code/modules/instruments/piano_synth.dm new file mode 100644 index 0000000000..98015e9365 --- /dev/null +++ b/code/modules/instruments/piano_synth.dm @@ -0,0 +1,60 @@ +/obj/item/instrument/piano_synth + name = "synthesizer" + desc = "An advanced electronic synthesizer that can be used as various instruments." + icon_state = "synth" + allowed_instrument_ids = "piano" + +/obj/item/instrument/piano_synth/Initialize(mapload) + . = ..() + song.allowed_instrument_ids = SSinstruments.synthesizer_instrument_ids + +/obj/item/instrument/piano_synth/headphones + name = "headphones" + desc = "Unce unce unce unce. Boop!" + icon_state = "headphones" + slot_flags = SLOT_EARS | SLOT_HEAD + force = 0 + w_class = ITEMSIZE_SMALL + instrument_range = 1 + +/obj/item/instrument/piano_synth/headphones/Initialize(mapload) + . = ..() + RegisterSignal(src, COMSIG_SONG_START, PROC_REF(start_playing)) + RegisterSignal(src, COMSIG_SONG_END, PROC_REF(stop_playing)) + +/** + * Called by a component signal when our song starts playing. + */ +/obj/item/instrument/piano_synth/headphones/proc/start_playing() + SIGNAL_HANDLER + + icon_state = "[initial(icon_state)]_on" + if(ishuman(loc)) + var/mob/living/carbon/human/H = loc + if(H.l_ear == src || H.r_ear == src) + H.update_inv_ears() + else if(H.head == src) + H.update_inv_head() + +/** + * Called by a component signal when our song stops playing. + */ +/obj/item/instrument/piano_synth/headphones/proc/stop_playing() + SIGNAL_HANDLER + + icon_state = "[initial(icon_state)]" + if(ishuman(loc)) + var/mob/living/carbon/human/H = loc + if(H.l_ear == src || H.r_ear == src) + H.update_inv_ears() + else if(H.head == src) + H.update_inv_head() + + +/obj/item/instrument/piano_synth/headphones/spacepods + name = "\improper Nanotrasen space pods" + desc = "Flex your money, AND ignore what everyone else says, all at once!" + icon_state = "spacepods" + slot_flags = SLOT_EARS + //strip_delay = 100 //air pods don't fall out + instrument_range = 0 //you're paying for quality here diff --git a/code/modules/instruments/songs/_song.dm b/code/modules/instruments/songs/_song.dm index 53ce5c02de..257c162134 100644 --- a/code/modules/instruments/songs/_song.dm +++ b/code/modules/instruments/songs/_song.dm @@ -1,7 +1,3 @@ -#define MUSICIAN_HEARCHECK_MINDELAY 4 -#define MUSIC_MAXLINES 1000 -#define MUSIC_MAXLINECHARS 300 - /** * # Song datum * @@ -12,6 +8,9 @@ /// Name of the song var/name = "Untitled" + /// ID for syncing songs together + var/id = "" + /// The atom we're attached to/playing from var/atom/parent @@ -27,11 +26,6 @@ /// Are we currently playing? var/playing = FALSE - /// Are we currently editing? - var/editing = TRUE - /// Is the help screen open? - var/help = FALSE - /// Repeats left var/repeat = 0 /// Maximum times we can repeat @@ -78,8 +72,8 @@ var/list/channels_playing = list() /// List of channels that aren't being used, as text. This is to prevent unnecessary freeing and reallocations from SSsounds/SSinstruments. var/list/channels_idle = list() - /// Person playing us - var/mob/user_playing + /// Who or what's playing us + var/atom/music_player ////////////////////////////////////////////////////// /// Last world.time we checked for who can hear us @@ -111,7 +105,6 @@ var/note_shift = 0 var/note_shift_min = -100 var/note_shift_max = 100 - var/can_noteshift = TRUE /// The kind of sustain we're using var/sustain_mode = SUSTAIN_LINEAR /// When a note is considered dead if it is below this in volume @@ -130,10 +123,10 @@ /datum/song/New(atom/parent, list/instrument_ids, new_range) SSinstruments.on_song_new(src) lines = list() - tempo = sanitize_tempo(tempo) + tempo = sanitize_tempo(tempo, TRUE) src.parent = parent if(instrument_ids) - allowed_instrument_ids = islist(instrument_ids)? instrument_ids : list(instrument_ids) + allowed_instrument_ids = islist(instrument_ids) ? instrument_ids : list(instrument_ids) if(length(allowed_instrument_ids)) set_instrument(allowed_instrument_ids[1]) hearing_mobs = list() @@ -161,6 +154,8 @@ var/list/old = hearing_mobs.Copy() hearing_mobs.len = 0 var/turf/source = get_turf(parent) + // FIXME + // for(var/mob/M in get_hearers_in_view(instrument_range, source)) var/list/in_range = get_mobs_and_objs_in_view_fast(source, instrument_range, remote_ghosts = FALSE) for(var/mob/M in in_range["mobs"]) hearing_mobs[M] = get_dist(M, source) @@ -202,64 +197,98 @@ /** * Attempts to start playing our song. */ -/datum/song/proc/start_playing(mob/user) +/datum/song/proc/start_playing(atom/user) if(playing) return if(!using_instrument?.ready()) - to_chat(user, span_warning("An error has occurred with [src]. Please reset the instrument.")) + to_chat(user, span_warning("An error has occured with [src]. Please reset the instrument.")) return compile_chords() if(!length(compiled_chords)) to_chat(user, span_warning("Song is empty.")) return playing = TRUE - updateDialog(user_playing) //we can not afford to runtime, since we are going to be doing sound channel reservations and if we runtime it means we have a channel allocation leak. //wrap the rest of the stuff to ensure stop_playing() is called. do_hearcheck() - SEND_SIGNAL(parent, COMSIG_SONG_START) + SEND_SIGNAL(parent, COMSIG_INSTRUMENT_START, src, user) + SEND_SIGNAL(user, COMSIG_ATOM_STARTING_INSTRUMENT, src) elapsed_delay = 0 delay_by = 0 current_chord = 1 - user_playing = user + music_player = user START_PROCESSING(SSinstruments, src) + if(id) + sync_play() + +/** + * Attempts to find other instruments with the same ID and syncs them to our song. + */ +/datum/song/proc/sync_play() + for(var/datum/song/other_instrument as anything in SSinstruments.songs) + if(other_instrument == src || other_instrument.id != id) + continue + if(other_instrument.playing) + continue + var/atom/other_player = other_instrument.find_sync_player() + if(isnull(other_player) || !(other_player in view(get_turf(parent)))) + continue + // copies the main song info to target songs + other_instrument.lines = lines.Copy() + other_instrument.max_repeats = max_repeats + other_instrument.tempo = tempo + other_instrument.start_playing(other_player) + +/** + * Finds a player which would reasonably be able to play this song. + */ +/datum/song/proc/find_sync_player() + return null /** * Stops playing, terminating all sounds if in synthesized mode. Clears hearing_mobs. + * + * Arguments: + * * finished: boolean, whether the song ended via reaching the end. */ -/datum/song/proc/stop_playing() +/datum/song/proc/stop_playing(finished = FALSE) if(!playing) return playing = FALSE if(!debug_mode) compiled_chords = null STOP_PROCESSING(SSinstruments, src) - SEND_SIGNAL(parent, COMSIG_SONG_END) + SEND_SIGNAL(parent, COMSIG_INSTRUMENT_END, finished) terminate_all_sounds(TRUE) hearing_mobs.len = 0 - user_playing = null + music_player = null /** * Processes our song. */ /datum/song/proc/process_song(wait) - if(!length(compiled_chords) || should_stop_playing(user_playing)) - stop_playing() + if(!length(compiled_chords)) + stop_playing(TRUE) + return + if(should_stop_playing(music_player) == STOP_PLAYING) + stop_playing(FALSE) return var/list/chord = compiled_chords[current_chord] - if(++elapsed_delay >= delay_by) - play_chord(chord) - elapsed_delay = 0 - delay_by = tempodiv_to_delay(chord[length(chord)]) - current_chord++ - if(current_chord > length(compiled_chords)) - if(repeat) - repeat-- - current_chord = 1 - return - else - stop_playing() - return + elapsed_delay++ + if(elapsed_delay < delay_by) + return + play_chord(chord) + elapsed_delay = 0 + delay_by = tempodiv_to_delay(chord[length(chord)]) + current_chord++ + if(current_chord <= length(compiled_chords)) + return + if(!repeat) + stop_playing(TRUE) + return + repeat-- + current_chord = 1 + SEND_SIGNAL(parent, COMSIG_INSTRUMENT_REPEAT, TRUE) /** * Converts a tempodiv to ticks to elapse before playing the next chord, taking into account our tempo. @@ -281,19 +310,34 @@ /datum/song/proc/play_chord(list/chord) // last value is timing information for(var/i in 1 to (length(chord) - 1)) - legacy? playkey_legacy(chord[i][1], chord[i][2], chord[i][3], user_playing) : playkey_synth(chord[i], user_playing) + legacy ? playkey_legacy(chord[i][1], chord[i][2], chord[i][3], music_player) : playkey_synth(chord[i], music_player) /** * Checks if we should halt playback. */ -/datum/song/proc/should_stop_playing(mob/user) - return QDELETED(parent) || !using_instrument || !playing +/datum/song/proc/should_stop_playing(atom/player) + if(QDELETED(player) || !using_instrument || !playing) + return STOP_PLAYING + return SEND_SIGNAL(parent, COMSIG_INSTRUMENT_SHOULD_STOP_PLAYING, player) + +/// Sets and sanitizes the repeats variable. +/datum/song/proc/set_repeats(new_repeats_value) + if(playing) + return //So that people cant keep adding to repeat. If the do it intentionally, it could result in the server crashing. + repeat = round(new_repeats_value) + if(repeat < 0) + repeat = 0 + if(repeat > max_repeats) + repeat = max_repeats + /** * Sanitizes tempo to a value that makes sense and fits the current world.tick_lag. */ -/datum/song/proc/sanitize_tempo(new_tempo) +/datum/song/proc/sanitize_tempo(new_tempo, initializing = FALSE) new_tempo = abs(new_tempo) + if(!initializing) // not only is it not helpful while initializing but it will runtime really hard since nothing is set up + SEND_SIGNAL(parent, COMSIG_INSTRUMENT_TEMPO_CHANGE, src) return clamp(round(new_tempo, world.tick_lag), world.tick_lag, 5 SECONDS) /** @@ -308,12 +352,6 @@ /datum/song/proc/set_bpm(bpm) tempo = sanitize_tempo(600 / bpm) -/** - * Updates the window for our users. Override down the line. - */ -/datum/song/proc/updateDialog(mob/user) - interact(user) - /datum/song/process(wait) if(!playing) return PROCESS_KILL @@ -337,33 +375,29 @@ * Setter for setting output volume. */ /datum/song/proc/set_volume(volume) - src.volume = clamp(volume, max(0, min_volume), min(100, max_volume)) + src.volume = clamp(round(volume, 1), max(0, min_volume), min(100, max_volume)) update_sustain() - updateDialog() /** * Setter for setting how low the volume has to get before a note is considered "dead" and dropped */ /datum/song/proc/set_dropoff_volume(volume) - sustain_dropoff_volume = clamp(volume, INSTRUMENT_MIN_SUSTAIN_DROPOFF, 100) + sustain_dropoff_volume = clamp(round(volume, 0.01), INSTRUMENT_MIN_SUSTAIN_DROPOFF, 100) update_sustain() - updateDialog() /** * Setter for setting exponential falloff factor. */ /datum/song/proc/set_exponential_drop_rate(drop) - sustain_exponential_dropoff = clamp(drop, INSTRUMENT_EXP_FALLOFF_MIN, INSTRUMENT_EXP_FALLOFF_MAX) + sustain_exponential_dropoff = clamp(round(drop, 0.00001), INSTRUMENT_EXP_FALLOFF_MIN, INSTRUMENT_EXP_FALLOFF_MAX) update_sustain() - updateDialog() /** * Setter for setting linear falloff duration. */ /datum/song/proc/set_linear_falloff_duration(duration) - sustain_linear_duration = clamp(duration, 0.1, INSTRUMENT_MAX_TOTAL_SUSTAIN) + sustain_linear_duration = clamp(round(duration * 10, world.tick_lag), world.tick_lag, INSTRUMENT_MAX_TOTAL_SUSTAIN) update_sustain() - updateDialog() /datum/song/vv_edit_var(var_name, var_value) . = ..() @@ -381,25 +415,34 @@ // subtype for handheld instruments, like violin /datum/song/handheld -/datum/song/handheld/updateDialog(mob/user) - parent.interact(user || usr) - -/datum/song/handheld/should_stop_playing(mob/user) +/datum/song/handheld/should_stop_playing(atom/player) . = ..() - if(.) - return TRUE + if(. == STOP_PLAYING || . == IGNORE_INSTRUMENT_CHECKS) + return var/obj/item/instrument/I = parent - return I.should_stop_playing(user) + return I.can_play(player) ? NONE : STOP_PLAYING + +/datum/song/handheld/find_sync_player() + var/obj/item/instrument/instrument = parent + var/mob/living/player = get(parent, /mob/living) + if(instrument.can_play(player)) + return player + return null // subtype for stationary structures, like pianos /datum/song/stationary -/datum/song/stationary/updateDialog(mob/user) - parent.interact(user || usr) - -/datum/song/stationary/should_stop_playing(mob/user) +/datum/song/stationary/should_stop_playing(atom/player) . = ..() - if(.) + if(. == STOP_PLAYING || . == IGNORE_INSTRUMENT_CHECKS) return TRUE var/obj/structure/musician/M = parent - return M.should_stop_playing(user) + return M.can_play(player) ? NONE : STOP_PLAYING + +/datum/song/stationary/find_sync_player() + var/obj/structure/musician/piano = parent + for(var/mob/living/player in view(parent, 1)) + if(piano.can_play(player)) + return player + + return null diff --git a/code/modules/instruments/songs/editor.dm b/code/modules/instruments/songs/editor.dm index 0d593a86ed..f8321148a7 100644 --- a/code/modules/instruments/songs/editor.dm +++ b/code/modules/instruments/songs/editor.dm @@ -1,251 +1,216 @@ -/** - * Returns the HTML for the status UI for this song datum. - */ -/datum/song/proc/instrument_status_ui() - . = list() - . += "
" - . += span_bold("Current instrument:") + " " - if(!using_instrument) - . += span_danger("No instrument loaded!") + "
" - else - . += "[using_instrument.name]
" - . += "Playback Settings:
" - if(can_noteshift) - . += "Note Shift/Note Transpose: [note_shift] keys / [round(note_shift / 12, 0.01)] octaves
" - var/smt - var/modetext = "" +/datum/song/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if (!ui) + ui = new(user, src, "InstrumentEditor", parent.name) + ui.open() + +/datum/song/tgui_host(mob/user) + return parent + +/datum/song/tgui_data(mob/user) + var/list/data = ..() + data["id"] = id + data["using_instrument"] = using_instrument?.name || "No instrument loaded!" + data["note_shift"] = note_shift + data["octaves"] = round(note_shift / 12, 0.01) + data["sustain_mode"] = sustain_mode switch(sustain_mode) if(SUSTAIN_LINEAR) - smt = "Linear" - modetext = "Linear Sustain Duration: [sustain_linear_duration / 10] seconds
" + data["sustain_mode_button"] = "Linear Sustain Duration (in seconds)" + data["sustain_mode_duration"] = sustain_linear_duration / 10 + data["sustain_mode_min"] = INSTRUMENT_MIN_TOTAL_SUSTAIN + data["sustain_mode_max"] = INSTRUMENT_MAX_TOTAL_SUSTAIN if(SUSTAIN_EXPONENTIAL) - smt = "Exponential" - modetext = "Exponential Falloff Factor: [sustain_exponential_dropoff]% per decisecond
" - . += "Sustain Mode: [smt]
" - . += modetext - . += using_instrument?.ready()? ("Status: " + span_green("Ready") + "
") : ("Status: " + span_red("!Instrument Definition Error!") + "
") - . += "Instrument Type: [legacy? "Legacy" : "Synthesized"]
" - . += "Volume: [volume]
" - . += "Volume Dropoff Threshold: [sustain_dropoff_volume]
" - . += "Sustain indefinitely last held note: [full_sustain_held_note? "Enabled" : "Disabled"].
" - . += "
" + data["sustain_mode_button"] = "Exponential Falloff Factor (% per decisecond)" + data["sustain_mode_duration"] = sustain_exponential_dropoff + data["sustain_mode_min"] = INSTRUMENT_EXP_FALLOFF_MIN + data["sustain_mode_max"] = INSTRUMENT_EXP_FALLOFF_MAX + data["instrument_ready"] = using_instrument?.ready() + data["volume"] = volume + data["volume_dropoff_threshold"] = sustain_dropoff_volume + data["sustain_indefinitely"] = full_sustain_held_note + data["playing"] = playing + data["repeat"] = repeat + data["bpm"] = round(60 SECONDS / tempo) + data["lines"] = list() + var/linecount + for(var/line in lines) + linecount++ + data["lines"] += list(list( + "line_count" = linecount, + "line_text" = line, + )) + return data -/datum/song/proc/interact(mob/user) - var/list/dat = list() +/datum/song/tgui_static_data(mob/user) + var/list/data = ..() + data["can_switch_instrument"] = (length(allowed_instrument_ids) > 1) + data["possible_instruments"] = list() + for(var/instrument in allowed_instrument_ids) + UNTYPED_LIST_ADD(data["possible_instruments"], list("name" = SSinstruments.instrument_data[instrument], "id" = instrument)) + data["sustain_modes"] = SSinstruments.note_sustain_modes + data["max_repeats"] = max_repeats + data["min_volume"] = min_volume + data["max_volume"] = max_volume + data["note_shift_min"] = note_shift_min + data["note_shift_max"] = note_shift_max + data["max_line_chars"] = MUSIC_MAXLINECHARS + data["max_lines"] = MUSIC_MAXLINES + return data - dat += instrument_status_ui() +/datum/song/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + . = ..() + var/mob/user = ui.user + if(!istype(user)) + return FALSE - if(lines.len > 0) - dat += "

Playback

" - if(!playing) - dat += "Play " + span_linkOn("Stop") + "

" - dat += "Repeat Song: " - dat += repeat > 0 ? "--" : (span_linkOff("-") + span_linkOff("-")) - dat += " [repeat] times " - dat += repeat < max_repeats ? "++" : (span_linkOff("+") + span_linkOff("+")) - dat += "
" - else - dat += span_linkOn("Play") + " Stop
" - dat += "Repeats left: " + span_bold("[repeat]") + "
" - if(!editing) - dat += "
" + span_bold("Show Editor") + "
" - else - dat += "

Editing

" - dat += span_bold("Hide Editor") - dat += " Start a New Song" - dat += " Import a Song

" - var/bpm = round(600 / tempo) - dat += "Tempo: - [bpm] BPM +

" - var/linecount = 0 - for(var/line in lines) - linecount += 1 - dat += "Line [linecount]: Edit X [line]
" - dat += "Add Line

" - if(help) - dat += span_bold("Hide Help") + "
" - dat += {" - Lines are a series of chords, separated by commas (,), each with notes separated by hyphens (-).
- Every note in a chord will play together, with chord timed by the tempo.
-
- Notes are played by the names of the note, and optionally, the accidental, and/or the octave number.
- By default, every note is natural and in octave 3. Defining otherwise is remembered for each note.
- Example: C,D,E,F,G,A,B will play a C major scale.
- After a note has an accidental placed, it will be remembered: C,C4,C,C3 is C3,C4,C4,C3
- Chords can be played simply by separating each note with a hyphen: A-C#,Cn-E,E-G#,Gn-B
- A pause may be denoted by an empty chord: C,E,,C,G
- To make a chord be a different time, end it with /x, where the chord length will be length
- defined by tempo / x: C,G/2,E/4
- Combined, an example is: E-E4/4,F#/2,G#/8,B/8,E3-E4/4 -
- Lines may be up to [MUSIC_MAXLINECHARS] characters.
- A song may only contain up to [MUSIC_MAXLINES] lines.
- "} - else - dat += span_bold("Show Help") + "
" + switch(action) + //SETTINGS + if("play_music") + if(!playing) + INVOKE_ASYNC(src, PROC_REF(start_playing), user) + else + stop_playing() + return TRUE + if("set_instrument_id") + var/new_id = reject_bad_name(LOWER_TEXT(params["id"]), max_length = 20, allow_numbers = TRUE, cap_after_symbols = FALSE) + if(new_id) + id = new_id + return TRUE + if("change_instrument") + var/new_instrument = params["new_instrument"] + //only one instrument, so no need to bother changing it. + if(!length(allowed_instrument_ids)) + return FALSE + if(!(new_instrument in allowed_instrument_ids)) + return FALSE + set_instrument(new_instrument) + return TRUE + if("tempo") + var/move_direction = params["tempo_change"] + var/tempo_diff + if(move_direction == "increase_speed") + tempo_diff = world.tick_lag + else + tempo_diff = -world.tick_lag + tempo = sanitize_tempo(tempo + tempo_diff) + return TRUE - var/datum/browser/popup = new(user, "instrument", parent?.name || "instrument", 700, 500) - popup.set_content(dat.Join("")) - popup.open() + //SONG MAKING + if("import_song") + var/song_text = "" + do + song_text = tgui_input_text(user, "Please paste the entire song, formatted:", name, max_length = (MUSIC_MAXLINES * MUSIC_MAXLINECHARS), multiline = TRUE) + if(!in_range(parent, user)) + return + + if(length_char(song_text) >= MUSIC_MAXLINES * MUSIC_MAXLINECHARS) + var/should_continue = tgui_alert(user, "Your message is too long! Would you like to continue editing it?", "Warning", list("Yes", "No")) + if(should_continue != "Yes") + break + while(length_char(song_text) > MUSIC_MAXLINES * MUSIC_MAXLINECHARS) + ParseSong(user, song_text) + return TRUE + if("start_new_song") + name = "" + lines = new() + tempo = sanitize_tempo(5) // default 120 BPM + return TRUE + if("add_new_line") + var/newline = tgui_input_text(user, "Enter your line", parent.name, max_length = MUSIC_MAXLINECHARS) + if(!newline || !in_range(parent, user)) + return + if(lines.len > MUSIC_MAXLINES) + return + if(length(newline) > MUSIC_MAXLINECHARS) + newline = copytext(newline, 1, MUSIC_MAXLINECHARS) + lines.Add(newline) + if("delete_line") + var/line_to_delete = params["line_deleted"] + if(line_to_delete > lines.len || line_to_delete < 1) + return FALSE + lines.Cut(line_to_delete, line_to_delete + 1) + return TRUE + if("modify_line") + var/line_to_edit = params["line_editing"] + if(line_to_edit > lines.len || line_to_edit < 1) + return FALSE + var/new_line_text = tgui_input_text(user, "Enter your line ", parent.name, lines[line_to_edit], max_length = MUSIC_MAXLINECHARS) + if(isnull(new_line_text) || !in_range(parent, user)) + return FALSE + lines[line_to_edit] = new_line_text + return TRUE + + //MODE STUFF + if("set_sustain_mode") + var/new_mode = params["new_mode"] + if(isnull(new_mode) || !(new_mode in SSinstruments.note_sustain_modes)) + return FALSE + sustain_mode = new_mode + return TRUE + if("set_note_shift") + var/amount = params["amount"] + if(!isnum(amount)) + return FALSE + note_shift = clamp(amount, note_shift_min, note_shift_max) + return TRUE + if("set_volume") + var/new_volume = params["amount"] + if(!isnum(new_volume)) + return FALSE + set_volume(new_volume) + return TRUE + if("set_dropoff_volume") + var/dropoff_threshold = params["amount"] + if(!isnum(dropoff_threshold)) + return FALSE + set_dropoff_volume(dropoff_threshold) + return TRUE + if("toggle_sustain_hold_indefinitely") + full_sustain_held_note = !full_sustain_held_note + return TRUE + if("set_repeat_amount") + if(playing) + return + var/repeat_amount = params["amount"] + if(!isnum(repeat_amount)) + return FALSE + set_repeats(repeat_amount) + return TRUE + if("edit_sustain_mode") + var/sustain_amount = params["amount"] + if(isnull(sustain_amount) || !isnum(sustain_amount)) + return + switch(sustain_mode) + if(SUSTAIN_LINEAR) + set_linear_falloff_duration(sustain_amount) + if(SUSTAIN_EXPONENTIAL) + set_exponential_drop_rate(sustain_amount) /** * Parses a song the user has input into lines and stores them. */ -/datum/song/proc/ParseSong(text) +/datum/song/proc/ParseSong(mob/user, new_song) set waitfor = FALSE //split into lines - lines = splittext(text, "\n") + lines = islist(new_song) ? new_song : splittext(new_song, "\n") if(lines.len) var/bpm_string = "BPM: " if(findtext(lines[1], bpm_string, 1, length(bpm_string) + 1)) var/divisor = text2num(copytext(lines[1], length(bpm_string) + 1)) || 120 // default - tempo = sanitize_tempo(600 / round(divisor, 1)) + tempo = sanitize_tempo(BPM_TO_TEMPO_SETTING(divisor)) lines.Cut(1, 2) else tempo = sanitize_tempo(5) // default 120 BPM if(lines.len > MUSIC_MAXLINES) - to_chat(usr, "Too many lines!") + if(user) + to_chat(user, "Too many lines!") lines.Cut(MUSIC_MAXLINES + 1) var/linenum = 1 for(var/l in lines) if(length_char(l) > MUSIC_MAXLINECHARS) - to_chat(usr, "Line [linenum] too long!") + if(user) + to_chat(user, "Line [linenum] too long!") lines.Remove(l) else linenum++ - updateDialog(usr) // make sure updates when complete - -/datum/song/Topic(href, href_list) - if(!parent.CanUseTopic(usr)) - usr << browse(null, "window=instrument") - usr.unset_machine() - return - - parent.add_fingerprint(usr) - - if(href_list["newsong"]) - lines = new() - tempo = sanitize_tempo(5) // default 120 BPM - name = "" - - else if(href_list["import"]) - var/t = "" - do - t = tgui_input_text(usr, "Please paste the entire song, formatted:", text("[]", name), t, multiline = TRUE, prevent_enter = TRUE) - if(!in_range(parent, usr)) - return - - if(length_char(t) >= MUSIC_MAXLINES * MUSIC_MAXLINECHARS) - var/cont = tgui_alert(usr, "Your message is too long! Would you like to continue editing it?", "Too long!", list("Yes", "No")) - if(cont != "Yes") - break - while(length_char(t) > MUSIC_MAXLINES * MUSIC_MAXLINECHARS) - ParseSong(t) - - else if(href_list["help"]) - help = text2num(href_list["help"]) - 1 - - else if(href_list["edit"]) - editing = text2num(href_list["edit"]) - 1 - - if(href_list["repeat"]) //Changing this from a toggle to a number of repeats to avoid infinite loops. - if(playing) - return //So that people cant keep adding to repeat. If the do it intentionally, it could result in the server crashing. - repeat += round(text2num(href_list["repeat"])) - if(repeat < 0) - repeat = 0 - if(repeat > max_repeats) - repeat = max_repeats - - else if(href_list["tempo"]) - tempo = sanitize_tempo(tempo + text2num(href_list["tempo"])) - - else if(href_list["play"]) - INVOKE_ASYNC(src, PROC_REF(start_playing), usr) - - else if(href_list["newline"]) - var/newline = tgui_input_text(usr, "Enter your line: ", parent.name) - if(!newline || !in_range(parent, usr)) - return - if(lines.len > MUSIC_MAXLINES) - return - if(length(newline) > MUSIC_MAXLINECHARS) - newline = copytext(newline, 1, MUSIC_MAXLINECHARS) - lines.Add(newline) - - else if(href_list["deleteline"]) - var/num = round(text2num(href_list["deleteline"])) - if(num > lines.len || num < 1) - return - lines.Cut(num, num+1) - - else if(href_list["modifyline"]) - var/num = round(text2num(href_list["modifyline"]),1) - var/content = tgui_input_text(usr, "Enter your line: ", parent.name, lines[num], MUSIC_MAXLINECHARS, encode=TRUE) - if(!content || !in_range(parent, usr)) - return - if(num > lines.len || num < 1) - return - lines[num] = content - - else if(href_list["stop"]) - stop_playing() - - else if(href_list["setlinearfalloff"]) - var/amount = tgui_input_number(usr, "Set linear sustain duration in seconds", "Linear Sustain Duration", round_value=FALSE) - if(!isnull(amount)) - set_linear_falloff_duration(round(amount * 10, world.tick_lag)) - - else if(href_list["setexpfalloff"]) - var/amount = tgui_input_number(usr, "Set exponential sustain factor", "Exponential sustain factor", round_value=FALSE) - if(!isnull(amount)) - set_exponential_drop_rate(round(amount, 0.00001)) - - else if(href_list["setvolume"]) - var/amount = tgui_input_number(usr, "Set volume", "Volume") - if(!isnull(amount)) - set_volume(round(amount, 1)) - - else if(href_list["setdropoffvolume"]) - var/amount = tgui_input_number(usr, "Set dropoff threshold", "Dropoff Threshold Volume", round_value=FALSE) - if(!isnull(amount)) - set_dropoff_volume(round(amount, 0.01)) - - else if(href_list["switchinstrument"]) - if(!length(allowed_instrument_ids)) - return - else if(length(allowed_instrument_ids) == 1) - set_instrument(allowed_instrument_ids[1]) - return - var/list/categories = list() - for(var/i in allowed_instrument_ids) - var/datum/instrument/I = SSinstruments.get_instrument(i) - if(I) - LAZYSET(categories[I.category || "ERROR CATEGORY"], I.name, I.id) - var/cat = tgui_input_list(usr, "Select Category", "Instrument Category", categories) - if(!cat) - return - var/list/instruments = categories[cat] - var/choice = tgui_input_list(usr, "Select Instrument", "Instrument Selection", instruments) - if(!choice) - return - choice = instruments[choice] //get id - if(choice) - set_instrument(choice) - - else if(href_list["setnoteshift"]) - var/amount = tgui_input_number(usr, "Set note shift", "Note Shift", null, note_shift_max, note_shift_min) - if(!isnull(amount)) - note_shift = clamp(amount, note_shift_min, note_shift_max) - - else if(href_list["setsustainmode"]) - var/choice = tgui_input_list(usr, "Choose a sustain mode", "Sustain Mode", list("Linear", "Exponential")) - switch(choice) - if("Linear") - sustain_mode = SUSTAIN_LINEAR - if("Exponential") - sustain_mode = SUSTAIN_EXPONENTIAL - - else if(href_list["togglesustainhold"]) - full_sustain_held_note = !full_sustain_held_note - - updateDialog() diff --git a/code/modules/instruments/songs/play_legacy.dm b/code/modules/instruments/songs/play_legacy.dm index 13c3b74453..58dcf86149 100644 --- a/code/modules/instruments/songs/play_legacy.dm +++ b/code/modules/instruments/songs/play_legacy.dm @@ -9,7 +9,7 @@ var/list/octaves = list(3, 3, 3, 3, 3, 3, 3) var/list/accents = list("n", "n", "n", "n", "n", "n", "n") for(var/line in lines) - var/list/chords = splittext(lowertext(line), ",") + var/list/chords = splittext(LOWER_TEXT(line), ",") for(var/chord in chords) var/list/compiled_chord = list() var/tempodiv = 1 @@ -46,7 +46,7 @@ * * acc is either "b", "n", or "#" * * oct is 1-8 (or 9 for C) */ -/datum/song/proc/playkey_legacy(note, acc as text, oct, mob/user) +/datum/song/proc/playkey_legacy(note, acc as text, oct, atom/player) // handle accidental -> B<>C of E<>F if(acc == "b" && (note == 3 || note == 6)) // C or F if(note == 3) @@ -70,7 +70,7 @@ return // now generate name - var/soundfile = "sound/instruments/[cached_legacy_dir]/[ascii2text(note+64)][acc][oct].[cached_legacy_ext]" + var/soundfile = "sound/runtime/instruments/[cached_legacy_dir]/[ascii2text(note+64)][acc][oct].[cached_legacy_ext]" soundfile = file(soundfile) // make sure the note exists if(!fexists(soundfile)) @@ -80,14 +80,13 @@ if((world.time - MUSICIAN_HEARCHECK_MINDELAY) > last_hearcheck) do_hearcheck() var/sound/music_played = sound(soundfile) - for(var/mob/M as anything in hearing_mobs) - /* Would be nice - if(user && HAS_TRAIT(user, TRAIT_MUSICIAN) && isliving(M)) - var/mob/living/L = M - L.apply_status_effect(STATUS_EFFECT_GOOD_MUSIC) - */ - if(!M) - hearing_mobs -= M + for(var/i in hearing_mobs) + var/mob/M = i + //if(player && HAS_TRAIT(player, TRAIT_MUSICIAN) && isliving(M)) + // var/mob/living/L = M + // L.apply_status_effect(/datum/status_effect/good_music) + var/pref_volume = M?.client?.prefs.read_preference(/datum/preference/numeric/volume/sound_instruments) + if(!pref_volume) continue - M.playsound_local(source, null, volume * using_instrument.volume_multiplier, S = music_played, preference = /datum/preference/toggle/instrument_toggle, volume_channel = VOLUME_CHANNEL_INSTRUMENTS) + M.playsound_local(source, null, volume * using_instrument.volume_multiplier * (pref_volume/100), S = music_played) // Could do environment and echo later but not for now diff --git a/code/modules/instruments/songs/play_synthesized.dm b/code/modules/instruments/songs/play_synthesized.dm index bbabdb9370..2fcf079437 100644 --- a/code/modules/instruments/songs/play_synthesized.dm +++ b/code/modules/instruments/songs/play_synthesized.dm @@ -9,7 +9,7 @@ var/list/octaves = list(3, 3, 3, 3, 3, 3, 3) var/list/accents = list("n", "n", "n", "n", "n", "n", "n") for(var/line in lines) - var/list/chords = splittext(lowertext(line), ",") + var/list/chords = splittext(LOWER_TEXT(line), ",") for(var/chord in chords) var/list/compiled_chord = list() var/tempodiv = 1 @@ -42,9 +42,8 @@ * Plays a specific numerical key from our instrument to anyone who can hear us. * Does a hearing check if enough time has passed. */ -/datum/song/proc/playkey_synth(key, mob/user) - if(can_noteshift) - key = clamp(key + note_shift, key_min, key_max) +/datum/song/proc/playkey_synth(key, atom/player) + key = clamp(key + note_shift, key_min, key_max) if((world.time - MUSICIAN_HEARCHECK_MINDELAY) > last_hearcheck) do_hearcheck() var/datum/instrument_key/K = using_instrument.samples[num2text(key)] //See how fucking easy it is to make a number text? You don't need a complicated 9 line proc! @@ -60,27 +59,15 @@ var/channel_text = num2text(channel) channels_playing[channel_text] = 100 last_channel_played = channel_text - var/turf/source = get_turf(parent) - for(var/mob/M as anything in hearing_mobs) - /* Maybe someday - if(user && HAS_TRAIT(user, TRAIT_MUSICIAN) && isliving(M)) - var/mob/living/L = M - L.apply_status_effect(STATUS_EFFECT_GOOD_MUSIC) - */ - // Jeez - M.playsound_local( - turf_source = source, - soundin = null, - vol = volume, - vary = FALSE, - frequency = K.frequency, - falloff = null, - is_global = null, - channel = channel, - pressure_affected = null, - S = copy, - preference = /datum/preference/toggle/instrument_toggle, - volume_channel = VOLUME_CHANNEL_INSTRUMENTS) + for(var/i in hearing_mobs) + var/mob/M = i + //if(player && HAS_TRAIT(player, TRAIT_MUSICIAN) && isliving(M)) + // var/mob/living/L = M + // L.apply_status_effect(/datum/status_effect/good_music) + var/pref_volume = M?.client?.prefs.read_preference(/datum/preference/numeric/volume/sound_instruments) + if(!pref_volume) + continue + M.playsound_local(get_turf(parent), null, volume * (pref_volume/100), FALSE, K.frequency, null, channel, null, copy) // Could do environment and echo later but not for now /** @@ -141,8 +128,10 @@ if(dead) channels_playing -= channel channels_idle += channel - for(var/mob/M in hearing_mobs) + for(var/i in hearing_mobs) + var/mob/M = i M.stop_sound_channel(channelnumber) else - for(var/mob/M in hearing_mobs) + for(var/i in hearing_mobs) + var/mob/M = i M.set_sound_channel_volume(channelnumber, (current_volume * 0.01) * volume * using_instrument.volume_multiplier) diff --git a/code/modules/instruments/stationary.dm b/code/modules/instruments/stationary.dm index 67cd3dbf83..d2d83fd9a0 100644 --- a/code/modules/instruments/stationary.dm +++ b/code/modules/instruments/stationary.dm @@ -1,9 +1,12 @@ /obj/structure/musician name = "Not A Piano" desc = "Something broke, contact coderbus." + /// IF FALSE music stops when the piano is unanchored. var/can_play_unanchored = FALSE + /// Our allowed list of instrument ids. This is nulled on initialize. var/list/allowed_instrument_ids = list("r3grand","r3harpsi","crharpsi","crgrand1","crbright1", "crichugan", "crihamgan","piano") - var/datum/song/song + /// Our song datum. + var/datum/song/stationary/song /obj/structure/musician/Initialize(mapload) . = ..() @@ -14,46 +17,62 @@ QDEL_NULL(song) return ..() +/obj/structure/musician/proc/can_play(atom/music_player) + if(!anchored && !can_play_unanchored) + return FALSE + if(!ismob(music_player)) + return FALSE + var/mob/user = music_player + if(!user.IsAdvancedToolUser()) + return FALSE + if(user.incapacitated()) + return FALSE + if(!Adjacent(user)) + return FALSE + return TRUE + /obj/structure/musician/attack_hand(mob/M) if(!M.IsAdvancedToolUser()) return - interact(M) + tgui_interact(M) -/obj/structure/musician/proc/should_stop_playing(mob/user) - if(!(anchored || can_play_unanchored)) - return TRUE - if(!user) - return FALSE - return !CanUseTopic(user) +/obj/structure/musician/tgui_interact(mob/user) + return song.tgui_interact(user) -/obj/structure/musician/interact(mob/user) +/* FIXME +/obj/structure/musician/wrench_act(mob/living/user, obj/item/tool) . = ..() - song.interact(user) - -/* -/obj/structure/musician/wrench_act(mob/living/user, obj/item/I) - default_unfasten_wrench(user, I, 40) - return TRUE + default_unfasten_wrench(user, tool, time = 4 SECONDS) + return ITEM_INTERACT_SUCCESS */ /obj/structure/musician/piano - name = "space minimoog" + name = "space piano" + desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't." icon = 'icons/obj/musician.dmi' icon_state = "minimoog" anchored = TRUE density = TRUE + var/broken_icon_state = "pianobroken" + +/obj/structure/musician/piano/Initialize(mapload) + . = ..() + AddElement(/datum/element/climbable) + +/** FIXME: We do not have atom_break implemented yet +/obj/structure/musician/piano/atom_break(damage_flag) + . = ..() + if(!broken) + broken = TRUE + icon_state = broken_icon_state +*/ /obj/structure/musician/piano/unanchored anchored = FALSE -/obj/structure/musician/piano/Initialize(mapload) - . = ..() - if(prob(50) && icon_state == initial(icon_state)) - name = "space minimoog" - desc = "This is a minimoog, like a space piano, but more spacey!" - icon_state = "minimoog" - else - name = "space piano" - desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't." - icon_state = "piano" +/obj/structure/musician/piano/minimoog + name = "space minimoog" + desc = "This is a minimoog, like a space piano, but more spacey!" + icon_state = "minimoog" + broken_icon_state = "minimoogbroken" diff --git a/sound/runtime/README.md b/sound/runtime/README.md new file mode 100644 index 0000000000..07bacb9ad7 --- /dev/null +++ b/sound/runtime/README.md @@ -0,0 +1,5 @@ +# Runtime Loaded Sounds + +These sounds are not compiled into the .rsc or are otherwise loaded at runtime. + +Please keep all (non-config) sounds that do this in this folder as it is needed by the [deploy.sh](../../tools/deploy.sh) script to minimize build output. diff --git a/sound/instruments/accordion/Ab2.mid b/sound/runtime/instruments/accordion/Ab2.mid similarity index 100% rename from sound/instruments/accordion/Ab2.mid rename to sound/runtime/instruments/accordion/Ab2.mid diff --git a/sound/instruments/accordion/Ab3.mid b/sound/runtime/instruments/accordion/Ab3.mid similarity index 100% rename from sound/instruments/accordion/Ab3.mid rename to sound/runtime/instruments/accordion/Ab3.mid diff --git a/sound/instruments/accordion/Ab4.mid b/sound/runtime/instruments/accordion/Ab4.mid similarity index 100% rename from sound/instruments/accordion/Ab4.mid rename to sound/runtime/instruments/accordion/Ab4.mid diff --git a/sound/instruments/accordion/Ab5.mid b/sound/runtime/instruments/accordion/Ab5.mid similarity index 100% rename from sound/instruments/accordion/Ab5.mid rename to sound/runtime/instruments/accordion/Ab5.mid diff --git a/sound/instruments/accordion/Ab6.mid b/sound/runtime/instruments/accordion/Ab6.mid similarity index 100% rename from sound/instruments/accordion/Ab6.mid rename to sound/runtime/instruments/accordion/Ab6.mid diff --git a/sound/instruments/accordion/An2.mid b/sound/runtime/instruments/accordion/An2.mid similarity index 100% rename from sound/instruments/accordion/An2.mid rename to sound/runtime/instruments/accordion/An2.mid diff --git a/sound/instruments/accordion/An3.mid b/sound/runtime/instruments/accordion/An3.mid similarity index 100% rename from sound/instruments/accordion/An3.mid rename to sound/runtime/instruments/accordion/An3.mid diff --git a/sound/instruments/accordion/An4.mid b/sound/runtime/instruments/accordion/An4.mid similarity index 100% rename from sound/instruments/accordion/An4.mid rename to sound/runtime/instruments/accordion/An4.mid diff --git a/sound/instruments/accordion/An5.mid b/sound/runtime/instruments/accordion/An5.mid similarity index 100% rename from sound/instruments/accordion/An5.mid rename to sound/runtime/instruments/accordion/An5.mid diff --git a/sound/instruments/accordion/An6.mid b/sound/runtime/instruments/accordion/An6.mid similarity index 100% rename from sound/instruments/accordion/An6.mid rename to sound/runtime/instruments/accordion/An6.mid diff --git a/sound/instruments/accordion/Bb2.mid b/sound/runtime/instruments/accordion/Bb2.mid similarity index 100% rename from sound/instruments/accordion/Bb2.mid rename to sound/runtime/instruments/accordion/Bb2.mid diff --git a/sound/instruments/accordion/Bb3.mid b/sound/runtime/instruments/accordion/Bb3.mid similarity index 100% rename from sound/instruments/accordion/Bb3.mid rename to sound/runtime/instruments/accordion/Bb3.mid diff --git a/sound/instruments/accordion/Bb4.mid b/sound/runtime/instruments/accordion/Bb4.mid similarity index 100% rename from sound/instruments/accordion/Bb4.mid rename to sound/runtime/instruments/accordion/Bb4.mid diff --git a/sound/instruments/accordion/Bb5.mid b/sound/runtime/instruments/accordion/Bb5.mid similarity index 100% rename from sound/instruments/accordion/Bb5.mid rename to sound/runtime/instruments/accordion/Bb5.mid diff --git a/sound/instruments/accordion/Bb6.mid b/sound/runtime/instruments/accordion/Bb6.mid similarity index 100% rename from sound/instruments/accordion/Bb6.mid rename to sound/runtime/instruments/accordion/Bb6.mid diff --git a/sound/instruments/accordion/Bn2.mid b/sound/runtime/instruments/accordion/Bn2.mid similarity index 100% rename from sound/instruments/accordion/Bn2.mid rename to sound/runtime/instruments/accordion/Bn2.mid diff --git a/sound/instruments/accordion/Bn3.mid b/sound/runtime/instruments/accordion/Bn3.mid similarity index 100% rename from sound/instruments/accordion/Bn3.mid rename to sound/runtime/instruments/accordion/Bn3.mid diff --git a/sound/instruments/accordion/Bn4.mid b/sound/runtime/instruments/accordion/Bn4.mid similarity index 100% rename from sound/instruments/accordion/Bn4.mid rename to sound/runtime/instruments/accordion/Bn4.mid diff --git a/sound/instruments/accordion/Bn5.mid b/sound/runtime/instruments/accordion/Bn5.mid similarity index 100% rename from sound/instruments/accordion/Bn5.mid rename to sound/runtime/instruments/accordion/Bn5.mid diff --git a/sound/instruments/accordion/Bn6.mid b/sound/runtime/instruments/accordion/Bn6.mid similarity index 100% rename from sound/instruments/accordion/Bn6.mid rename to sound/runtime/instruments/accordion/Bn6.mid diff --git a/sound/instruments/accordion/Cn2.mid b/sound/runtime/instruments/accordion/Cn2.mid similarity index 100% rename from sound/instruments/accordion/Cn2.mid rename to sound/runtime/instruments/accordion/Cn2.mid diff --git a/sound/instruments/accordion/Cn3.mid b/sound/runtime/instruments/accordion/Cn3.mid similarity index 100% rename from sound/instruments/accordion/Cn3.mid rename to sound/runtime/instruments/accordion/Cn3.mid diff --git a/sound/instruments/accordion/Cn4.mid b/sound/runtime/instruments/accordion/Cn4.mid similarity index 100% rename from sound/instruments/accordion/Cn4.mid rename to sound/runtime/instruments/accordion/Cn4.mid diff --git a/sound/instruments/accordion/Cn5.mid b/sound/runtime/instruments/accordion/Cn5.mid similarity index 100% rename from sound/instruments/accordion/Cn5.mid rename to sound/runtime/instruments/accordion/Cn5.mid diff --git a/sound/instruments/accordion/Cn6.mid b/sound/runtime/instruments/accordion/Cn6.mid similarity index 100% rename from sound/instruments/accordion/Cn6.mid rename to sound/runtime/instruments/accordion/Cn6.mid diff --git a/sound/instruments/accordion/Db2.mid b/sound/runtime/instruments/accordion/Db2.mid similarity index 100% rename from sound/instruments/accordion/Db2.mid rename to sound/runtime/instruments/accordion/Db2.mid diff --git a/sound/instruments/accordion/Db3.mid b/sound/runtime/instruments/accordion/Db3.mid similarity index 100% rename from sound/instruments/accordion/Db3.mid rename to sound/runtime/instruments/accordion/Db3.mid diff --git a/sound/instruments/accordion/Db4.mid b/sound/runtime/instruments/accordion/Db4.mid similarity index 100% rename from sound/instruments/accordion/Db4.mid rename to sound/runtime/instruments/accordion/Db4.mid diff --git a/sound/instruments/accordion/Db5.mid b/sound/runtime/instruments/accordion/Db5.mid similarity index 100% rename from sound/instruments/accordion/Db5.mid rename to sound/runtime/instruments/accordion/Db5.mid diff --git a/sound/instruments/accordion/Db6.mid b/sound/runtime/instruments/accordion/Db6.mid similarity index 100% rename from sound/instruments/accordion/Db6.mid rename to sound/runtime/instruments/accordion/Db6.mid diff --git a/sound/instruments/accordion/Dn2.mid b/sound/runtime/instruments/accordion/Dn2.mid similarity index 100% rename from sound/instruments/accordion/Dn2.mid rename to sound/runtime/instruments/accordion/Dn2.mid diff --git a/sound/instruments/accordion/Dn3.mid b/sound/runtime/instruments/accordion/Dn3.mid similarity index 100% rename from sound/instruments/accordion/Dn3.mid rename to sound/runtime/instruments/accordion/Dn3.mid diff --git a/sound/instruments/accordion/Dn4.mid b/sound/runtime/instruments/accordion/Dn4.mid similarity index 100% rename from sound/instruments/accordion/Dn4.mid rename to sound/runtime/instruments/accordion/Dn4.mid diff --git a/sound/instruments/accordion/Dn5.mid b/sound/runtime/instruments/accordion/Dn5.mid similarity index 100% rename from sound/instruments/accordion/Dn5.mid rename to sound/runtime/instruments/accordion/Dn5.mid diff --git a/sound/instruments/accordion/Dn6.mid b/sound/runtime/instruments/accordion/Dn6.mid similarity index 100% rename from sound/instruments/accordion/Dn6.mid rename to sound/runtime/instruments/accordion/Dn6.mid diff --git a/sound/instruments/accordion/Eb2.mid b/sound/runtime/instruments/accordion/Eb2.mid similarity index 100% rename from sound/instruments/accordion/Eb2.mid rename to sound/runtime/instruments/accordion/Eb2.mid diff --git a/sound/instruments/accordion/Eb3.mid b/sound/runtime/instruments/accordion/Eb3.mid similarity index 100% rename from sound/instruments/accordion/Eb3.mid rename to sound/runtime/instruments/accordion/Eb3.mid diff --git a/sound/instruments/accordion/Eb4.mid b/sound/runtime/instruments/accordion/Eb4.mid similarity index 100% rename from sound/instruments/accordion/Eb4.mid rename to sound/runtime/instruments/accordion/Eb4.mid diff --git a/sound/instruments/accordion/Eb5.mid b/sound/runtime/instruments/accordion/Eb5.mid similarity index 100% rename from sound/instruments/accordion/Eb5.mid rename to sound/runtime/instruments/accordion/Eb5.mid diff --git a/sound/instruments/accordion/Eb6.mid b/sound/runtime/instruments/accordion/Eb6.mid similarity index 100% rename from sound/instruments/accordion/Eb6.mid rename to sound/runtime/instruments/accordion/Eb6.mid diff --git a/sound/instruments/accordion/En2.mid b/sound/runtime/instruments/accordion/En2.mid similarity index 100% rename from sound/instruments/accordion/En2.mid rename to sound/runtime/instruments/accordion/En2.mid diff --git a/sound/instruments/accordion/En3.mid b/sound/runtime/instruments/accordion/En3.mid similarity index 100% rename from sound/instruments/accordion/En3.mid rename to sound/runtime/instruments/accordion/En3.mid diff --git a/sound/instruments/accordion/En4.mid b/sound/runtime/instruments/accordion/En4.mid similarity index 100% rename from sound/instruments/accordion/En4.mid rename to sound/runtime/instruments/accordion/En4.mid diff --git a/sound/instruments/accordion/En5.mid b/sound/runtime/instruments/accordion/En5.mid similarity index 100% rename from sound/instruments/accordion/En5.mid rename to sound/runtime/instruments/accordion/En5.mid diff --git a/sound/instruments/accordion/En6.mid b/sound/runtime/instruments/accordion/En6.mid similarity index 100% rename from sound/instruments/accordion/En6.mid rename to sound/runtime/instruments/accordion/En6.mid diff --git a/sound/instruments/accordion/Fn2.mid b/sound/runtime/instruments/accordion/Fn2.mid similarity index 100% rename from sound/instruments/accordion/Fn2.mid rename to sound/runtime/instruments/accordion/Fn2.mid diff --git a/sound/instruments/accordion/Fn3.mid b/sound/runtime/instruments/accordion/Fn3.mid similarity index 100% rename from sound/instruments/accordion/Fn3.mid rename to sound/runtime/instruments/accordion/Fn3.mid diff --git a/sound/instruments/accordion/Fn4.mid b/sound/runtime/instruments/accordion/Fn4.mid similarity index 100% rename from sound/instruments/accordion/Fn4.mid rename to sound/runtime/instruments/accordion/Fn4.mid diff --git a/sound/instruments/accordion/Fn5.mid b/sound/runtime/instruments/accordion/Fn5.mid similarity index 100% rename from sound/instruments/accordion/Fn5.mid rename to sound/runtime/instruments/accordion/Fn5.mid diff --git a/sound/instruments/accordion/Fn6.mid b/sound/runtime/instruments/accordion/Fn6.mid similarity index 100% rename from sound/instruments/accordion/Fn6.mid rename to sound/runtime/instruments/accordion/Fn6.mid diff --git a/sound/instruments/accordion/Gb2.mid b/sound/runtime/instruments/accordion/Gb2.mid similarity index 100% rename from sound/instruments/accordion/Gb2.mid rename to sound/runtime/instruments/accordion/Gb2.mid diff --git a/sound/instruments/accordion/Gb3.mid b/sound/runtime/instruments/accordion/Gb3.mid similarity index 100% rename from sound/instruments/accordion/Gb3.mid rename to sound/runtime/instruments/accordion/Gb3.mid diff --git a/sound/instruments/accordion/Gb4.mid b/sound/runtime/instruments/accordion/Gb4.mid similarity index 100% rename from sound/instruments/accordion/Gb4.mid rename to sound/runtime/instruments/accordion/Gb4.mid diff --git a/sound/instruments/accordion/Gb5.mid b/sound/runtime/instruments/accordion/Gb5.mid similarity index 100% rename from sound/instruments/accordion/Gb5.mid rename to sound/runtime/instruments/accordion/Gb5.mid diff --git a/sound/instruments/accordion/Gb6.mid b/sound/runtime/instruments/accordion/Gb6.mid similarity index 100% rename from sound/instruments/accordion/Gb6.mid rename to sound/runtime/instruments/accordion/Gb6.mid diff --git a/sound/instruments/accordion/Gn2.mid b/sound/runtime/instruments/accordion/Gn2.mid similarity index 100% rename from sound/instruments/accordion/Gn2.mid rename to sound/runtime/instruments/accordion/Gn2.mid diff --git a/sound/instruments/accordion/Gn3.mid b/sound/runtime/instruments/accordion/Gn3.mid similarity index 100% rename from sound/instruments/accordion/Gn3.mid rename to sound/runtime/instruments/accordion/Gn3.mid diff --git a/sound/instruments/accordion/Gn4.mid b/sound/runtime/instruments/accordion/Gn4.mid similarity index 100% rename from sound/instruments/accordion/Gn4.mid rename to sound/runtime/instruments/accordion/Gn4.mid diff --git a/sound/instruments/accordion/Gn5.mid b/sound/runtime/instruments/accordion/Gn5.mid similarity index 100% rename from sound/instruments/accordion/Gn5.mid rename to sound/runtime/instruments/accordion/Gn5.mid diff --git a/sound/instruments/accordion/Gn6.mid b/sound/runtime/instruments/accordion/Gn6.mid similarity index 100% rename from sound/instruments/accordion/Gn6.mid rename to sound/runtime/instruments/accordion/Gn6.mid diff --git a/sound/instruments/banjo/Ab3.ogg b/sound/runtime/instruments/banjo/Ab3.ogg similarity index 100% rename from sound/instruments/banjo/Ab3.ogg rename to sound/runtime/instruments/banjo/Ab3.ogg diff --git a/sound/instruments/banjo/Ab4.ogg b/sound/runtime/instruments/banjo/Ab4.ogg similarity index 100% rename from sound/instruments/banjo/Ab4.ogg rename to sound/runtime/instruments/banjo/Ab4.ogg diff --git a/sound/instruments/banjo/Ab5.ogg b/sound/runtime/instruments/banjo/Ab5.ogg similarity index 100% rename from sound/instruments/banjo/Ab5.ogg rename to sound/runtime/instruments/banjo/Ab5.ogg diff --git a/sound/instruments/banjo/An3.ogg b/sound/runtime/instruments/banjo/An3.ogg similarity index 100% rename from sound/instruments/banjo/An3.ogg rename to sound/runtime/instruments/banjo/An3.ogg diff --git a/sound/instruments/banjo/An4.ogg b/sound/runtime/instruments/banjo/An4.ogg similarity index 100% rename from sound/instruments/banjo/An4.ogg rename to sound/runtime/instruments/banjo/An4.ogg diff --git a/sound/instruments/banjo/An5.ogg b/sound/runtime/instruments/banjo/An5.ogg similarity index 100% rename from sound/instruments/banjo/An5.ogg rename to sound/runtime/instruments/banjo/An5.ogg diff --git a/sound/instruments/banjo/Bb3.ogg b/sound/runtime/instruments/banjo/Bb3.ogg similarity index 100% rename from sound/instruments/banjo/Bb3.ogg rename to sound/runtime/instruments/banjo/Bb3.ogg diff --git a/sound/instruments/banjo/Bb4.ogg b/sound/runtime/instruments/banjo/Bb4.ogg similarity index 100% rename from sound/instruments/banjo/Bb4.ogg rename to sound/runtime/instruments/banjo/Bb4.ogg diff --git a/sound/instruments/banjo/Bb5.ogg b/sound/runtime/instruments/banjo/Bb5.ogg similarity index 100% rename from sound/instruments/banjo/Bb5.ogg rename to sound/runtime/instruments/banjo/Bb5.ogg diff --git a/sound/instruments/banjo/Bn2.ogg b/sound/runtime/instruments/banjo/Bn2.ogg similarity index 100% rename from sound/instruments/banjo/Bn2.ogg rename to sound/runtime/instruments/banjo/Bn2.ogg diff --git a/sound/instruments/banjo/Bn3.ogg b/sound/runtime/instruments/banjo/Bn3.ogg similarity index 100% rename from sound/instruments/banjo/Bn3.ogg rename to sound/runtime/instruments/banjo/Bn3.ogg diff --git a/sound/instruments/banjo/Bn4.ogg b/sound/runtime/instruments/banjo/Bn4.ogg similarity index 100% rename from sound/instruments/banjo/Bn4.ogg rename to sound/runtime/instruments/banjo/Bn4.ogg diff --git a/sound/instruments/banjo/Bn5.ogg b/sound/runtime/instruments/banjo/Bn5.ogg similarity index 100% rename from sound/instruments/banjo/Bn5.ogg rename to sound/runtime/instruments/banjo/Bn5.ogg diff --git a/sound/instruments/banjo/Cn3.ogg b/sound/runtime/instruments/banjo/Cn3.ogg similarity index 100% rename from sound/instruments/banjo/Cn3.ogg rename to sound/runtime/instruments/banjo/Cn3.ogg diff --git a/sound/instruments/banjo/Cn4.ogg b/sound/runtime/instruments/banjo/Cn4.ogg similarity index 100% rename from sound/instruments/banjo/Cn4.ogg rename to sound/runtime/instruments/banjo/Cn4.ogg diff --git a/sound/instruments/banjo/Cn5.ogg b/sound/runtime/instruments/banjo/Cn5.ogg similarity index 100% rename from sound/instruments/banjo/Cn5.ogg rename to sound/runtime/instruments/banjo/Cn5.ogg diff --git a/sound/instruments/banjo/Cn6.ogg b/sound/runtime/instruments/banjo/Cn6.ogg similarity index 100% rename from sound/instruments/banjo/Cn6.ogg rename to sound/runtime/instruments/banjo/Cn6.ogg diff --git a/sound/instruments/banjo/Db3.ogg b/sound/runtime/instruments/banjo/Db3.ogg similarity index 100% rename from sound/instruments/banjo/Db3.ogg rename to sound/runtime/instruments/banjo/Db3.ogg diff --git a/sound/instruments/banjo/Db4.ogg b/sound/runtime/instruments/banjo/Db4.ogg similarity index 100% rename from sound/instruments/banjo/Db4.ogg rename to sound/runtime/instruments/banjo/Db4.ogg diff --git a/sound/instruments/banjo/Db5.ogg b/sound/runtime/instruments/banjo/Db5.ogg similarity index 100% rename from sound/instruments/banjo/Db5.ogg rename to sound/runtime/instruments/banjo/Db5.ogg diff --git a/sound/instruments/banjo/Db6.ogg b/sound/runtime/instruments/banjo/Db6.ogg similarity index 100% rename from sound/instruments/banjo/Db6.ogg rename to sound/runtime/instruments/banjo/Db6.ogg diff --git a/sound/instruments/banjo/Dn3.ogg b/sound/runtime/instruments/banjo/Dn3.ogg similarity index 100% rename from sound/instruments/banjo/Dn3.ogg rename to sound/runtime/instruments/banjo/Dn3.ogg diff --git a/sound/instruments/banjo/Dn4.ogg b/sound/runtime/instruments/banjo/Dn4.ogg similarity index 100% rename from sound/instruments/banjo/Dn4.ogg rename to sound/runtime/instruments/banjo/Dn4.ogg diff --git a/sound/instruments/banjo/Dn5.ogg b/sound/runtime/instruments/banjo/Dn5.ogg similarity index 100% rename from sound/instruments/banjo/Dn5.ogg rename to sound/runtime/instruments/banjo/Dn5.ogg diff --git a/sound/instruments/banjo/Dn6.ogg b/sound/runtime/instruments/banjo/Dn6.ogg similarity index 100% rename from sound/instruments/banjo/Dn6.ogg rename to sound/runtime/instruments/banjo/Dn6.ogg diff --git a/sound/instruments/banjo/Eb3.ogg b/sound/runtime/instruments/banjo/Eb3.ogg similarity index 100% rename from sound/instruments/banjo/Eb3.ogg rename to sound/runtime/instruments/banjo/Eb3.ogg diff --git a/sound/instruments/banjo/Eb4.ogg b/sound/runtime/instruments/banjo/Eb4.ogg similarity index 100% rename from sound/instruments/banjo/Eb4.ogg rename to sound/runtime/instruments/banjo/Eb4.ogg diff --git a/sound/instruments/banjo/Eb5.ogg b/sound/runtime/instruments/banjo/Eb5.ogg similarity index 100% rename from sound/instruments/banjo/Eb5.ogg rename to sound/runtime/instruments/banjo/Eb5.ogg diff --git a/sound/instruments/banjo/En3.ogg b/sound/runtime/instruments/banjo/En3.ogg similarity index 100% rename from sound/instruments/banjo/En3.ogg rename to sound/runtime/instruments/banjo/En3.ogg diff --git a/sound/instruments/banjo/En4.ogg b/sound/runtime/instruments/banjo/En4.ogg similarity index 100% rename from sound/instruments/banjo/En4.ogg rename to sound/runtime/instruments/banjo/En4.ogg diff --git a/sound/instruments/banjo/En5.ogg b/sound/runtime/instruments/banjo/En5.ogg similarity index 100% rename from sound/instruments/banjo/En5.ogg rename to sound/runtime/instruments/banjo/En5.ogg diff --git a/sound/instruments/banjo/Fn3.ogg b/sound/runtime/instruments/banjo/Fn3.ogg similarity index 100% rename from sound/instruments/banjo/Fn3.ogg rename to sound/runtime/instruments/banjo/Fn3.ogg diff --git a/sound/instruments/banjo/Fn4.ogg b/sound/runtime/instruments/banjo/Fn4.ogg similarity index 100% rename from sound/instruments/banjo/Fn4.ogg rename to sound/runtime/instruments/banjo/Fn4.ogg diff --git a/sound/instruments/banjo/Fn5.ogg b/sound/runtime/instruments/banjo/Fn5.ogg similarity index 100% rename from sound/instruments/banjo/Fn5.ogg rename to sound/runtime/instruments/banjo/Fn5.ogg diff --git a/sound/instruments/banjo/Gb3.ogg b/sound/runtime/instruments/banjo/Gb3.ogg similarity index 100% rename from sound/instruments/banjo/Gb3.ogg rename to sound/runtime/instruments/banjo/Gb3.ogg diff --git a/sound/instruments/banjo/Gb4.ogg b/sound/runtime/instruments/banjo/Gb4.ogg similarity index 100% rename from sound/instruments/banjo/Gb4.ogg rename to sound/runtime/instruments/banjo/Gb4.ogg diff --git a/sound/instruments/banjo/Gb5.ogg b/sound/runtime/instruments/banjo/Gb5.ogg similarity index 100% rename from sound/instruments/banjo/Gb5.ogg rename to sound/runtime/instruments/banjo/Gb5.ogg diff --git a/sound/instruments/banjo/Gn3.ogg b/sound/runtime/instruments/banjo/Gn3.ogg similarity index 100% rename from sound/instruments/banjo/Gn3.ogg rename to sound/runtime/instruments/banjo/Gn3.ogg diff --git a/sound/instruments/banjo/Gn4.ogg b/sound/runtime/instruments/banjo/Gn4.ogg similarity index 100% rename from sound/instruments/banjo/Gn4.ogg rename to sound/runtime/instruments/banjo/Gn4.ogg diff --git a/sound/instruments/banjo/Gn5.ogg b/sound/runtime/instruments/banjo/Gn5.ogg similarity index 100% rename from sound/instruments/banjo/Gn5.ogg rename to sound/runtime/instruments/banjo/Gn5.ogg diff --git a/sound/instruments/bikehorn/Ab2.ogg b/sound/runtime/instruments/bikehorn/Ab2.ogg similarity index 100% rename from sound/instruments/bikehorn/Ab2.ogg rename to sound/runtime/instruments/bikehorn/Ab2.ogg diff --git a/sound/instruments/bikehorn/Ab3.ogg b/sound/runtime/instruments/bikehorn/Ab3.ogg similarity index 100% rename from sound/instruments/bikehorn/Ab3.ogg rename to sound/runtime/instruments/bikehorn/Ab3.ogg diff --git a/sound/instruments/bikehorn/Ab4.ogg b/sound/runtime/instruments/bikehorn/Ab4.ogg similarity index 100% rename from sound/instruments/bikehorn/Ab4.ogg rename to sound/runtime/instruments/bikehorn/Ab4.ogg diff --git a/sound/instruments/bikehorn/An2.ogg b/sound/runtime/instruments/bikehorn/An2.ogg similarity index 100% rename from sound/instruments/bikehorn/An2.ogg rename to sound/runtime/instruments/bikehorn/An2.ogg diff --git a/sound/instruments/bikehorn/An3.ogg b/sound/runtime/instruments/bikehorn/An3.ogg similarity index 100% rename from sound/instruments/bikehorn/An3.ogg rename to sound/runtime/instruments/bikehorn/An3.ogg diff --git a/sound/instruments/bikehorn/An4.ogg b/sound/runtime/instruments/bikehorn/An4.ogg similarity index 100% rename from sound/instruments/bikehorn/An4.ogg rename to sound/runtime/instruments/bikehorn/An4.ogg diff --git a/sound/instruments/bikehorn/Bb2.ogg b/sound/runtime/instruments/bikehorn/Bb2.ogg similarity index 100% rename from sound/instruments/bikehorn/Bb2.ogg rename to sound/runtime/instruments/bikehorn/Bb2.ogg diff --git a/sound/instruments/bikehorn/Bb3.ogg b/sound/runtime/instruments/bikehorn/Bb3.ogg similarity index 100% rename from sound/instruments/bikehorn/Bb3.ogg rename to sound/runtime/instruments/bikehorn/Bb3.ogg diff --git a/sound/instruments/bikehorn/Bb4.ogg b/sound/runtime/instruments/bikehorn/Bb4.ogg similarity index 100% rename from sound/instruments/bikehorn/Bb4.ogg rename to sound/runtime/instruments/bikehorn/Bb4.ogg diff --git a/sound/instruments/bikehorn/Bn2.ogg b/sound/runtime/instruments/bikehorn/Bn2.ogg similarity index 100% rename from sound/instruments/bikehorn/Bn2.ogg rename to sound/runtime/instruments/bikehorn/Bn2.ogg diff --git a/sound/instruments/bikehorn/Bn3.ogg b/sound/runtime/instruments/bikehorn/Bn3.ogg similarity index 100% rename from sound/instruments/bikehorn/Bn3.ogg rename to sound/runtime/instruments/bikehorn/Bn3.ogg diff --git a/sound/instruments/bikehorn/Bn4.ogg b/sound/runtime/instruments/bikehorn/Bn4.ogg similarity index 100% rename from sound/instruments/bikehorn/Bn4.ogg rename to sound/runtime/instruments/bikehorn/Bn4.ogg diff --git a/sound/instruments/bikehorn/Cn3.ogg b/sound/runtime/instruments/bikehorn/Cn3.ogg similarity index 100% rename from sound/instruments/bikehorn/Cn3.ogg rename to sound/runtime/instruments/bikehorn/Cn3.ogg diff --git a/sound/instruments/bikehorn/Cn4.ogg b/sound/runtime/instruments/bikehorn/Cn4.ogg similarity index 100% rename from sound/instruments/bikehorn/Cn4.ogg rename to sound/runtime/instruments/bikehorn/Cn4.ogg diff --git a/sound/instruments/bikehorn/Cn5.ogg b/sound/runtime/instruments/bikehorn/Cn5.ogg similarity index 100% rename from sound/instruments/bikehorn/Cn5.ogg rename to sound/runtime/instruments/bikehorn/Cn5.ogg diff --git a/sound/instruments/bikehorn/Db3.ogg b/sound/runtime/instruments/bikehorn/Db3.ogg similarity index 100% rename from sound/instruments/bikehorn/Db3.ogg rename to sound/runtime/instruments/bikehorn/Db3.ogg diff --git a/sound/instruments/bikehorn/Db4.ogg b/sound/runtime/instruments/bikehorn/Db4.ogg similarity index 100% rename from sound/instruments/bikehorn/Db4.ogg rename to sound/runtime/instruments/bikehorn/Db4.ogg diff --git a/sound/instruments/bikehorn/Db5.ogg b/sound/runtime/instruments/bikehorn/Db5.ogg similarity index 100% rename from sound/instruments/bikehorn/Db5.ogg rename to sound/runtime/instruments/bikehorn/Db5.ogg diff --git a/sound/instruments/bikehorn/Dn3.ogg b/sound/runtime/instruments/bikehorn/Dn3.ogg similarity index 100% rename from sound/instruments/bikehorn/Dn3.ogg rename to sound/runtime/instruments/bikehorn/Dn3.ogg diff --git a/sound/instruments/bikehorn/Dn4.ogg b/sound/runtime/instruments/bikehorn/Dn4.ogg similarity index 100% rename from sound/instruments/bikehorn/Dn4.ogg rename to sound/runtime/instruments/bikehorn/Dn4.ogg diff --git a/sound/instruments/bikehorn/Dn5.ogg b/sound/runtime/instruments/bikehorn/Dn5.ogg similarity index 100% rename from sound/instruments/bikehorn/Dn5.ogg rename to sound/runtime/instruments/bikehorn/Dn5.ogg diff --git a/sound/instruments/bikehorn/Eb3.ogg b/sound/runtime/instruments/bikehorn/Eb3.ogg similarity index 100% rename from sound/instruments/bikehorn/Eb3.ogg rename to sound/runtime/instruments/bikehorn/Eb3.ogg diff --git a/sound/instruments/bikehorn/Eb4.ogg b/sound/runtime/instruments/bikehorn/Eb4.ogg similarity index 100% rename from sound/instruments/bikehorn/Eb4.ogg rename to sound/runtime/instruments/bikehorn/Eb4.ogg diff --git a/sound/instruments/bikehorn/Eb5.ogg b/sound/runtime/instruments/bikehorn/Eb5.ogg similarity index 100% rename from sound/instruments/bikehorn/Eb5.ogg rename to sound/runtime/instruments/bikehorn/Eb5.ogg diff --git a/sound/instruments/bikehorn/En2.ogg b/sound/runtime/instruments/bikehorn/En2.ogg similarity index 100% rename from sound/instruments/bikehorn/En2.ogg rename to sound/runtime/instruments/bikehorn/En2.ogg diff --git a/sound/instruments/bikehorn/En3.ogg b/sound/runtime/instruments/bikehorn/En3.ogg similarity index 100% rename from sound/instruments/bikehorn/En3.ogg rename to sound/runtime/instruments/bikehorn/En3.ogg diff --git a/sound/instruments/bikehorn/En4.ogg b/sound/runtime/instruments/bikehorn/En4.ogg similarity index 100% rename from sound/instruments/bikehorn/En4.ogg rename to sound/runtime/instruments/bikehorn/En4.ogg diff --git a/sound/instruments/bikehorn/Fn2.ogg b/sound/runtime/instruments/bikehorn/Fn2.ogg similarity index 100% rename from sound/instruments/bikehorn/Fn2.ogg rename to sound/runtime/instruments/bikehorn/Fn2.ogg diff --git a/sound/instruments/bikehorn/Fn3.ogg b/sound/runtime/instruments/bikehorn/Fn3.ogg similarity index 100% rename from sound/instruments/bikehorn/Fn3.ogg rename to sound/runtime/instruments/bikehorn/Fn3.ogg diff --git a/sound/instruments/bikehorn/Fn4.ogg b/sound/runtime/instruments/bikehorn/Fn4.ogg similarity index 100% rename from sound/instruments/bikehorn/Fn4.ogg rename to sound/runtime/instruments/bikehorn/Fn4.ogg diff --git a/sound/instruments/bikehorn/Gb2.ogg b/sound/runtime/instruments/bikehorn/Gb2.ogg similarity index 100% rename from sound/instruments/bikehorn/Gb2.ogg rename to sound/runtime/instruments/bikehorn/Gb2.ogg diff --git a/sound/instruments/bikehorn/Gb3.ogg b/sound/runtime/instruments/bikehorn/Gb3.ogg similarity index 100% rename from sound/instruments/bikehorn/Gb3.ogg rename to sound/runtime/instruments/bikehorn/Gb3.ogg diff --git a/sound/instruments/bikehorn/Gb4.ogg b/sound/runtime/instruments/bikehorn/Gb4.ogg similarity index 100% rename from sound/instruments/bikehorn/Gb4.ogg rename to sound/runtime/instruments/bikehorn/Gb4.ogg diff --git a/sound/instruments/bikehorn/Gn2.ogg b/sound/runtime/instruments/bikehorn/Gn2.ogg similarity index 100% rename from sound/instruments/bikehorn/Gn2.ogg rename to sound/runtime/instruments/bikehorn/Gn2.ogg diff --git a/sound/instruments/bikehorn/Gn3.ogg b/sound/runtime/instruments/bikehorn/Gn3.ogg similarity index 100% rename from sound/instruments/bikehorn/Gn3.ogg rename to sound/runtime/instruments/bikehorn/Gn3.ogg diff --git a/sound/instruments/bikehorn/Gn4.ogg b/sound/runtime/instruments/bikehorn/Gn4.ogg similarity index 100% rename from sound/instruments/bikehorn/Gn4.ogg rename to sound/runtime/instruments/bikehorn/Gn4.ogg diff --git a/sound/instruments/eguitar/Ab4.ogg b/sound/runtime/instruments/eguitar/Ab4.ogg similarity index 100% rename from sound/instruments/eguitar/Ab4.ogg rename to sound/runtime/instruments/eguitar/Ab4.ogg diff --git a/sound/instruments/eguitar/Ab5.ogg b/sound/runtime/instruments/eguitar/Ab5.ogg similarity index 100% rename from sound/instruments/eguitar/Ab5.ogg rename to sound/runtime/instruments/eguitar/Ab5.ogg diff --git a/sound/instruments/eguitar/Ab6.ogg b/sound/runtime/instruments/eguitar/Ab6.ogg similarity index 100% rename from sound/instruments/eguitar/Ab6.ogg rename to sound/runtime/instruments/eguitar/Ab6.ogg diff --git a/sound/instruments/eguitar/An4.ogg b/sound/runtime/instruments/eguitar/An4.ogg similarity index 100% rename from sound/instruments/eguitar/An4.ogg rename to sound/runtime/instruments/eguitar/An4.ogg diff --git a/sound/instruments/eguitar/An5.ogg b/sound/runtime/instruments/eguitar/An5.ogg similarity index 100% rename from sound/instruments/eguitar/An5.ogg rename to sound/runtime/instruments/eguitar/An5.ogg diff --git a/sound/instruments/eguitar/An6.ogg b/sound/runtime/instruments/eguitar/An6.ogg similarity index 100% rename from sound/instruments/eguitar/An6.ogg rename to sound/runtime/instruments/eguitar/An6.ogg diff --git a/sound/instruments/eguitar/Bb4.ogg b/sound/runtime/instruments/eguitar/Bb4.ogg similarity index 100% rename from sound/instruments/eguitar/Bb4.ogg rename to sound/runtime/instruments/eguitar/Bb4.ogg diff --git a/sound/instruments/eguitar/Bb5.ogg b/sound/runtime/instruments/eguitar/Bb5.ogg similarity index 100% rename from sound/instruments/eguitar/Bb5.ogg rename to sound/runtime/instruments/eguitar/Bb5.ogg diff --git a/sound/instruments/eguitar/Bb6.ogg b/sound/runtime/instruments/eguitar/Bb6.ogg similarity index 100% rename from sound/instruments/eguitar/Bb6.ogg rename to sound/runtime/instruments/eguitar/Bb6.ogg diff --git a/sound/instruments/eguitar/Bn4.ogg b/sound/runtime/instruments/eguitar/Bn4.ogg similarity index 100% rename from sound/instruments/eguitar/Bn4.ogg rename to sound/runtime/instruments/eguitar/Bn4.ogg diff --git a/sound/instruments/eguitar/Bn5.ogg b/sound/runtime/instruments/eguitar/Bn5.ogg similarity index 100% rename from sound/instruments/eguitar/Bn5.ogg rename to sound/runtime/instruments/eguitar/Bn5.ogg diff --git a/sound/instruments/eguitar/Bn6.ogg b/sound/runtime/instruments/eguitar/Bn6.ogg similarity index 100% rename from sound/instruments/eguitar/Bn6.ogg rename to sound/runtime/instruments/eguitar/Bn6.ogg diff --git a/sound/instruments/eguitar/Cn4.ogg b/sound/runtime/instruments/eguitar/Cn4.ogg similarity index 100% rename from sound/instruments/eguitar/Cn4.ogg rename to sound/runtime/instruments/eguitar/Cn4.ogg diff --git a/sound/instruments/eguitar/Cn5.ogg b/sound/runtime/instruments/eguitar/Cn5.ogg similarity index 100% rename from sound/instruments/eguitar/Cn5.ogg rename to sound/runtime/instruments/eguitar/Cn5.ogg diff --git a/sound/instruments/eguitar/Cn6.ogg b/sound/runtime/instruments/eguitar/Cn6.ogg similarity index 100% rename from sound/instruments/eguitar/Cn6.ogg rename to sound/runtime/instruments/eguitar/Cn6.ogg diff --git a/sound/instruments/eguitar/Cn7.ogg b/sound/runtime/instruments/eguitar/Cn7.ogg similarity index 100% rename from sound/instruments/eguitar/Cn7.ogg rename to sound/runtime/instruments/eguitar/Cn7.ogg diff --git a/sound/instruments/eguitar/Db4.ogg b/sound/runtime/instruments/eguitar/Db4.ogg similarity index 100% rename from sound/instruments/eguitar/Db4.ogg rename to sound/runtime/instruments/eguitar/Db4.ogg diff --git a/sound/instruments/eguitar/Db5.ogg b/sound/runtime/instruments/eguitar/Db5.ogg similarity index 100% rename from sound/instruments/eguitar/Db5.ogg rename to sound/runtime/instruments/eguitar/Db5.ogg diff --git a/sound/instruments/eguitar/Db6.ogg b/sound/runtime/instruments/eguitar/Db6.ogg similarity index 100% rename from sound/instruments/eguitar/Db6.ogg rename to sound/runtime/instruments/eguitar/Db6.ogg diff --git a/sound/instruments/eguitar/Dn4.ogg b/sound/runtime/instruments/eguitar/Dn4.ogg similarity index 100% rename from sound/instruments/eguitar/Dn4.ogg rename to sound/runtime/instruments/eguitar/Dn4.ogg diff --git a/sound/instruments/eguitar/Dn5.ogg b/sound/runtime/instruments/eguitar/Dn5.ogg similarity index 100% rename from sound/instruments/eguitar/Dn5.ogg rename to sound/runtime/instruments/eguitar/Dn5.ogg diff --git a/sound/instruments/eguitar/Dn6.ogg b/sound/runtime/instruments/eguitar/Dn6.ogg similarity index 100% rename from sound/instruments/eguitar/Dn6.ogg rename to sound/runtime/instruments/eguitar/Dn6.ogg diff --git a/sound/instruments/eguitar/Eb4.ogg b/sound/runtime/instruments/eguitar/Eb4.ogg similarity index 100% rename from sound/instruments/eguitar/Eb4.ogg rename to sound/runtime/instruments/eguitar/Eb4.ogg diff --git a/sound/instruments/eguitar/Eb5.ogg b/sound/runtime/instruments/eguitar/Eb5.ogg similarity index 100% rename from sound/instruments/eguitar/Eb5.ogg rename to sound/runtime/instruments/eguitar/Eb5.ogg diff --git a/sound/instruments/eguitar/Eb6.ogg b/sound/runtime/instruments/eguitar/Eb6.ogg similarity index 100% rename from sound/instruments/eguitar/Eb6.ogg rename to sound/runtime/instruments/eguitar/Eb6.ogg diff --git a/sound/instruments/eguitar/En4.ogg b/sound/runtime/instruments/eguitar/En4.ogg similarity index 100% rename from sound/instruments/eguitar/En4.ogg rename to sound/runtime/instruments/eguitar/En4.ogg diff --git a/sound/instruments/eguitar/En5.ogg b/sound/runtime/instruments/eguitar/En5.ogg similarity index 100% rename from sound/instruments/eguitar/En5.ogg rename to sound/runtime/instruments/eguitar/En5.ogg diff --git a/sound/instruments/eguitar/En6.ogg b/sound/runtime/instruments/eguitar/En6.ogg similarity index 100% rename from sound/instruments/eguitar/En6.ogg rename to sound/runtime/instruments/eguitar/En6.ogg diff --git a/sound/instruments/eguitar/Fn4.ogg b/sound/runtime/instruments/eguitar/Fn4.ogg similarity index 100% rename from sound/instruments/eguitar/Fn4.ogg rename to sound/runtime/instruments/eguitar/Fn4.ogg diff --git a/sound/instruments/eguitar/Fn5.ogg b/sound/runtime/instruments/eguitar/Fn5.ogg similarity index 100% rename from sound/instruments/eguitar/Fn5.ogg rename to sound/runtime/instruments/eguitar/Fn5.ogg diff --git a/sound/instruments/eguitar/Fn6.ogg b/sound/runtime/instruments/eguitar/Fn6.ogg similarity index 100% rename from sound/instruments/eguitar/Fn6.ogg rename to sound/runtime/instruments/eguitar/Fn6.ogg diff --git a/sound/instruments/eguitar/Gb4.ogg b/sound/runtime/instruments/eguitar/Gb4.ogg similarity index 100% rename from sound/instruments/eguitar/Gb4.ogg rename to sound/runtime/instruments/eguitar/Gb4.ogg diff --git a/sound/instruments/eguitar/Gb5.ogg b/sound/runtime/instruments/eguitar/Gb5.ogg similarity index 100% rename from sound/instruments/eguitar/Gb5.ogg rename to sound/runtime/instruments/eguitar/Gb5.ogg diff --git a/sound/instruments/eguitar/Gb6.ogg b/sound/runtime/instruments/eguitar/Gb6.ogg similarity index 100% rename from sound/instruments/eguitar/Gb6.ogg rename to sound/runtime/instruments/eguitar/Gb6.ogg diff --git a/sound/instruments/eguitar/Gn4.ogg b/sound/runtime/instruments/eguitar/Gn4.ogg similarity index 100% rename from sound/instruments/eguitar/Gn4.ogg rename to sound/runtime/instruments/eguitar/Gn4.ogg diff --git a/sound/instruments/eguitar/Gn5.ogg b/sound/runtime/instruments/eguitar/Gn5.ogg similarity index 100% rename from sound/instruments/eguitar/Gn5.ogg rename to sound/runtime/instruments/eguitar/Gn5.ogg diff --git a/sound/instruments/eguitar/Gn6.ogg b/sound/runtime/instruments/eguitar/Gn6.ogg similarity index 100% rename from sound/instruments/eguitar/Gn6.ogg rename to sound/runtime/instruments/eguitar/Gn6.ogg diff --git a/sound/instruments/glockenspiel/Ab2.mid b/sound/runtime/instruments/glockenspiel/Ab2.mid similarity index 100% rename from sound/instruments/glockenspiel/Ab2.mid rename to sound/runtime/instruments/glockenspiel/Ab2.mid diff --git a/sound/instruments/glockenspiel/Ab3.mid b/sound/runtime/instruments/glockenspiel/Ab3.mid similarity index 100% rename from sound/instruments/glockenspiel/Ab3.mid rename to sound/runtime/instruments/glockenspiel/Ab3.mid diff --git a/sound/instruments/glockenspiel/Ab4.mid b/sound/runtime/instruments/glockenspiel/Ab4.mid similarity index 100% rename from sound/instruments/glockenspiel/Ab4.mid rename to sound/runtime/instruments/glockenspiel/Ab4.mid diff --git a/sound/instruments/glockenspiel/Ab5.mid b/sound/runtime/instruments/glockenspiel/Ab5.mid similarity index 100% rename from sound/instruments/glockenspiel/Ab5.mid rename to sound/runtime/instruments/glockenspiel/Ab5.mid diff --git a/sound/instruments/glockenspiel/Ab6.mid b/sound/runtime/instruments/glockenspiel/Ab6.mid similarity index 100% rename from sound/instruments/glockenspiel/Ab6.mid rename to sound/runtime/instruments/glockenspiel/Ab6.mid diff --git a/sound/instruments/glockenspiel/Ab7.mid b/sound/runtime/instruments/glockenspiel/Ab7.mid similarity index 100% rename from sound/instruments/glockenspiel/Ab7.mid rename to sound/runtime/instruments/glockenspiel/Ab7.mid diff --git a/sound/instruments/glockenspiel/An2.mid b/sound/runtime/instruments/glockenspiel/An2.mid similarity index 100% rename from sound/instruments/glockenspiel/An2.mid rename to sound/runtime/instruments/glockenspiel/An2.mid diff --git a/sound/instruments/glockenspiel/An3.mid b/sound/runtime/instruments/glockenspiel/An3.mid similarity index 100% rename from sound/instruments/glockenspiel/An3.mid rename to sound/runtime/instruments/glockenspiel/An3.mid diff --git a/sound/instruments/glockenspiel/An4.mid b/sound/runtime/instruments/glockenspiel/An4.mid similarity index 100% rename from sound/instruments/glockenspiel/An4.mid rename to sound/runtime/instruments/glockenspiel/An4.mid diff --git a/sound/instruments/glockenspiel/An5.mid b/sound/runtime/instruments/glockenspiel/An5.mid similarity index 100% rename from sound/instruments/glockenspiel/An5.mid rename to sound/runtime/instruments/glockenspiel/An5.mid diff --git a/sound/instruments/glockenspiel/An6.mid b/sound/runtime/instruments/glockenspiel/An6.mid similarity index 100% rename from sound/instruments/glockenspiel/An6.mid rename to sound/runtime/instruments/glockenspiel/An6.mid diff --git a/sound/instruments/glockenspiel/An7.mid b/sound/runtime/instruments/glockenspiel/An7.mid similarity index 100% rename from sound/instruments/glockenspiel/An7.mid rename to sound/runtime/instruments/glockenspiel/An7.mid diff --git a/sound/instruments/glockenspiel/Bb2.mid b/sound/runtime/instruments/glockenspiel/Bb2.mid similarity index 100% rename from sound/instruments/glockenspiel/Bb2.mid rename to sound/runtime/instruments/glockenspiel/Bb2.mid diff --git a/sound/instruments/glockenspiel/Bb3.mid b/sound/runtime/instruments/glockenspiel/Bb3.mid similarity index 100% rename from sound/instruments/glockenspiel/Bb3.mid rename to sound/runtime/instruments/glockenspiel/Bb3.mid diff --git a/sound/instruments/glockenspiel/Bb4.mid b/sound/runtime/instruments/glockenspiel/Bb4.mid similarity index 100% rename from sound/instruments/glockenspiel/Bb4.mid rename to sound/runtime/instruments/glockenspiel/Bb4.mid diff --git a/sound/instruments/glockenspiel/Bb5.mid b/sound/runtime/instruments/glockenspiel/Bb5.mid similarity index 100% rename from sound/instruments/glockenspiel/Bb5.mid rename to sound/runtime/instruments/glockenspiel/Bb5.mid diff --git a/sound/instruments/glockenspiel/Bb6.mid b/sound/runtime/instruments/glockenspiel/Bb6.mid similarity index 100% rename from sound/instruments/glockenspiel/Bb6.mid rename to sound/runtime/instruments/glockenspiel/Bb6.mid diff --git a/sound/instruments/glockenspiel/Bb7.mid b/sound/runtime/instruments/glockenspiel/Bb7.mid similarity index 100% rename from sound/instruments/glockenspiel/Bb7.mid rename to sound/runtime/instruments/glockenspiel/Bb7.mid diff --git a/sound/instruments/glockenspiel/Bn2.mid b/sound/runtime/instruments/glockenspiel/Bn2.mid similarity index 100% rename from sound/instruments/glockenspiel/Bn2.mid rename to sound/runtime/instruments/glockenspiel/Bn2.mid diff --git a/sound/instruments/glockenspiel/Bn3.mid b/sound/runtime/instruments/glockenspiel/Bn3.mid similarity index 100% rename from sound/instruments/glockenspiel/Bn3.mid rename to sound/runtime/instruments/glockenspiel/Bn3.mid diff --git a/sound/instruments/glockenspiel/Bn4.mid b/sound/runtime/instruments/glockenspiel/Bn4.mid similarity index 100% rename from sound/instruments/glockenspiel/Bn4.mid rename to sound/runtime/instruments/glockenspiel/Bn4.mid diff --git a/sound/instruments/glockenspiel/Bn5.mid b/sound/runtime/instruments/glockenspiel/Bn5.mid similarity index 100% rename from sound/instruments/glockenspiel/Bn5.mid rename to sound/runtime/instruments/glockenspiel/Bn5.mid diff --git a/sound/instruments/glockenspiel/Bn6.mid b/sound/runtime/instruments/glockenspiel/Bn6.mid similarity index 100% rename from sound/instruments/glockenspiel/Bn6.mid rename to sound/runtime/instruments/glockenspiel/Bn6.mid diff --git a/sound/instruments/glockenspiel/Bn7.mid b/sound/runtime/instruments/glockenspiel/Bn7.mid similarity index 100% rename from sound/instruments/glockenspiel/Bn7.mid rename to sound/runtime/instruments/glockenspiel/Bn7.mid diff --git a/sound/instruments/glockenspiel/Cn2.mid b/sound/runtime/instruments/glockenspiel/Cn2.mid similarity index 100% rename from sound/instruments/glockenspiel/Cn2.mid rename to sound/runtime/instruments/glockenspiel/Cn2.mid diff --git a/sound/instruments/glockenspiel/Cn3.mid b/sound/runtime/instruments/glockenspiel/Cn3.mid similarity index 100% rename from sound/instruments/glockenspiel/Cn3.mid rename to sound/runtime/instruments/glockenspiel/Cn3.mid diff --git a/sound/instruments/glockenspiel/Cn4.mid b/sound/runtime/instruments/glockenspiel/Cn4.mid similarity index 100% rename from sound/instruments/glockenspiel/Cn4.mid rename to sound/runtime/instruments/glockenspiel/Cn4.mid diff --git a/sound/instruments/glockenspiel/Cn5.mid b/sound/runtime/instruments/glockenspiel/Cn5.mid similarity index 100% rename from sound/instruments/glockenspiel/Cn5.mid rename to sound/runtime/instruments/glockenspiel/Cn5.mid diff --git a/sound/instruments/glockenspiel/Cn6.mid b/sound/runtime/instruments/glockenspiel/Cn6.mid similarity index 100% rename from sound/instruments/glockenspiel/Cn6.mid rename to sound/runtime/instruments/glockenspiel/Cn6.mid diff --git a/sound/instruments/glockenspiel/Cn7.mid b/sound/runtime/instruments/glockenspiel/Cn7.mid similarity index 100% rename from sound/instruments/glockenspiel/Cn7.mid rename to sound/runtime/instruments/glockenspiel/Cn7.mid diff --git a/sound/instruments/glockenspiel/Db2.mid b/sound/runtime/instruments/glockenspiel/Db2.mid similarity index 100% rename from sound/instruments/glockenspiel/Db2.mid rename to sound/runtime/instruments/glockenspiel/Db2.mid diff --git a/sound/instruments/glockenspiel/Db3.mid b/sound/runtime/instruments/glockenspiel/Db3.mid similarity index 100% rename from sound/instruments/glockenspiel/Db3.mid rename to sound/runtime/instruments/glockenspiel/Db3.mid diff --git a/sound/instruments/glockenspiel/Db4.mid b/sound/runtime/instruments/glockenspiel/Db4.mid similarity index 100% rename from sound/instruments/glockenspiel/Db4.mid rename to sound/runtime/instruments/glockenspiel/Db4.mid diff --git a/sound/instruments/glockenspiel/Db5.mid b/sound/runtime/instruments/glockenspiel/Db5.mid similarity index 100% rename from sound/instruments/glockenspiel/Db5.mid rename to sound/runtime/instruments/glockenspiel/Db5.mid diff --git a/sound/instruments/glockenspiel/Db6.mid b/sound/runtime/instruments/glockenspiel/Db6.mid similarity index 100% rename from sound/instruments/glockenspiel/Db6.mid rename to sound/runtime/instruments/glockenspiel/Db6.mid diff --git a/sound/instruments/glockenspiel/Db7.mid b/sound/runtime/instruments/glockenspiel/Db7.mid similarity index 100% rename from sound/instruments/glockenspiel/Db7.mid rename to sound/runtime/instruments/glockenspiel/Db7.mid diff --git a/sound/instruments/glockenspiel/Dn2.mid b/sound/runtime/instruments/glockenspiel/Dn2.mid similarity index 100% rename from sound/instruments/glockenspiel/Dn2.mid rename to sound/runtime/instruments/glockenspiel/Dn2.mid diff --git a/sound/instruments/glockenspiel/Dn3.mid b/sound/runtime/instruments/glockenspiel/Dn3.mid similarity index 100% rename from sound/instruments/glockenspiel/Dn3.mid rename to sound/runtime/instruments/glockenspiel/Dn3.mid diff --git a/sound/instruments/glockenspiel/Dn4.mid b/sound/runtime/instruments/glockenspiel/Dn4.mid similarity index 100% rename from sound/instruments/glockenspiel/Dn4.mid rename to sound/runtime/instruments/glockenspiel/Dn4.mid diff --git a/sound/instruments/glockenspiel/Dn5.mid b/sound/runtime/instruments/glockenspiel/Dn5.mid similarity index 100% rename from sound/instruments/glockenspiel/Dn5.mid rename to sound/runtime/instruments/glockenspiel/Dn5.mid diff --git a/sound/instruments/glockenspiel/Dn6.mid b/sound/runtime/instruments/glockenspiel/Dn6.mid similarity index 100% rename from sound/instruments/glockenspiel/Dn6.mid rename to sound/runtime/instruments/glockenspiel/Dn6.mid diff --git a/sound/instruments/glockenspiel/Dn7.mid b/sound/runtime/instruments/glockenspiel/Dn7.mid similarity index 100% rename from sound/instruments/glockenspiel/Dn7.mid rename to sound/runtime/instruments/glockenspiel/Dn7.mid diff --git a/sound/instruments/glockenspiel/Eb2.mid b/sound/runtime/instruments/glockenspiel/Eb2.mid similarity index 100% rename from sound/instruments/glockenspiel/Eb2.mid rename to sound/runtime/instruments/glockenspiel/Eb2.mid diff --git a/sound/instruments/glockenspiel/Eb3.mid b/sound/runtime/instruments/glockenspiel/Eb3.mid similarity index 100% rename from sound/instruments/glockenspiel/Eb3.mid rename to sound/runtime/instruments/glockenspiel/Eb3.mid diff --git a/sound/instruments/glockenspiel/Eb4.mid b/sound/runtime/instruments/glockenspiel/Eb4.mid similarity index 100% rename from sound/instruments/glockenspiel/Eb4.mid rename to sound/runtime/instruments/glockenspiel/Eb4.mid diff --git a/sound/instruments/glockenspiel/Eb5.mid b/sound/runtime/instruments/glockenspiel/Eb5.mid similarity index 100% rename from sound/instruments/glockenspiel/Eb5.mid rename to sound/runtime/instruments/glockenspiel/Eb5.mid diff --git a/sound/instruments/glockenspiel/Eb6.mid b/sound/runtime/instruments/glockenspiel/Eb6.mid similarity index 100% rename from sound/instruments/glockenspiel/Eb6.mid rename to sound/runtime/instruments/glockenspiel/Eb6.mid diff --git a/sound/instruments/glockenspiel/Eb7.mid b/sound/runtime/instruments/glockenspiel/Eb7.mid similarity index 100% rename from sound/instruments/glockenspiel/Eb7.mid rename to sound/runtime/instruments/glockenspiel/Eb7.mid diff --git a/sound/instruments/glockenspiel/En2.mid b/sound/runtime/instruments/glockenspiel/En2.mid similarity index 100% rename from sound/instruments/glockenspiel/En2.mid rename to sound/runtime/instruments/glockenspiel/En2.mid diff --git a/sound/instruments/glockenspiel/En3.mid b/sound/runtime/instruments/glockenspiel/En3.mid similarity index 100% rename from sound/instruments/glockenspiel/En3.mid rename to sound/runtime/instruments/glockenspiel/En3.mid diff --git a/sound/instruments/glockenspiel/En4.mid b/sound/runtime/instruments/glockenspiel/En4.mid similarity index 100% rename from sound/instruments/glockenspiel/En4.mid rename to sound/runtime/instruments/glockenspiel/En4.mid diff --git a/sound/instruments/glockenspiel/En5.mid b/sound/runtime/instruments/glockenspiel/En5.mid similarity index 100% rename from sound/instruments/glockenspiel/En5.mid rename to sound/runtime/instruments/glockenspiel/En5.mid diff --git a/sound/instruments/glockenspiel/En6.mid b/sound/runtime/instruments/glockenspiel/En6.mid similarity index 100% rename from sound/instruments/glockenspiel/En6.mid rename to sound/runtime/instruments/glockenspiel/En6.mid diff --git a/sound/instruments/glockenspiel/En7.mid b/sound/runtime/instruments/glockenspiel/En7.mid similarity index 100% rename from sound/instruments/glockenspiel/En7.mid rename to sound/runtime/instruments/glockenspiel/En7.mid diff --git a/sound/instruments/glockenspiel/Fn2.mid b/sound/runtime/instruments/glockenspiel/Fn2.mid similarity index 100% rename from sound/instruments/glockenspiel/Fn2.mid rename to sound/runtime/instruments/glockenspiel/Fn2.mid diff --git a/sound/instruments/glockenspiel/Fn3.mid b/sound/runtime/instruments/glockenspiel/Fn3.mid similarity index 100% rename from sound/instruments/glockenspiel/Fn3.mid rename to sound/runtime/instruments/glockenspiel/Fn3.mid diff --git a/sound/instruments/glockenspiel/Fn4.mid b/sound/runtime/instruments/glockenspiel/Fn4.mid similarity index 100% rename from sound/instruments/glockenspiel/Fn4.mid rename to sound/runtime/instruments/glockenspiel/Fn4.mid diff --git a/sound/instruments/glockenspiel/Fn5.mid b/sound/runtime/instruments/glockenspiel/Fn5.mid similarity index 100% rename from sound/instruments/glockenspiel/Fn5.mid rename to sound/runtime/instruments/glockenspiel/Fn5.mid diff --git a/sound/instruments/glockenspiel/Fn6.mid b/sound/runtime/instruments/glockenspiel/Fn6.mid similarity index 100% rename from sound/instruments/glockenspiel/Fn6.mid rename to sound/runtime/instruments/glockenspiel/Fn6.mid diff --git a/sound/instruments/glockenspiel/Fn7.mid b/sound/runtime/instruments/glockenspiel/Fn7.mid similarity index 100% rename from sound/instruments/glockenspiel/Fn7.mid rename to sound/runtime/instruments/glockenspiel/Fn7.mid diff --git a/sound/instruments/glockenspiel/Gb2.mid b/sound/runtime/instruments/glockenspiel/Gb2.mid similarity index 100% rename from sound/instruments/glockenspiel/Gb2.mid rename to sound/runtime/instruments/glockenspiel/Gb2.mid diff --git a/sound/instruments/glockenspiel/Gb3.mid b/sound/runtime/instruments/glockenspiel/Gb3.mid similarity index 100% rename from sound/instruments/glockenspiel/Gb3.mid rename to sound/runtime/instruments/glockenspiel/Gb3.mid diff --git a/sound/instruments/glockenspiel/Gb4.mid b/sound/runtime/instruments/glockenspiel/Gb4.mid similarity index 100% rename from sound/instruments/glockenspiel/Gb4.mid rename to sound/runtime/instruments/glockenspiel/Gb4.mid diff --git a/sound/instruments/glockenspiel/Gb5.mid b/sound/runtime/instruments/glockenspiel/Gb5.mid similarity index 100% rename from sound/instruments/glockenspiel/Gb5.mid rename to sound/runtime/instruments/glockenspiel/Gb5.mid diff --git a/sound/instruments/glockenspiel/Gb6.mid b/sound/runtime/instruments/glockenspiel/Gb6.mid similarity index 100% rename from sound/instruments/glockenspiel/Gb6.mid rename to sound/runtime/instruments/glockenspiel/Gb6.mid diff --git a/sound/instruments/glockenspiel/Gb7.mid b/sound/runtime/instruments/glockenspiel/Gb7.mid similarity index 100% rename from sound/instruments/glockenspiel/Gb7.mid rename to sound/runtime/instruments/glockenspiel/Gb7.mid diff --git a/sound/instruments/glockenspiel/Gn2.mid b/sound/runtime/instruments/glockenspiel/Gn2.mid similarity index 100% rename from sound/instruments/glockenspiel/Gn2.mid rename to sound/runtime/instruments/glockenspiel/Gn2.mid diff --git a/sound/instruments/glockenspiel/Gn3.mid b/sound/runtime/instruments/glockenspiel/Gn3.mid similarity index 100% rename from sound/instruments/glockenspiel/Gn3.mid rename to sound/runtime/instruments/glockenspiel/Gn3.mid diff --git a/sound/instruments/glockenspiel/Gn4.mid b/sound/runtime/instruments/glockenspiel/Gn4.mid similarity index 100% rename from sound/instruments/glockenspiel/Gn4.mid rename to sound/runtime/instruments/glockenspiel/Gn4.mid diff --git a/sound/instruments/glockenspiel/Gn5.mid b/sound/runtime/instruments/glockenspiel/Gn5.mid similarity index 100% rename from sound/instruments/glockenspiel/Gn5.mid rename to sound/runtime/instruments/glockenspiel/Gn5.mid diff --git a/sound/instruments/glockenspiel/Gn6.mid b/sound/runtime/instruments/glockenspiel/Gn6.mid similarity index 100% rename from sound/instruments/glockenspiel/Gn6.mid rename to sound/runtime/instruments/glockenspiel/Gn6.mid diff --git a/sound/instruments/glockenspiel/Gn7.mid b/sound/runtime/instruments/glockenspiel/Gn7.mid similarity index 100% rename from sound/instruments/glockenspiel/Gn7.mid rename to sound/runtime/instruments/glockenspiel/Gn7.mid diff --git a/sound/instruments/guitar/Ab3.ogg b/sound/runtime/instruments/guitar/Ab3.ogg similarity index 100% rename from sound/instruments/guitar/Ab3.ogg rename to sound/runtime/instruments/guitar/Ab3.ogg diff --git a/sound/instruments/guitar/Ab4.ogg b/sound/runtime/instruments/guitar/Ab4.ogg similarity index 100% rename from sound/instruments/guitar/Ab4.ogg rename to sound/runtime/instruments/guitar/Ab4.ogg diff --git a/sound/instruments/guitar/Ab5.ogg b/sound/runtime/instruments/guitar/Ab5.ogg similarity index 100% rename from sound/instruments/guitar/Ab5.ogg rename to sound/runtime/instruments/guitar/Ab5.ogg diff --git a/sound/instruments/guitar/Ab6.ogg b/sound/runtime/instruments/guitar/Ab6.ogg similarity index 100% rename from sound/instruments/guitar/Ab6.ogg rename to sound/runtime/instruments/guitar/Ab6.ogg diff --git a/sound/instruments/guitar/An3.ogg b/sound/runtime/instruments/guitar/An3.ogg similarity index 100% rename from sound/instruments/guitar/An3.ogg rename to sound/runtime/instruments/guitar/An3.ogg diff --git a/sound/instruments/guitar/An4.ogg b/sound/runtime/instruments/guitar/An4.ogg similarity index 100% rename from sound/instruments/guitar/An4.ogg rename to sound/runtime/instruments/guitar/An4.ogg diff --git a/sound/instruments/guitar/An5.ogg b/sound/runtime/instruments/guitar/An5.ogg similarity index 100% rename from sound/instruments/guitar/An5.ogg rename to sound/runtime/instruments/guitar/An5.ogg diff --git a/sound/instruments/guitar/An6.ogg b/sound/runtime/instruments/guitar/An6.ogg similarity index 100% rename from sound/instruments/guitar/An6.ogg rename to sound/runtime/instruments/guitar/An6.ogg diff --git a/sound/instruments/guitar/Bb3.ogg b/sound/runtime/instruments/guitar/Bb3.ogg similarity index 100% rename from sound/instruments/guitar/Bb3.ogg rename to sound/runtime/instruments/guitar/Bb3.ogg diff --git a/sound/instruments/guitar/Bb4.ogg b/sound/runtime/instruments/guitar/Bb4.ogg similarity index 100% rename from sound/instruments/guitar/Bb4.ogg rename to sound/runtime/instruments/guitar/Bb4.ogg diff --git a/sound/instruments/guitar/Bb5.ogg b/sound/runtime/instruments/guitar/Bb5.ogg similarity index 100% rename from sound/instruments/guitar/Bb5.ogg rename to sound/runtime/instruments/guitar/Bb5.ogg diff --git a/sound/instruments/guitar/Bb6.ogg b/sound/runtime/instruments/guitar/Bb6.ogg similarity index 100% rename from sound/instruments/guitar/Bb6.ogg rename to sound/runtime/instruments/guitar/Bb6.ogg diff --git a/sound/instruments/guitar/Bn3.ogg b/sound/runtime/instruments/guitar/Bn3.ogg similarity index 100% rename from sound/instruments/guitar/Bn3.ogg rename to sound/runtime/instruments/guitar/Bn3.ogg diff --git a/sound/instruments/guitar/Bn4.ogg b/sound/runtime/instruments/guitar/Bn4.ogg similarity index 100% rename from sound/instruments/guitar/Bn4.ogg rename to sound/runtime/instruments/guitar/Bn4.ogg diff --git a/sound/instruments/guitar/Bn5.ogg b/sound/runtime/instruments/guitar/Bn5.ogg similarity index 100% rename from sound/instruments/guitar/Bn5.ogg rename to sound/runtime/instruments/guitar/Bn5.ogg diff --git a/sound/instruments/guitar/Bn6.ogg b/sound/runtime/instruments/guitar/Bn6.ogg similarity index 100% rename from sound/instruments/guitar/Bn6.ogg rename to sound/runtime/instruments/guitar/Bn6.ogg diff --git a/sound/instruments/guitar/Cn4.ogg b/sound/runtime/instruments/guitar/Cn4.ogg similarity index 100% rename from sound/instruments/guitar/Cn4.ogg rename to sound/runtime/instruments/guitar/Cn4.ogg diff --git a/sound/instruments/guitar/Cn5.ogg b/sound/runtime/instruments/guitar/Cn5.ogg similarity index 100% rename from sound/instruments/guitar/Cn5.ogg rename to sound/runtime/instruments/guitar/Cn5.ogg diff --git a/sound/instruments/guitar/Cn6.ogg b/sound/runtime/instruments/guitar/Cn6.ogg similarity index 100% rename from sound/instruments/guitar/Cn6.ogg rename to sound/runtime/instruments/guitar/Cn6.ogg diff --git a/sound/instruments/guitar/Db4.ogg b/sound/runtime/instruments/guitar/Db4.ogg similarity index 100% rename from sound/instruments/guitar/Db4.ogg rename to sound/runtime/instruments/guitar/Db4.ogg diff --git a/sound/instruments/guitar/Db5.ogg b/sound/runtime/instruments/guitar/Db5.ogg similarity index 100% rename from sound/instruments/guitar/Db5.ogg rename to sound/runtime/instruments/guitar/Db5.ogg diff --git a/sound/instruments/guitar/Db6.ogg b/sound/runtime/instruments/guitar/Db6.ogg similarity index 100% rename from sound/instruments/guitar/Db6.ogg rename to sound/runtime/instruments/guitar/Db6.ogg diff --git a/sound/instruments/guitar/Dn4.ogg b/sound/runtime/instruments/guitar/Dn4.ogg similarity index 100% rename from sound/instruments/guitar/Dn4.ogg rename to sound/runtime/instruments/guitar/Dn4.ogg diff --git a/sound/instruments/guitar/Dn5.ogg b/sound/runtime/instruments/guitar/Dn5.ogg similarity index 100% rename from sound/instruments/guitar/Dn5.ogg rename to sound/runtime/instruments/guitar/Dn5.ogg diff --git a/sound/instruments/guitar/Dn6.ogg b/sound/runtime/instruments/guitar/Dn6.ogg similarity index 100% rename from sound/instruments/guitar/Dn6.ogg rename to sound/runtime/instruments/guitar/Dn6.ogg diff --git a/sound/instruments/guitar/Eb4.ogg b/sound/runtime/instruments/guitar/Eb4.ogg similarity index 100% rename from sound/instruments/guitar/Eb4.ogg rename to sound/runtime/instruments/guitar/Eb4.ogg diff --git a/sound/instruments/guitar/Eb5.ogg b/sound/runtime/instruments/guitar/Eb5.ogg similarity index 100% rename from sound/instruments/guitar/Eb5.ogg rename to sound/runtime/instruments/guitar/Eb5.ogg diff --git a/sound/instruments/guitar/Eb6.ogg b/sound/runtime/instruments/guitar/Eb6.ogg similarity index 100% rename from sound/instruments/guitar/Eb6.ogg rename to sound/runtime/instruments/guitar/Eb6.ogg diff --git a/sound/instruments/guitar/En3.ogg b/sound/runtime/instruments/guitar/En3.ogg similarity index 100% rename from sound/instruments/guitar/En3.ogg rename to sound/runtime/instruments/guitar/En3.ogg diff --git a/sound/instruments/guitar/En4.ogg b/sound/runtime/instruments/guitar/En4.ogg similarity index 100% rename from sound/instruments/guitar/En4.ogg rename to sound/runtime/instruments/guitar/En4.ogg diff --git a/sound/instruments/guitar/En5.ogg b/sound/runtime/instruments/guitar/En5.ogg similarity index 100% rename from sound/instruments/guitar/En5.ogg rename to sound/runtime/instruments/guitar/En5.ogg diff --git a/sound/instruments/guitar/En6.ogg b/sound/runtime/instruments/guitar/En6.ogg similarity index 100% rename from sound/instruments/guitar/En6.ogg rename to sound/runtime/instruments/guitar/En6.ogg diff --git a/sound/instruments/guitar/Fn3.ogg b/sound/runtime/instruments/guitar/Fn3.ogg similarity index 100% rename from sound/instruments/guitar/Fn3.ogg rename to sound/runtime/instruments/guitar/Fn3.ogg diff --git a/sound/instruments/guitar/Fn4.ogg b/sound/runtime/instruments/guitar/Fn4.ogg similarity index 100% rename from sound/instruments/guitar/Fn4.ogg rename to sound/runtime/instruments/guitar/Fn4.ogg diff --git a/sound/instruments/guitar/Fn5.ogg b/sound/runtime/instruments/guitar/Fn5.ogg similarity index 100% rename from sound/instruments/guitar/Fn5.ogg rename to sound/runtime/instruments/guitar/Fn5.ogg diff --git a/sound/instruments/guitar/Fn6.ogg b/sound/runtime/instruments/guitar/Fn6.ogg similarity index 100% rename from sound/instruments/guitar/Fn6.ogg rename to sound/runtime/instruments/guitar/Fn6.ogg diff --git a/sound/instruments/guitar/Gb3.ogg b/sound/runtime/instruments/guitar/Gb3.ogg similarity index 100% rename from sound/instruments/guitar/Gb3.ogg rename to sound/runtime/instruments/guitar/Gb3.ogg diff --git a/sound/instruments/guitar/Gb4.ogg b/sound/runtime/instruments/guitar/Gb4.ogg similarity index 100% rename from sound/instruments/guitar/Gb4.ogg rename to sound/runtime/instruments/guitar/Gb4.ogg diff --git a/sound/instruments/guitar/Gb5.ogg b/sound/runtime/instruments/guitar/Gb5.ogg similarity index 100% rename from sound/instruments/guitar/Gb5.ogg rename to sound/runtime/instruments/guitar/Gb5.ogg diff --git a/sound/instruments/guitar/Gb6.ogg b/sound/runtime/instruments/guitar/Gb6.ogg similarity index 100% rename from sound/instruments/guitar/Gb6.ogg rename to sound/runtime/instruments/guitar/Gb6.ogg diff --git a/sound/instruments/guitar/Gn3.ogg b/sound/runtime/instruments/guitar/Gn3.ogg similarity index 100% rename from sound/instruments/guitar/Gn3.ogg rename to sound/runtime/instruments/guitar/Gn3.ogg diff --git a/sound/instruments/guitar/Gn4.ogg b/sound/runtime/instruments/guitar/Gn4.ogg similarity index 100% rename from sound/instruments/guitar/Gn4.ogg rename to sound/runtime/instruments/guitar/Gn4.ogg diff --git a/sound/instruments/guitar/Gn5.ogg b/sound/runtime/instruments/guitar/Gn5.ogg similarity index 100% rename from sound/instruments/guitar/Gn5.ogg rename to sound/runtime/instruments/guitar/Gn5.ogg diff --git a/sound/instruments/guitar/Gn6.ogg b/sound/runtime/instruments/guitar/Gn6.ogg similarity index 100% rename from sound/instruments/guitar/Gn6.ogg rename to sound/runtime/instruments/guitar/Gn6.ogg diff --git a/sound/instruments/harmonica/Ab2.mid b/sound/runtime/instruments/harmonica/Ab2.mid similarity index 100% rename from sound/instruments/harmonica/Ab2.mid rename to sound/runtime/instruments/harmonica/Ab2.mid diff --git a/sound/instruments/harmonica/Ab3.mid b/sound/runtime/instruments/harmonica/Ab3.mid similarity index 100% rename from sound/instruments/harmonica/Ab3.mid rename to sound/runtime/instruments/harmonica/Ab3.mid diff --git a/sound/instruments/harmonica/Ab4.mid b/sound/runtime/instruments/harmonica/Ab4.mid similarity index 100% rename from sound/instruments/harmonica/Ab4.mid rename to sound/runtime/instruments/harmonica/Ab4.mid diff --git a/sound/instruments/harmonica/Ab5.mid b/sound/runtime/instruments/harmonica/Ab5.mid similarity index 100% rename from sound/instruments/harmonica/Ab5.mid rename to sound/runtime/instruments/harmonica/Ab5.mid diff --git a/sound/instruments/harmonica/Ab6.mid b/sound/runtime/instruments/harmonica/Ab6.mid similarity index 100% rename from sound/instruments/harmonica/Ab6.mid rename to sound/runtime/instruments/harmonica/Ab6.mid diff --git a/sound/instruments/harmonica/An2.mid b/sound/runtime/instruments/harmonica/An2.mid similarity index 100% rename from sound/instruments/harmonica/An2.mid rename to sound/runtime/instruments/harmonica/An2.mid diff --git a/sound/instruments/harmonica/An3.mid b/sound/runtime/instruments/harmonica/An3.mid similarity index 100% rename from sound/instruments/harmonica/An3.mid rename to sound/runtime/instruments/harmonica/An3.mid diff --git a/sound/instruments/harmonica/An4.mid b/sound/runtime/instruments/harmonica/An4.mid similarity index 100% rename from sound/instruments/harmonica/An4.mid rename to sound/runtime/instruments/harmonica/An4.mid diff --git a/sound/instruments/harmonica/An5.mid b/sound/runtime/instruments/harmonica/An5.mid similarity index 100% rename from sound/instruments/harmonica/An5.mid rename to sound/runtime/instruments/harmonica/An5.mid diff --git a/sound/instruments/harmonica/An6.mid b/sound/runtime/instruments/harmonica/An6.mid similarity index 100% rename from sound/instruments/harmonica/An6.mid rename to sound/runtime/instruments/harmonica/An6.mid diff --git a/sound/instruments/harmonica/Bb2.mid b/sound/runtime/instruments/harmonica/Bb2.mid similarity index 100% rename from sound/instruments/harmonica/Bb2.mid rename to sound/runtime/instruments/harmonica/Bb2.mid diff --git a/sound/instruments/harmonica/Bb3.mid b/sound/runtime/instruments/harmonica/Bb3.mid similarity index 100% rename from sound/instruments/harmonica/Bb3.mid rename to sound/runtime/instruments/harmonica/Bb3.mid diff --git a/sound/instruments/harmonica/Bb4.mid b/sound/runtime/instruments/harmonica/Bb4.mid similarity index 100% rename from sound/instruments/harmonica/Bb4.mid rename to sound/runtime/instruments/harmonica/Bb4.mid diff --git a/sound/instruments/harmonica/Bb5.mid b/sound/runtime/instruments/harmonica/Bb5.mid similarity index 100% rename from sound/instruments/harmonica/Bb5.mid rename to sound/runtime/instruments/harmonica/Bb5.mid diff --git a/sound/instruments/harmonica/Bb6.mid b/sound/runtime/instruments/harmonica/Bb6.mid similarity index 100% rename from sound/instruments/harmonica/Bb6.mid rename to sound/runtime/instruments/harmonica/Bb6.mid diff --git a/sound/instruments/harmonica/Bn2.mid b/sound/runtime/instruments/harmonica/Bn2.mid similarity index 100% rename from sound/instruments/harmonica/Bn2.mid rename to sound/runtime/instruments/harmonica/Bn2.mid diff --git a/sound/instruments/harmonica/Bn3.mid b/sound/runtime/instruments/harmonica/Bn3.mid similarity index 100% rename from sound/instruments/harmonica/Bn3.mid rename to sound/runtime/instruments/harmonica/Bn3.mid diff --git a/sound/instruments/harmonica/Bn4.mid b/sound/runtime/instruments/harmonica/Bn4.mid similarity index 100% rename from sound/instruments/harmonica/Bn4.mid rename to sound/runtime/instruments/harmonica/Bn4.mid diff --git a/sound/instruments/harmonica/Bn5.mid b/sound/runtime/instruments/harmonica/Bn5.mid similarity index 100% rename from sound/instruments/harmonica/Bn5.mid rename to sound/runtime/instruments/harmonica/Bn5.mid diff --git a/sound/instruments/harmonica/Bn6.mid b/sound/runtime/instruments/harmonica/Bn6.mid similarity index 100% rename from sound/instruments/harmonica/Bn6.mid rename to sound/runtime/instruments/harmonica/Bn6.mid diff --git a/sound/instruments/harmonica/Cn2.mid b/sound/runtime/instruments/harmonica/Cn2.mid similarity index 100% rename from sound/instruments/harmonica/Cn2.mid rename to sound/runtime/instruments/harmonica/Cn2.mid diff --git a/sound/instruments/harmonica/Cn3.mid b/sound/runtime/instruments/harmonica/Cn3.mid similarity index 100% rename from sound/instruments/harmonica/Cn3.mid rename to sound/runtime/instruments/harmonica/Cn3.mid diff --git a/sound/instruments/harmonica/Cn4.mid b/sound/runtime/instruments/harmonica/Cn4.mid similarity index 100% rename from sound/instruments/harmonica/Cn4.mid rename to sound/runtime/instruments/harmonica/Cn4.mid diff --git a/sound/instruments/harmonica/Cn5.mid b/sound/runtime/instruments/harmonica/Cn5.mid similarity index 100% rename from sound/instruments/harmonica/Cn5.mid rename to sound/runtime/instruments/harmonica/Cn5.mid diff --git a/sound/instruments/harmonica/Cn6.mid b/sound/runtime/instruments/harmonica/Cn6.mid similarity index 100% rename from sound/instruments/harmonica/Cn6.mid rename to sound/runtime/instruments/harmonica/Cn6.mid diff --git a/sound/instruments/harmonica/Cn7.mid b/sound/runtime/instruments/harmonica/Cn7.mid similarity index 100% rename from sound/instruments/harmonica/Cn7.mid rename to sound/runtime/instruments/harmonica/Cn7.mid diff --git a/sound/instruments/harmonica/Db2.mid b/sound/runtime/instruments/harmonica/Db2.mid similarity index 100% rename from sound/instruments/harmonica/Db2.mid rename to sound/runtime/instruments/harmonica/Db2.mid diff --git a/sound/instruments/harmonica/Db3.mid b/sound/runtime/instruments/harmonica/Db3.mid similarity index 100% rename from sound/instruments/harmonica/Db3.mid rename to sound/runtime/instruments/harmonica/Db3.mid diff --git a/sound/instruments/harmonica/Db4.mid b/sound/runtime/instruments/harmonica/Db4.mid similarity index 100% rename from sound/instruments/harmonica/Db4.mid rename to sound/runtime/instruments/harmonica/Db4.mid diff --git a/sound/instruments/harmonica/Db5.mid b/sound/runtime/instruments/harmonica/Db5.mid similarity index 100% rename from sound/instruments/harmonica/Db5.mid rename to sound/runtime/instruments/harmonica/Db5.mid diff --git a/sound/instruments/harmonica/Db6.mid b/sound/runtime/instruments/harmonica/Db6.mid similarity index 100% rename from sound/instruments/harmonica/Db6.mid rename to sound/runtime/instruments/harmonica/Db6.mid diff --git a/sound/instruments/harmonica/Dn2.mid b/sound/runtime/instruments/harmonica/Dn2.mid similarity index 100% rename from sound/instruments/harmonica/Dn2.mid rename to sound/runtime/instruments/harmonica/Dn2.mid diff --git a/sound/instruments/harmonica/Dn3.mid b/sound/runtime/instruments/harmonica/Dn3.mid similarity index 100% rename from sound/instruments/harmonica/Dn3.mid rename to sound/runtime/instruments/harmonica/Dn3.mid diff --git a/sound/instruments/harmonica/Dn4.mid b/sound/runtime/instruments/harmonica/Dn4.mid similarity index 100% rename from sound/instruments/harmonica/Dn4.mid rename to sound/runtime/instruments/harmonica/Dn4.mid diff --git a/sound/instruments/harmonica/Dn5.mid b/sound/runtime/instruments/harmonica/Dn5.mid similarity index 100% rename from sound/instruments/harmonica/Dn5.mid rename to sound/runtime/instruments/harmonica/Dn5.mid diff --git a/sound/instruments/harmonica/Dn6.mid b/sound/runtime/instruments/harmonica/Dn6.mid similarity index 100% rename from sound/instruments/harmonica/Dn6.mid rename to sound/runtime/instruments/harmonica/Dn6.mid diff --git a/sound/instruments/harmonica/Eb2.mid b/sound/runtime/instruments/harmonica/Eb2.mid similarity index 100% rename from sound/instruments/harmonica/Eb2.mid rename to sound/runtime/instruments/harmonica/Eb2.mid diff --git a/sound/instruments/harmonica/Eb3.mid b/sound/runtime/instruments/harmonica/Eb3.mid similarity index 100% rename from sound/instruments/harmonica/Eb3.mid rename to sound/runtime/instruments/harmonica/Eb3.mid diff --git a/sound/instruments/harmonica/Eb4.mid b/sound/runtime/instruments/harmonica/Eb4.mid similarity index 100% rename from sound/instruments/harmonica/Eb4.mid rename to sound/runtime/instruments/harmonica/Eb4.mid diff --git a/sound/instruments/harmonica/Eb5.mid b/sound/runtime/instruments/harmonica/Eb5.mid similarity index 100% rename from sound/instruments/harmonica/Eb5.mid rename to sound/runtime/instruments/harmonica/Eb5.mid diff --git a/sound/instruments/harmonica/Eb6.mid b/sound/runtime/instruments/harmonica/Eb6.mid similarity index 100% rename from sound/instruments/harmonica/Eb6.mid rename to sound/runtime/instruments/harmonica/Eb6.mid diff --git a/sound/instruments/harmonica/En2.mid b/sound/runtime/instruments/harmonica/En2.mid similarity index 100% rename from sound/instruments/harmonica/En2.mid rename to sound/runtime/instruments/harmonica/En2.mid diff --git a/sound/instruments/harmonica/En3.mid b/sound/runtime/instruments/harmonica/En3.mid similarity index 100% rename from sound/instruments/harmonica/En3.mid rename to sound/runtime/instruments/harmonica/En3.mid diff --git a/sound/instruments/harmonica/En4.mid b/sound/runtime/instruments/harmonica/En4.mid similarity index 100% rename from sound/instruments/harmonica/En4.mid rename to sound/runtime/instruments/harmonica/En4.mid diff --git a/sound/instruments/harmonica/En5.mid b/sound/runtime/instruments/harmonica/En5.mid similarity index 100% rename from sound/instruments/harmonica/En5.mid rename to sound/runtime/instruments/harmonica/En5.mid diff --git a/sound/instruments/harmonica/En6.mid b/sound/runtime/instruments/harmonica/En6.mid similarity index 100% rename from sound/instruments/harmonica/En6.mid rename to sound/runtime/instruments/harmonica/En6.mid diff --git a/sound/instruments/harmonica/Fn2.mid b/sound/runtime/instruments/harmonica/Fn2.mid similarity index 100% rename from sound/instruments/harmonica/Fn2.mid rename to sound/runtime/instruments/harmonica/Fn2.mid diff --git a/sound/instruments/harmonica/Fn3.mid b/sound/runtime/instruments/harmonica/Fn3.mid similarity index 100% rename from sound/instruments/harmonica/Fn3.mid rename to sound/runtime/instruments/harmonica/Fn3.mid diff --git a/sound/instruments/harmonica/Fn4.mid b/sound/runtime/instruments/harmonica/Fn4.mid similarity index 100% rename from sound/instruments/harmonica/Fn4.mid rename to sound/runtime/instruments/harmonica/Fn4.mid diff --git a/sound/instruments/harmonica/Fn5.mid b/sound/runtime/instruments/harmonica/Fn5.mid similarity index 100% rename from sound/instruments/harmonica/Fn5.mid rename to sound/runtime/instruments/harmonica/Fn5.mid diff --git a/sound/instruments/harmonica/Fn6.mid b/sound/runtime/instruments/harmonica/Fn6.mid similarity index 100% rename from sound/instruments/harmonica/Fn6.mid rename to sound/runtime/instruments/harmonica/Fn6.mid diff --git a/sound/instruments/harmonica/Gb2.mid b/sound/runtime/instruments/harmonica/Gb2.mid similarity index 100% rename from sound/instruments/harmonica/Gb2.mid rename to sound/runtime/instruments/harmonica/Gb2.mid diff --git a/sound/instruments/harmonica/Gb3.mid b/sound/runtime/instruments/harmonica/Gb3.mid similarity index 100% rename from sound/instruments/harmonica/Gb3.mid rename to sound/runtime/instruments/harmonica/Gb3.mid diff --git a/sound/instruments/harmonica/Gb4.mid b/sound/runtime/instruments/harmonica/Gb4.mid similarity index 100% rename from sound/instruments/harmonica/Gb4.mid rename to sound/runtime/instruments/harmonica/Gb4.mid diff --git a/sound/instruments/harmonica/Gb5.mid b/sound/runtime/instruments/harmonica/Gb5.mid similarity index 100% rename from sound/instruments/harmonica/Gb5.mid rename to sound/runtime/instruments/harmonica/Gb5.mid diff --git a/sound/instruments/harmonica/Gb6.mid b/sound/runtime/instruments/harmonica/Gb6.mid similarity index 100% rename from sound/instruments/harmonica/Gb6.mid rename to sound/runtime/instruments/harmonica/Gb6.mid diff --git a/sound/instruments/harmonica/Gn2.mid b/sound/runtime/instruments/harmonica/Gn2.mid similarity index 100% rename from sound/instruments/harmonica/Gn2.mid rename to sound/runtime/instruments/harmonica/Gn2.mid diff --git a/sound/instruments/harmonica/Gn3.mid b/sound/runtime/instruments/harmonica/Gn3.mid similarity index 100% rename from sound/instruments/harmonica/Gn3.mid rename to sound/runtime/instruments/harmonica/Gn3.mid diff --git a/sound/instruments/harmonica/Gn4.mid b/sound/runtime/instruments/harmonica/Gn4.mid similarity index 100% rename from sound/instruments/harmonica/Gn4.mid rename to sound/runtime/instruments/harmonica/Gn4.mid diff --git a/sound/instruments/harmonica/Gn5.mid b/sound/runtime/instruments/harmonica/Gn5.mid similarity index 100% rename from sound/instruments/harmonica/Gn5.mid rename to sound/runtime/instruments/harmonica/Gn5.mid diff --git a/sound/instruments/harmonica/Gn6.mid b/sound/runtime/instruments/harmonica/Gn6.mid similarity index 100% rename from sound/instruments/harmonica/Gn6.mid rename to sound/runtime/instruments/harmonica/Gn6.mid diff --git a/sound/instruments/piano/Ab2.ogg b/sound/runtime/instruments/piano/Ab2.ogg similarity index 100% rename from sound/instruments/piano/Ab2.ogg rename to sound/runtime/instruments/piano/Ab2.ogg diff --git a/sound/instruments/piano/Ab3.ogg b/sound/runtime/instruments/piano/Ab3.ogg similarity index 100% rename from sound/instruments/piano/Ab3.ogg rename to sound/runtime/instruments/piano/Ab3.ogg diff --git a/sound/instruments/piano/Ab4.ogg b/sound/runtime/instruments/piano/Ab4.ogg similarity index 100% rename from sound/instruments/piano/Ab4.ogg rename to sound/runtime/instruments/piano/Ab4.ogg diff --git a/sound/instruments/piano/Ab5.ogg b/sound/runtime/instruments/piano/Ab5.ogg similarity index 100% rename from sound/instruments/piano/Ab5.ogg rename to sound/runtime/instruments/piano/Ab5.ogg diff --git a/sound/instruments/piano/Ab6.ogg b/sound/runtime/instruments/piano/Ab6.ogg similarity index 100% rename from sound/instruments/piano/Ab6.ogg rename to sound/runtime/instruments/piano/Ab6.ogg diff --git a/sound/instruments/piano/Ab7.ogg b/sound/runtime/instruments/piano/Ab7.ogg similarity index 100% rename from sound/instruments/piano/Ab7.ogg rename to sound/runtime/instruments/piano/Ab7.ogg diff --git a/sound/instruments/piano/Ab8.ogg b/sound/runtime/instruments/piano/Ab8.ogg similarity index 100% rename from sound/instruments/piano/Ab8.ogg rename to sound/runtime/instruments/piano/Ab8.ogg diff --git a/sound/instruments/piano/An1.ogg b/sound/runtime/instruments/piano/An1.ogg similarity index 100% rename from sound/instruments/piano/An1.ogg rename to sound/runtime/instruments/piano/An1.ogg diff --git a/sound/instruments/piano/An2.ogg b/sound/runtime/instruments/piano/An2.ogg similarity index 100% rename from sound/instruments/piano/An2.ogg rename to sound/runtime/instruments/piano/An2.ogg diff --git a/sound/instruments/piano/An3.ogg b/sound/runtime/instruments/piano/An3.ogg similarity index 100% rename from sound/instruments/piano/An3.ogg rename to sound/runtime/instruments/piano/An3.ogg diff --git a/sound/instruments/piano/An4.ogg b/sound/runtime/instruments/piano/An4.ogg similarity index 100% rename from sound/instruments/piano/An4.ogg rename to sound/runtime/instruments/piano/An4.ogg diff --git a/sound/instruments/piano/An5.ogg b/sound/runtime/instruments/piano/An5.ogg similarity index 100% rename from sound/instruments/piano/An5.ogg rename to sound/runtime/instruments/piano/An5.ogg diff --git a/sound/instruments/piano/An6.ogg b/sound/runtime/instruments/piano/An6.ogg similarity index 100% rename from sound/instruments/piano/An6.ogg rename to sound/runtime/instruments/piano/An6.ogg diff --git a/sound/instruments/piano/An7.ogg b/sound/runtime/instruments/piano/An7.ogg similarity index 100% rename from sound/instruments/piano/An7.ogg rename to sound/runtime/instruments/piano/An7.ogg diff --git a/sound/instruments/piano/An8.ogg b/sound/runtime/instruments/piano/An8.ogg similarity index 100% rename from sound/instruments/piano/An8.ogg rename to sound/runtime/instruments/piano/An8.ogg diff --git a/sound/instruments/piano/Bb1.ogg b/sound/runtime/instruments/piano/Bb1.ogg similarity index 100% rename from sound/instruments/piano/Bb1.ogg rename to sound/runtime/instruments/piano/Bb1.ogg diff --git a/sound/instruments/piano/Bb2.ogg b/sound/runtime/instruments/piano/Bb2.ogg similarity index 100% rename from sound/instruments/piano/Bb2.ogg rename to sound/runtime/instruments/piano/Bb2.ogg diff --git a/sound/instruments/piano/Bb3.ogg b/sound/runtime/instruments/piano/Bb3.ogg similarity index 100% rename from sound/instruments/piano/Bb3.ogg rename to sound/runtime/instruments/piano/Bb3.ogg diff --git a/sound/instruments/piano/Bb4.ogg b/sound/runtime/instruments/piano/Bb4.ogg similarity index 100% rename from sound/instruments/piano/Bb4.ogg rename to sound/runtime/instruments/piano/Bb4.ogg diff --git a/sound/instruments/piano/Bb5.ogg b/sound/runtime/instruments/piano/Bb5.ogg similarity index 100% rename from sound/instruments/piano/Bb5.ogg rename to sound/runtime/instruments/piano/Bb5.ogg diff --git a/sound/instruments/piano/Bb6.ogg b/sound/runtime/instruments/piano/Bb6.ogg similarity index 100% rename from sound/instruments/piano/Bb6.ogg rename to sound/runtime/instruments/piano/Bb6.ogg diff --git a/sound/instruments/piano/Bb7.ogg b/sound/runtime/instruments/piano/Bb7.ogg similarity index 100% rename from sound/instruments/piano/Bb7.ogg rename to sound/runtime/instruments/piano/Bb7.ogg diff --git a/sound/instruments/piano/Bb8.ogg b/sound/runtime/instruments/piano/Bb8.ogg similarity index 100% rename from sound/instruments/piano/Bb8.ogg rename to sound/runtime/instruments/piano/Bb8.ogg diff --git a/sound/instruments/piano/Bn1.ogg b/sound/runtime/instruments/piano/Bn1.ogg similarity index 100% rename from sound/instruments/piano/Bn1.ogg rename to sound/runtime/instruments/piano/Bn1.ogg diff --git a/sound/instruments/piano/Bn2.ogg b/sound/runtime/instruments/piano/Bn2.ogg similarity index 100% rename from sound/instruments/piano/Bn2.ogg rename to sound/runtime/instruments/piano/Bn2.ogg diff --git a/sound/instruments/piano/Bn3.ogg b/sound/runtime/instruments/piano/Bn3.ogg similarity index 100% rename from sound/instruments/piano/Bn3.ogg rename to sound/runtime/instruments/piano/Bn3.ogg diff --git a/sound/instruments/piano/Bn4.ogg b/sound/runtime/instruments/piano/Bn4.ogg similarity index 100% rename from sound/instruments/piano/Bn4.ogg rename to sound/runtime/instruments/piano/Bn4.ogg diff --git a/sound/instruments/piano/Bn5.ogg b/sound/runtime/instruments/piano/Bn5.ogg similarity index 100% rename from sound/instruments/piano/Bn5.ogg rename to sound/runtime/instruments/piano/Bn5.ogg diff --git a/sound/instruments/piano/Bn6.ogg b/sound/runtime/instruments/piano/Bn6.ogg similarity index 100% rename from sound/instruments/piano/Bn6.ogg rename to sound/runtime/instruments/piano/Bn6.ogg diff --git a/sound/instruments/piano/Bn7.ogg b/sound/runtime/instruments/piano/Bn7.ogg similarity index 100% rename from sound/instruments/piano/Bn7.ogg rename to sound/runtime/instruments/piano/Bn7.ogg diff --git a/sound/instruments/piano/Bn8.ogg b/sound/runtime/instruments/piano/Bn8.ogg similarity index 100% rename from sound/instruments/piano/Bn8.ogg rename to sound/runtime/instruments/piano/Bn8.ogg diff --git a/sound/instruments/piano/Cn2.ogg b/sound/runtime/instruments/piano/Cn2.ogg similarity index 100% rename from sound/instruments/piano/Cn2.ogg rename to sound/runtime/instruments/piano/Cn2.ogg diff --git a/sound/instruments/piano/Cn3.ogg b/sound/runtime/instruments/piano/Cn3.ogg similarity index 100% rename from sound/instruments/piano/Cn3.ogg rename to sound/runtime/instruments/piano/Cn3.ogg diff --git a/sound/instruments/piano/Cn4.ogg b/sound/runtime/instruments/piano/Cn4.ogg similarity index 100% rename from sound/instruments/piano/Cn4.ogg rename to sound/runtime/instruments/piano/Cn4.ogg diff --git a/sound/instruments/piano/Cn5.ogg b/sound/runtime/instruments/piano/Cn5.ogg similarity index 100% rename from sound/instruments/piano/Cn5.ogg rename to sound/runtime/instruments/piano/Cn5.ogg diff --git a/sound/instruments/piano/Cn6.ogg b/sound/runtime/instruments/piano/Cn6.ogg similarity index 100% rename from sound/instruments/piano/Cn6.ogg rename to sound/runtime/instruments/piano/Cn6.ogg diff --git a/sound/instruments/piano/Cn7.ogg b/sound/runtime/instruments/piano/Cn7.ogg similarity index 100% rename from sound/instruments/piano/Cn7.ogg rename to sound/runtime/instruments/piano/Cn7.ogg diff --git a/sound/instruments/piano/Cn8.ogg b/sound/runtime/instruments/piano/Cn8.ogg similarity index 100% rename from sound/instruments/piano/Cn8.ogg rename to sound/runtime/instruments/piano/Cn8.ogg diff --git a/sound/instruments/piano/Cn9.ogg b/sound/runtime/instruments/piano/Cn9.ogg similarity index 100% rename from sound/instruments/piano/Cn9.ogg rename to sound/runtime/instruments/piano/Cn9.ogg diff --git a/sound/instruments/piano/Db2.ogg b/sound/runtime/instruments/piano/Db2.ogg similarity index 100% rename from sound/instruments/piano/Db2.ogg rename to sound/runtime/instruments/piano/Db2.ogg diff --git a/sound/instruments/piano/Db3.ogg b/sound/runtime/instruments/piano/Db3.ogg similarity index 100% rename from sound/instruments/piano/Db3.ogg rename to sound/runtime/instruments/piano/Db3.ogg diff --git a/sound/instruments/piano/Db4.ogg b/sound/runtime/instruments/piano/Db4.ogg similarity index 100% rename from sound/instruments/piano/Db4.ogg rename to sound/runtime/instruments/piano/Db4.ogg diff --git a/sound/instruments/piano/Db5.ogg b/sound/runtime/instruments/piano/Db5.ogg similarity index 100% rename from sound/instruments/piano/Db5.ogg rename to sound/runtime/instruments/piano/Db5.ogg diff --git a/sound/instruments/piano/Db6.ogg b/sound/runtime/instruments/piano/Db6.ogg similarity index 100% rename from sound/instruments/piano/Db6.ogg rename to sound/runtime/instruments/piano/Db6.ogg diff --git a/sound/instruments/piano/Db7.ogg b/sound/runtime/instruments/piano/Db7.ogg similarity index 100% rename from sound/instruments/piano/Db7.ogg rename to sound/runtime/instruments/piano/Db7.ogg diff --git a/sound/instruments/piano/Db8.ogg b/sound/runtime/instruments/piano/Db8.ogg similarity index 100% rename from sound/instruments/piano/Db8.ogg rename to sound/runtime/instruments/piano/Db8.ogg diff --git a/sound/instruments/piano/Dn2.ogg b/sound/runtime/instruments/piano/Dn2.ogg similarity index 100% rename from sound/instruments/piano/Dn2.ogg rename to sound/runtime/instruments/piano/Dn2.ogg diff --git a/sound/instruments/piano/Dn3.ogg b/sound/runtime/instruments/piano/Dn3.ogg similarity index 100% rename from sound/instruments/piano/Dn3.ogg rename to sound/runtime/instruments/piano/Dn3.ogg diff --git a/sound/instruments/piano/Dn4.ogg b/sound/runtime/instruments/piano/Dn4.ogg similarity index 100% rename from sound/instruments/piano/Dn4.ogg rename to sound/runtime/instruments/piano/Dn4.ogg diff --git a/sound/instruments/piano/Dn5.ogg b/sound/runtime/instruments/piano/Dn5.ogg similarity index 100% rename from sound/instruments/piano/Dn5.ogg rename to sound/runtime/instruments/piano/Dn5.ogg diff --git a/sound/instruments/piano/Dn6.ogg b/sound/runtime/instruments/piano/Dn6.ogg similarity index 100% rename from sound/instruments/piano/Dn6.ogg rename to sound/runtime/instruments/piano/Dn6.ogg diff --git a/sound/instruments/piano/Dn7.ogg b/sound/runtime/instruments/piano/Dn7.ogg similarity index 100% rename from sound/instruments/piano/Dn7.ogg rename to sound/runtime/instruments/piano/Dn7.ogg diff --git a/sound/instruments/piano/Dn8.ogg b/sound/runtime/instruments/piano/Dn8.ogg similarity index 100% rename from sound/instruments/piano/Dn8.ogg rename to sound/runtime/instruments/piano/Dn8.ogg diff --git a/sound/instruments/piano/Eb2.ogg b/sound/runtime/instruments/piano/Eb2.ogg similarity index 100% rename from sound/instruments/piano/Eb2.ogg rename to sound/runtime/instruments/piano/Eb2.ogg diff --git a/sound/instruments/piano/Eb3.ogg b/sound/runtime/instruments/piano/Eb3.ogg similarity index 100% rename from sound/instruments/piano/Eb3.ogg rename to sound/runtime/instruments/piano/Eb3.ogg diff --git a/sound/instruments/piano/Eb4.ogg b/sound/runtime/instruments/piano/Eb4.ogg similarity index 100% rename from sound/instruments/piano/Eb4.ogg rename to sound/runtime/instruments/piano/Eb4.ogg diff --git a/sound/instruments/piano/Eb5.ogg b/sound/runtime/instruments/piano/Eb5.ogg similarity index 100% rename from sound/instruments/piano/Eb5.ogg rename to sound/runtime/instruments/piano/Eb5.ogg diff --git a/sound/instruments/piano/Eb6.ogg b/sound/runtime/instruments/piano/Eb6.ogg similarity index 100% rename from sound/instruments/piano/Eb6.ogg rename to sound/runtime/instruments/piano/Eb6.ogg diff --git a/sound/instruments/piano/Eb7.ogg b/sound/runtime/instruments/piano/Eb7.ogg similarity index 100% rename from sound/instruments/piano/Eb7.ogg rename to sound/runtime/instruments/piano/Eb7.ogg diff --git a/sound/instruments/piano/Eb8.ogg b/sound/runtime/instruments/piano/Eb8.ogg similarity index 100% rename from sound/instruments/piano/Eb8.ogg rename to sound/runtime/instruments/piano/Eb8.ogg diff --git a/sound/instruments/piano/En2.ogg b/sound/runtime/instruments/piano/En2.ogg similarity index 100% rename from sound/instruments/piano/En2.ogg rename to sound/runtime/instruments/piano/En2.ogg diff --git a/sound/instruments/piano/En3.ogg b/sound/runtime/instruments/piano/En3.ogg similarity index 100% rename from sound/instruments/piano/En3.ogg rename to sound/runtime/instruments/piano/En3.ogg diff --git a/sound/instruments/piano/En4.ogg b/sound/runtime/instruments/piano/En4.ogg similarity index 100% rename from sound/instruments/piano/En4.ogg rename to sound/runtime/instruments/piano/En4.ogg diff --git a/sound/instruments/piano/En5.ogg b/sound/runtime/instruments/piano/En5.ogg similarity index 100% rename from sound/instruments/piano/En5.ogg rename to sound/runtime/instruments/piano/En5.ogg diff --git a/sound/instruments/piano/En6.ogg b/sound/runtime/instruments/piano/En6.ogg similarity index 100% rename from sound/instruments/piano/En6.ogg rename to sound/runtime/instruments/piano/En6.ogg diff --git a/sound/instruments/piano/En7.ogg b/sound/runtime/instruments/piano/En7.ogg similarity index 100% rename from sound/instruments/piano/En7.ogg rename to sound/runtime/instruments/piano/En7.ogg diff --git a/sound/instruments/piano/En8.ogg b/sound/runtime/instruments/piano/En8.ogg similarity index 100% rename from sound/instruments/piano/En8.ogg rename to sound/runtime/instruments/piano/En8.ogg diff --git a/sound/instruments/piano/Fn2.ogg b/sound/runtime/instruments/piano/Fn2.ogg similarity index 100% rename from sound/instruments/piano/Fn2.ogg rename to sound/runtime/instruments/piano/Fn2.ogg diff --git a/sound/instruments/piano/Fn3.ogg b/sound/runtime/instruments/piano/Fn3.ogg similarity index 100% rename from sound/instruments/piano/Fn3.ogg rename to sound/runtime/instruments/piano/Fn3.ogg diff --git a/sound/instruments/piano/Fn4.ogg b/sound/runtime/instruments/piano/Fn4.ogg similarity index 100% rename from sound/instruments/piano/Fn4.ogg rename to sound/runtime/instruments/piano/Fn4.ogg diff --git a/sound/instruments/piano/Fn5.ogg b/sound/runtime/instruments/piano/Fn5.ogg similarity index 100% rename from sound/instruments/piano/Fn5.ogg rename to sound/runtime/instruments/piano/Fn5.ogg diff --git a/sound/instruments/piano/Fn6.ogg b/sound/runtime/instruments/piano/Fn6.ogg similarity index 100% rename from sound/instruments/piano/Fn6.ogg rename to sound/runtime/instruments/piano/Fn6.ogg diff --git a/sound/instruments/piano/Fn7.ogg b/sound/runtime/instruments/piano/Fn7.ogg similarity index 100% rename from sound/instruments/piano/Fn7.ogg rename to sound/runtime/instruments/piano/Fn7.ogg diff --git a/sound/instruments/piano/Fn8.ogg b/sound/runtime/instruments/piano/Fn8.ogg similarity index 100% rename from sound/instruments/piano/Fn8.ogg rename to sound/runtime/instruments/piano/Fn8.ogg diff --git a/sound/instruments/piano/Gb2.ogg b/sound/runtime/instruments/piano/Gb2.ogg similarity index 100% rename from sound/instruments/piano/Gb2.ogg rename to sound/runtime/instruments/piano/Gb2.ogg diff --git a/sound/instruments/piano/Gb3.ogg b/sound/runtime/instruments/piano/Gb3.ogg similarity index 100% rename from sound/instruments/piano/Gb3.ogg rename to sound/runtime/instruments/piano/Gb3.ogg diff --git a/sound/instruments/piano/Gb4.ogg b/sound/runtime/instruments/piano/Gb4.ogg similarity index 100% rename from sound/instruments/piano/Gb4.ogg rename to sound/runtime/instruments/piano/Gb4.ogg diff --git a/sound/instruments/piano/Gb5.ogg b/sound/runtime/instruments/piano/Gb5.ogg similarity index 100% rename from sound/instruments/piano/Gb5.ogg rename to sound/runtime/instruments/piano/Gb5.ogg diff --git a/sound/instruments/piano/Gb6.ogg b/sound/runtime/instruments/piano/Gb6.ogg similarity index 100% rename from sound/instruments/piano/Gb6.ogg rename to sound/runtime/instruments/piano/Gb6.ogg diff --git a/sound/instruments/piano/Gb7.ogg b/sound/runtime/instruments/piano/Gb7.ogg similarity index 100% rename from sound/instruments/piano/Gb7.ogg rename to sound/runtime/instruments/piano/Gb7.ogg diff --git a/sound/instruments/piano/Gb8.ogg b/sound/runtime/instruments/piano/Gb8.ogg similarity index 100% rename from sound/instruments/piano/Gb8.ogg rename to sound/runtime/instruments/piano/Gb8.ogg diff --git a/sound/instruments/piano/Gn2.ogg b/sound/runtime/instruments/piano/Gn2.ogg similarity index 100% rename from sound/instruments/piano/Gn2.ogg rename to sound/runtime/instruments/piano/Gn2.ogg diff --git a/sound/instruments/piano/Gn3.ogg b/sound/runtime/instruments/piano/Gn3.ogg similarity index 100% rename from sound/instruments/piano/Gn3.ogg rename to sound/runtime/instruments/piano/Gn3.ogg diff --git a/sound/instruments/piano/Gn4.ogg b/sound/runtime/instruments/piano/Gn4.ogg similarity index 100% rename from sound/instruments/piano/Gn4.ogg rename to sound/runtime/instruments/piano/Gn4.ogg diff --git a/sound/instruments/piano/Gn5.ogg b/sound/runtime/instruments/piano/Gn5.ogg similarity index 100% rename from sound/instruments/piano/Gn5.ogg rename to sound/runtime/instruments/piano/Gn5.ogg diff --git a/sound/instruments/piano/Gn6.ogg b/sound/runtime/instruments/piano/Gn6.ogg similarity index 100% rename from sound/instruments/piano/Gn6.ogg rename to sound/runtime/instruments/piano/Gn6.ogg diff --git a/sound/instruments/piano/Gn7.ogg b/sound/runtime/instruments/piano/Gn7.ogg similarity index 100% rename from sound/instruments/piano/Gn7.ogg rename to sound/runtime/instruments/piano/Gn7.ogg diff --git a/sound/instruments/piano/Gn8.ogg b/sound/runtime/instruments/piano/Gn8.ogg similarity index 100% rename from sound/instruments/piano/Gn8.ogg rename to sound/runtime/instruments/piano/Gn8.ogg diff --git a/sound/instruments/recorder/Ab2.mid b/sound/runtime/instruments/recorder/Ab2.mid similarity index 100% rename from sound/instruments/recorder/Ab2.mid rename to sound/runtime/instruments/recorder/Ab2.mid diff --git a/sound/instruments/recorder/Ab3.mid b/sound/runtime/instruments/recorder/Ab3.mid similarity index 100% rename from sound/instruments/recorder/Ab3.mid rename to sound/runtime/instruments/recorder/Ab3.mid diff --git a/sound/instruments/recorder/Ab4.mid b/sound/runtime/instruments/recorder/Ab4.mid similarity index 100% rename from sound/instruments/recorder/Ab4.mid rename to sound/runtime/instruments/recorder/Ab4.mid diff --git a/sound/instruments/recorder/Ab5.mid b/sound/runtime/instruments/recorder/Ab5.mid similarity index 100% rename from sound/instruments/recorder/Ab5.mid rename to sound/runtime/instruments/recorder/Ab5.mid diff --git a/sound/instruments/recorder/Ab6.mid b/sound/runtime/instruments/recorder/Ab6.mid similarity index 100% rename from sound/instruments/recorder/Ab6.mid rename to sound/runtime/instruments/recorder/Ab6.mid diff --git a/sound/instruments/recorder/An2.mid b/sound/runtime/instruments/recorder/An2.mid similarity index 100% rename from sound/instruments/recorder/An2.mid rename to sound/runtime/instruments/recorder/An2.mid diff --git a/sound/instruments/recorder/An3.mid b/sound/runtime/instruments/recorder/An3.mid similarity index 100% rename from sound/instruments/recorder/An3.mid rename to sound/runtime/instruments/recorder/An3.mid diff --git a/sound/instruments/recorder/An4.mid b/sound/runtime/instruments/recorder/An4.mid similarity index 100% rename from sound/instruments/recorder/An4.mid rename to sound/runtime/instruments/recorder/An4.mid diff --git a/sound/instruments/recorder/An5.mid b/sound/runtime/instruments/recorder/An5.mid similarity index 100% rename from sound/instruments/recorder/An5.mid rename to sound/runtime/instruments/recorder/An5.mid diff --git a/sound/instruments/recorder/An6.mid b/sound/runtime/instruments/recorder/An6.mid similarity index 100% rename from sound/instruments/recorder/An6.mid rename to sound/runtime/instruments/recorder/An6.mid diff --git a/sound/instruments/recorder/Bb2.mid b/sound/runtime/instruments/recorder/Bb2.mid similarity index 100% rename from sound/instruments/recorder/Bb2.mid rename to sound/runtime/instruments/recorder/Bb2.mid diff --git a/sound/instruments/recorder/Bb3.mid b/sound/runtime/instruments/recorder/Bb3.mid similarity index 100% rename from sound/instruments/recorder/Bb3.mid rename to sound/runtime/instruments/recorder/Bb3.mid diff --git a/sound/instruments/recorder/Bb4.mid b/sound/runtime/instruments/recorder/Bb4.mid similarity index 100% rename from sound/instruments/recorder/Bb4.mid rename to sound/runtime/instruments/recorder/Bb4.mid diff --git a/sound/instruments/recorder/Bb5.mid b/sound/runtime/instruments/recorder/Bb5.mid similarity index 100% rename from sound/instruments/recorder/Bb5.mid rename to sound/runtime/instruments/recorder/Bb5.mid diff --git a/sound/instruments/recorder/Bb6.mid b/sound/runtime/instruments/recorder/Bb6.mid similarity index 100% rename from sound/instruments/recorder/Bb6.mid rename to sound/runtime/instruments/recorder/Bb6.mid diff --git a/sound/instruments/recorder/Bn2.mid b/sound/runtime/instruments/recorder/Bn2.mid similarity index 100% rename from sound/instruments/recorder/Bn2.mid rename to sound/runtime/instruments/recorder/Bn2.mid diff --git a/sound/instruments/recorder/Bn3.mid b/sound/runtime/instruments/recorder/Bn3.mid similarity index 100% rename from sound/instruments/recorder/Bn3.mid rename to sound/runtime/instruments/recorder/Bn3.mid diff --git a/sound/instruments/recorder/Bn4.mid b/sound/runtime/instruments/recorder/Bn4.mid similarity index 100% rename from sound/instruments/recorder/Bn4.mid rename to sound/runtime/instruments/recorder/Bn4.mid diff --git a/sound/instruments/recorder/Bn5.mid b/sound/runtime/instruments/recorder/Bn5.mid similarity index 100% rename from sound/instruments/recorder/Bn5.mid rename to sound/runtime/instruments/recorder/Bn5.mid diff --git a/sound/instruments/recorder/Bn6.mid b/sound/runtime/instruments/recorder/Bn6.mid similarity index 100% rename from sound/instruments/recorder/Bn6.mid rename to sound/runtime/instruments/recorder/Bn6.mid diff --git a/sound/instruments/recorder/Cn2.mid b/sound/runtime/instruments/recorder/Cn2.mid similarity index 100% rename from sound/instruments/recorder/Cn2.mid rename to sound/runtime/instruments/recorder/Cn2.mid diff --git a/sound/instruments/recorder/Cn3.mid b/sound/runtime/instruments/recorder/Cn3.mid similarity index 100% rename from sound/instruments/recorder/Cn3.mid rename to sound/runtime/instruments/recorder/Cn3.mid diff --git a/sound/instruments/recorder/Cn4.mid b/sound/runtime/instruments/recorder/Cn4.mid similarity index 100% rename from sound/instruments/recorder/Cn4.mid rename to sound/runtime/instruments/recorder/Cn4.mid diff --git a/sound/instruments/recorder/Cn5.mid b/sound/runtime/instruments/recorder/Cn5.mid similarity index 100% rename from sound/instruments/recorder/Cn5.mid rename to sound/runtime/instruments/recorder/Cn5.mid diff --git a/sound/instruments/recorder/Cn6.mid b/sound/runtime/instruments/recorder/Cn6.mid similarity index 100% rename from sound/instruments/recorder/Cn6.mid rename to sound/runtime/instruments/recorder/Cn6.mid diff --git a/sound/instruments/recorder/Cn7.mid b/sound/runtime/instruments/recorder/Cn7.mid similarity index 100% rename from sound/instruments/recorder/Cn7.mid rename to sound/runtime/instruments/recorder/Cn7.mid diff --git a/sound/instruments/recorder/Db2.mid b/sound/runtime/instruments/recorder/Db2.mid similarity index 100% rename from sound/instruments/recorder/Db2.mid rename to sound/runtime/instruments/recorder/Db2.mid diff --git a/sound/instruments/recorder/Db3.mid b/sound/runtime/instruments/recorder/Db3.mid similarity index 100% rename from sound/instruments/recorder/Db3.mid rename to sound/runtime/instruments/recorder/Db3.mid diff --git a/sound/instruments/recorder/Db4.mid b/sound/runtime/instruments/recorder/Db4.mid similarity index 100% rename from sound/instruments/recorder/Db4.mid rename to sound/runtime/instruments/recorder/Db4.mid diff --git a/sound/instruments/recorder/Db5.mid b/sound/runtime/instruments/recorder/Db5.mid similarity index 100% rename from sound/instruments/recorder/Db5.mid rename to sound/runtime/instruments/recorder/Db5.mid diff --git a/sound/instruments/recorder/Db6.mid b/sound/runtime/instruments/recorder/Db6.mid similarity index 100% rename from sound/instruments/recorder/Db6.mid rename to sound/runtime/instruments/recorder/Db6.mid diff --git a/sound/instruments/recorder/Db7.mid b/sound/runtime/instruments/recorder/Db7.mid similarity index 100% rename from sound/instruments/recorder/Db7.mid rename to sound/runtime/instruments/recorder/Db7.mid diff --git a/sound/instruments/recorder/Dn2.mid b/sound/runtime/instruments/recorder/Dn2.mid similarity index 100% rename from sound/instruments/recorder/Dn2.mid rename to sound/runtime/instruments/recorder/Dn2.mid diff --git a/sound/instruments/recorder/Dn3.mid b/sound/runtime/instruments/recorder/Dn3.mid similarity index 100% rename from sound/instruments/recorder/Dn3.mid rename to sound/runtime/instruments/recorder/Dn3.mid diff --git a/sound/instruments/recorder/Dn4.mid b/sound/runtime/instruments/recorder/Dn4.mid similarity index 100% rename from sound/instruments/recorder/Dn4.mid rename to sound/runtime/instruments/recorder/Dn4.mid diff --git a/sound/instruments/recorder/Dn5.mid b/sound/runtime/instruments/recorder/Dn5.mid similarity index 100% rename from sound/instruments/recorder/Dn5.mid rename to sound/runtime/instruments/recorder/Dn5.mid diff --git a/sound/instruments/recorder/Dn6.mid b/sound/runtime/instruments/recorder/Dn6.mid similarity index 100% rename from sound/instruments/recorder/Dn6.mid rename to sound/runtime/instruments/recorder/Dn6.mid diff --git a/sound/instruments/recorder/Eb2.mid b/sound/runtime/instruments/recorder/Eb2.mid similarity index 100% rename from sound/instruments/recorder/Eb2.mid rename to sound/runtime/instruments/recorder/Eb2.mid diff --git a/sound/instruments/recorder/Eb3.mid b/sound/runtime/instruments/recorder/Eb3.mid similarity index 100% rename from sound/instruments/recorder/Eb3.mid rename to sound/runtime/instruments/recorder/Eb3.mid diff --git a/sound/instruments/recorder/Eb4.mid b/sound/runtime/instruments/recorder/Eb4.mid similarity index 100% rename from sound/instruments/recorder/Eb4.mid rename to sound/runtime/instruments/recorder/Eb4.mid diff --git a/sound/instruments/recorder/Eb5.mid b/sound/runtime/instruments/recorder/Eb5.mid similarity index 100% rename from sound/instruments/recorder/Eb5.mid rename to sound/runtime/instruments/recorder/Eb5.mid diff --git a/sound/instruments/recorder/Eb6.mid b/sound/runtime/instruments/recorder/Eb6.mid similarity index 100% rename from sound/instruments/recorder/Eb6.mid rename to sound/runtime/instruments/recorder/Eb6.mid diff --git a/sound/instruments/recorder/En2.mid b/sound/runtime/instruments/recorder/En2.mid similarity index 100% rename from sound/instruments/recorder/En2.mid rename to sound/runtime/instruments/recorder/En2.mid diff --git a/sound/instruments/recorder/En3.mid b/sound/runtime/instruments/recorder/En3.mid similarity index 100% rename from sound/instruments/recorder/En3.mid rename to sound/runtime/instruments/recorder/En3.mid diff --git a/sound/instruments/recorder/En4.mid b/sound/runtime/instruments/recorder/En4.mid similarity index 100% rename from sound/instruments/recorder/En4.mid rename to sound/runtime/instruments/recorder/En4.mid diff --git a/sound/instruments/recorder/En5.mid b/sound/runtime/instruments/recorder/En5.mid similarity index 100% rename from sound/instruments/recorder/En5.mid rename to sound/runtime/instruments/recorder/En5.mid diff --git a/sound/instruments/recorder/En6.mid b/sound/runtime/instruments/recorder/En6.mid similarity index 100% rename from sound/instruments/recorder/En6.mid rename to sound/runtime/instruments/recorder/En6.mid diff --git a/sound/instruments/recorder/Fn2.mid b/sound/runtime/instruments/recorder/Fn2.mid similarity index 100% rename from sound/instruments/recorder/Fn2.mid rename to sound/runtime/instruments/recorder/Fn2.mid diff --git a/sound/instruments/recorder/Fn3.mid b/sound/runtime/instruments/recorder/Fn3.mid similarity index 100% rename from sound/instruments/recorder/Fn3.mid rename to sound/runtime/instruments/recorder/Fn3.mid diff --git a/sound/instruments/recorder/Fn4.mid b/sound/runtime/instruments/recorder/Fn4.mid similarity index 100% rename from sound/instruments/recorder/Fn4.mid rename to sound/runtime/instruments/recorder/Fn4.mid diff --git a/sound/instruments/recorder/Fn5.mid b/sound/runtime/instruments/recorder/Fn5.mid similarity index 100% rename from sound/instruments/recorder/Fn5.mid rename to sound/runtime/instruments/recorder/Fn5.mid diff --git a/sound/instruments/recorder/Fn6.mid b/sound/runtime/instruments/recorder/Fn6.mid similarity index 100% rename from sound/instruments/recorder/Fn6.mid rename to sound/runtime/instruments/recorder/Fn6.mid diff --git a/sound/instruments/recorder/Gb2.mid b/sound/runtime/instruments/recorder/Gb2.mid similarity index 100% rename from sound/instruments/recorder/Gb2.mid rename to sound/runtime/instruments/recorder/Gb2.mid diff --git a/sound/instruments/recorder/Gb3.mid b/sound/runtime/instruments/recorder/Gb3.mid similarity index 100% rename from sound/instruments/recorder/Gb3.mid rename to sound/runtime/instruments/recorder/Gb3.mid diff --git a/sound/instruments/recorder/Gb4.mid b/sound/runtime/instruments/recorder/Gb4.mid similarity index 100% rename from sound/instruments/recorder/Gb4.mid rename to sound/runtime/instruments/recorder/Gb4.mid diff --git a/sound/instruments/recorder/Gb5.mid b/sound/runtime/instruments/recorder/Gb5.mid similarity index 100% rename from sound/instruments/recorder/Gb5.mid rename to sound/runtime/instruments/recorder/Gb5.mid diff --git a/sound/instruments/recorder/Gb6.mid b/sound/runtime/instruments/recorder/Gb6.mid similarity index 100% rename from sound/instruments/recorder/Gb6.mid rename to sound/runtime/instruments/recorder/Gb6.mid diff --git a/sound/instruments/recorder/Gn2.mid b/sound/runtime/instruments/recorder/Gn2.mid similarity index 100% rename from sound/instruments/recorder/Gn2.mid rename to sound/runtime/instruments/recorder/Gn2.mid diff --git a/sound/instruments/recorder/Gn3.mid b/sound/runtime/instruments/recorder/Gn3.mid similarity index 100% rename from sound/instruments/recorder/Gn3.mid rename to sound/runtime/instruments/recorder/Gn3.mid diff --git a/sound/instruments/recorder/Gn4.mid b/sound/runtime/instruments/recorder/Gn4.mid similarity index 100% rename from sound/instruments/recorder/Gn4.mid rename to sound/runtime/instruments/recorder/Gn4.mid diff --git a/sound/instruments/recorder/Gn5.mid b/sound/runtime/instruments/recorder/Gn5.mid similarity index 100% rename from sound/instruments/recorder/Gn5.mid rename to sound/runtime/instruments/recorder/Gn5.mid diff --git a/sound/instruments/recorder/Gn6.mid b/sound/runtime/instruments/recorder/Gn6.mid similarity index 100% rename from sound/instruments/recorder/Gn6.mid rename to sound/runtime/instruments/recorder/Gn6.mid diff --git a/sound/instruments/saxophone/Ab2.mid b/sound/runtime/instruments/saxophone/Ab2.mid similarity index 100% rename from sound/instruments/saxophone/Ab2.mid rename to sound/runtime/instruments/saxophone/Ab2.mid diff --git a/sound/instruments/saxophone/Ab3.mid b/sound/runtime/instruments/saxophone/Ab3.mid similarity index 100% rename from sound/instruments/saxophone/Ab3.mid rename to sound/runtime/instruments/saxophone/Ab3.mid diff --git a/sound/instruments/saxophone/Ab4.mid b/sound/runtime/instruments/saxophone/Ab4.mid similarity index 100% rename from sound/instruments/saxophone/Ab4.mid rename to sound/runtime/instruments/saxophone/Ab4.mid diff --git a/sound/instruments/saxophone/Ab5.mid b/sound/runtime/instruments/saxophone/Ab5.mid similarity index 100% rename from sound/instruments/saxophone/Ab5.mid rename to sound/runtime/instruments/saxophone/Ab5.mid diff --git a/sound/instruments/saxophone/Ab6.mid b/sound/runtime/instruments/saxophone/Ab6.mid similarity index 100% rename from sound/instruments/saxophone/Ab6.mid rename to sound/runtime/instruments/saxophone/Ab6.mid diff --git a/sound/instruments/saxophone/An2.mid b/sound/runtime/instruments/saxophone/An2.mid similarity index 100% rename from sound/instruments/saxophone/An2.mid rename to sound/runtime/instruments/saxophone/An2.mid diff --git a/sound/instruments/saxophone/An3.mid b/sound/runtime/instruments/saxophone/An3.mid similarity index 100% rename from sound/instruments/saxophone/An3.mid rename to sound/runtime/instruments/saxophone/An3.mid diff --git a/sound/instruments/saxophone/An4.mid b/sound/runtime/instruments/saxophone/An4.mid similarity index 100% rename from sound/instruments/saxophone/An4.mid rename to sound/runtime/instruments/saxophone/An4.mid diff --git a/sound/instruments/saxophone/An5.mid b/sound/runtime/instruments/saxophone/An5.mid similarity index 100% rename from sound/instruments/saxophone/An5.mid rename to sound/runtime/instruments/saxophone/An5.mid diff --git a/sound/instruments/saxophone/An6.mid b/sound/runtime/instruments/saxophone/An6.mid similarity index 100% rename from sound/instruments/saxophone/An6.mid rename to sound/runtime/instruments/saxophone/An6.mid diff --git a/sound/instruments/saxophone/Bb2.mid b/sound/runtime/instruments/saxophone/Bb2.mid similarity index 100% rename from sound/instruments/saxophone/Bb2.mid rename to sound/runtime/instruments/saxophone/Bb2.mid diff --git a/sound/instruments/saxophone/Bb3.mid b/sound/runtime/instruments/saxophone/Bb3.mid similarity index 100% rename from sound/instruments/saxophone/Bb3.mid rename to sound/runtime/instruments/saxophone/Bb3.mid diff --git a/sound/instruments/saxophone/Bb4.mid b/sound/runtime/instruments/saxophone/Bb4.mid similarity index 100% rename from sound/instruments/saxophone/Bb4.mid rename to sound/runtime/instruments/saxophone/Bb4.mid diff --git a/sound/instruments/saxophone/Bb5.mid b/sound/runtime/instruments/saxophone/Bb5.mid similarity index 100% rename from sound/instruments/saxophone/Bb5.mid rename to sound/runtime/instruments/saxophone/Bb5.mid diff --git a/sound/instruments/saxophone/Bb6.mid b/sound/runtime/instruments/saxophone/Bb6.mid similarity index 100% rename from sound/instruments/saxophone/Bb6.mid rename to sound/runtime/instruments/saxophone/Bb6.mid diff --git a/sound/instruments/saxophone/Bn2.mid b/sound/runtime/instruments/saxophone/Bn2.mid similarity index 100% rename from sound/instruments/saxophone/Bn2.mid rename to sound/runtime/instruments/saxophone/Bn2.mid diff --git a/sound/instruments/saxophone/Bn3.mid b/sound/runtime/instruments/saxophone/Bn3.mid similarity index 100% rename from sound/instruments/saxophone/Bn3.mid rename to sound/runtime/instruments/saxophone/Bn3.mid diff --git a/sound/instruments/saxophone/Bn4.mid b/sound/runtime/instruments/saxophone/Bn4.mid similarity index 100% rename from sound/instruments/saxophone/Bn4.mid rename to sound/runtime/instruments/saxophone/Bn4.mid diff --git a/sound/instruments/saxophone/Bn5.mid b/sound/runtime/instruments/saxophone/Bn5.mid similarity index 100% rename from sound/instruments/saxophone/Bn5.mid rename to sound/runtime/instruments/saxophone/Bn5.mid diff --git a/sound/instruments/saxophone/Bn6.mid b/sound/runtime/instruments/saxophone/Bn6.mid similarity index 100% rename from sound/instruments/saxophone/Bn6.mid rename to sound/runtime/instruments/saxophone/Bn6.mid diff --git a/sound/instruments/saxophone/Cn2.mid b/sound/runtime/instruments/saxophone/Cn2.mid similarity index 100% rename from sound/instruments/saxophone/Cn2.mid rename to sound/runtime/instruments/saxophone/Cn2.mid diff --git a/sound/instruments/saxophone/Cn3.mid b/sound/runtime/instruments/saxophone/Cn3.mid similarity index 100% rename from sound/instruments/saxophone/Cn3.mid rename to sound/runtime/instruments/saxophone/Cn3.mid diff --git a/sound/instruments/saxophone/Cn4.mid b/sound/runtime/instruments/saxophone/Cn4.mid similarity index 100% rename from sound/instruments/saxophone/Cn4.mid rename to sound/runtime/instruments/saxophone/Cn4.mid diff --git a/sound/instruments/saxophone/Cn5.mid b/sound/runtime/instruments/saxophone/Cn5.mid similarity index 100% rename from sound/instruments/saxophone/Cn5.mid rename to sound/runtime/instruments/saxophone/Cn5.mid diff --git a/sound/instruments/saxophone/Cn6.mid b/sound/runtime/instruments/saxophone/Cn6.mid similarity index 100% rename from sound/instruments/saxophone/Cn6.mid rename to sound/runtime/instruments/saxophone/Cn6.mid diff --git a/sound/instruments/saxophone/Db2.mid b/sound/runtime/instruments/saxophone/Db2.mid similarity index 100% rename from sound/instruments/saxophone/Db2.mid rename to sound/runtime/instruments/saxophone/Db2.mid diff --git a/sound/instruments/saxophone/Db3.mid b/sound/runtime/instruments/saxophone/Db3.mid similarity index 100% rename from sound/instruments/saxophone/Db3.mid rename to sound/runtime/instruments/saxophone/Db3.mid diff --git a/sound/instruments/saxophone/Db4.mid b/sound/runtime/instruments/saxophone/Db4.mid similarity index 100% rename from sound/instruments/saxophone/Db4.mid rename to sound/runtime/instruments/saxophone/Db4.mid diff --git a/sound/instruments/saxophone/Db5.mid b/sound/runtime/instruments/saxophone/Db5.mid similarity index 100% rename from sound/instruments/saxophone/Db5.mid rename to sound/runtime/instruments/saxophone/Db5.mid diff --git a/sound/instruments/saxophone/Db6.mid b/sound/runtime/instruments/saxophone/Db6.mid similarity index 100% rename from sound/instruments/saxophone/Db6.mid rename to sound/runtime/instruments/saxophone/Db6.mid diff --git a/sound/instruments/saxophone/Dn2.mid b/sound/runtime/instruments/saxophone/Dn2.mid similarity index 100% rename from sound/instruments/saxophone/Dn2.mid rename to sound/runtime/instruments/saxophone/Dn2.mid diff --git a/sound/instruments/saxophone/Dn3.mid b/sound/runtime/instruments/saxophone/Dn3.mid similarity index 100% rename from sound/instruments/saxophone/Dn3.mid rename to sound/runtime/instruments/saxophone/Dn3.mid diff --git a/sound/instruments/saxophone/Dn4.mid b/sound/runtime/instruments/saxophone/Dn4.mid similarity index 100% rename from sound/instruments/saxophone/Dn4.mid rename to sound/runtime/instruments/saxophone/Dn4.mid diff --git a/sound/instruments/saxophone/Dn5.mid b/sound/runtime/instruments/saxophone/Dn5.mid similarity index 100% rename from sound/instruments/saxophone/Dn5.mid rename to sound/runtime/instruments/saxophone/Dn5.mid diff --git a/sound/instruments/saxophone/Dn6.mid b/sound/runtime/instruments/saxophone/Dn6.mid similarity index 100% rename from sound/instruments/saxophone/Dn6.mid rename to sound/runtime/instruments/saxophone/Dn6.mid diff --git a/sound/instruments/saxophone/Eb2.mid b/sound/runtime/instruments/saxophone/Eb2.mid similarity index 100% rename from sound/instruments/saxophone/Eb2.mid rename to sound/runtime/instruments/saxophone/Eb2.mid diff --git a/sound/instruments/saxophone/Eb3.mid b/sound/runtime/instruments/saxophone/Eb3.mid similarity index 100% rename from sound/instruments/saxophone/Eb3.mid rename to sound/runtime/instruments/saxophone/Eb3.mid diff --git a/sound/instruments/saxophone/Eb4.mid b/sound/runtime/instruments/saxophone/Eb4.mid similarity index 100% rename from sound/instruments/saxophone/Eb4.mid rename to sound/runtime/instruments/saxophone/Eb4.mid diff --git a/sound/instruments/saxophone/Eb5.mid b/sound/runtime/instruments/saxophone/Eb5.mid similarity index 100% rename from sound/instruments/saxophone/Eb5.mid rename to sound/runtime/instruments/saxophone/Eb5.mid diff --git a/sound/instruments/saxophone/Eb6.mid b/sound/runtime/instruments/saxophone/Eb6.mid similarity index 100% rename from sound/instruments/saxophone/Eb6.mid rename to sound/runtime/instruments/saxophone/Eb6.mid diff --git a/sound/instruments/saxophone/En2.mid b/sound/runtime/instruments/saxophone/En2.mid similarity index 100% rename from sound/instruments/saxophone/En2.mid rename to sound/runtime/instruments/saxophone/En2.mid diff --git a/sound/instruments/saxophone/En3.mid b/sound/runtime/instruments/saxophone/En3.mid similarity index 100% rename from sound/instruments/saxophone/En3.mid rename to sound/runtime/instruments/saxophone/En3.mid diff --git a/sound/instruments/saxophone/En4.mid b/sound/runtime/instruments/saxophone/En4.mid similarity index 100% rename from sound/instruments/saxophone/En4.mid rename to sound/runtime/instruments/saxophone/En4.mid diff --git a/sound/instruments/saxophone/En5.mid b/sound/runtime/instruments/saxophone/En5.mid similarity index 100% rename from sound/instruments/saxophone/En5.mid rename to sound/runtime/instruments/saxophone/En5.mid diff --git a/sound/instruments/saxophone/En6.mid b/sound/runtime/instruments/saxophone/En6.mid similarity index 100% rename from sound/instruments/saxophone/En6.mid rename to sound/runtime/instruments/saxophone/En6.mid diff --git a/sound/instruments/saxophone/Fn2.mid b/sound/runtime/instruments/saxophone/Fn2.mid similarity index 100% rename from sound/instruments/saxophone/Fn2.mid rename to sound/runtime/instruments/saxophone/Fn2.mid diff --git a/sound/instruments/saxophone/Fn3.mid b/sound/runtime/instruments/saxophone/Fn3.mid similarity index 100% rename from sound/instruments/saxophone/Fn3.mid rename to sound/runtime/instruments/saxophone/Fn3.mid diff --git a/sound/instruments/saxophone/Fn4.mid b/sound/runtime/instruments/saxophone/Fn4.mid similarity index 100% rename from sound/instruments/saxophone/Fn4.mid rename to sound/runtime/instruments/saxophone/Fn4.mid diff --git a/sound/instruments/saxophone/Fn5.mid b/sound/runtime/instruments/saxophone/Fn5.mid similarity index 100% rename from sound/instruments/saxophone/Fn5.mid rename to sound/runtime/instruments/saxophone/Fn5.mid diff --git a/sound/instruments/saxophone/Fn6.mid b/sound/runtime/instruments/saxophone/Fn6.mid similarity index 100% rename from sound/instruments/saxophone/Fn6.mid rename to sound/runtime/instruments/saxophone/Fn6.mid diff --git a/sound/instruments/saxophone/Gb2.mid b/sound/runtime/instruments/saxophone/Gb2.mid similarity index 100% rename from sound/instruments/saxophone/Gb2.mid rename to sound/runtime/instruments/saxophone/Gb2.mid diff --git a/sound/instruments/saxophone/Gb3.mid b/sound/runtime/instruments/saxophone/Gb3.mid similarity index 100% rename from sound/instruments/saxophone/Gb3.mid rename to sound/runtime/instruments/saxophone/Gb3.mid diff --git a/sound/instruments/saxophone/Gb4.mid b/sound/runtime/instruments/saxophone/Gb4.mid similarity index 100% rename from sound/instruments/saxophone/Gb4.mid rename to sound/runtime/instruments/saxophone/Gb4.mid diff --git a/sound/instruments/saxophone/Gb5.mid b/sound/runtime/instruments/saxophone/Gb5.mid similarity index 100% rename from sound/instruments/saxophone/Gb5.mid rename to sound/runtime/instruments/saxophone/Gb5.mid diff --git a/sound/instruments/saxophone/Gb6.mid b/sound/runtime/instruments/saxophone/Gb6.mid similarity index 100% rename from sound/instruments/saxophone/Gb6.mid rename to sound/runtime/instruments/saxophone/Gb6.mid diff --git a/sound/instruments/saxophone/Gn2.mid b/sound/runtime/instruments/saxophone/Gn2.mid similarity index 100% rename from sound/instruments/saxophone/Gn2.mid rename to sound/runtime/instruments/saxophone/Gn2.mid diff --git a/sound/instruments/saxophone/Gn4.mid b/sound/runtime/instruments/saxophone/Gn4.mid similarity index 100% rename from sound/instruments/saxophone/Gn4.mid rename to sound/runtime/instruments/saxophone/Gn4.mid diff --git a/sound/instruments/saxophone/Gn5.mid b/sound/runtime/instruments/saxophone/Gn5.mid similarity index 100% rename from sound/instruments/saxophone/Gn5.mid rename to sound/runtime/instruments/saxophone/Gn5.mid diff --git a/sound/instruments/saxophone/Gn6.mid b/sound/runtime/instruments/saxophone/Gn6.mid similarity index 100% rename from sound/instruments/saxophone/Gn6.mid rename to sound/runtime/instruments/saxophone/Gn6.mid diff --git a/sound/instruments/synthesis_samples/brass/crisis_brass/c2.ogg b/sound/runtime/instruments/synthesis_samples/brass/crisis_brass/c2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/brass/crisis_brass/c2.ogg rename to sound/runtime/instruments/synthesis_samples/brass/crisis_brass/c2.ogg diff --git a/sound/instruments/synthesis_samples/brass/crisis_brass/c3.ogg b/sound/runtime/instruments/synthesis_samples/brass/crisis_brass/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/brass/crisis_brass/c3.ogg rename to sound/runtime/instruments/synthesis_samples/brass/crisis_brass/c3.ogg diff --git a/sound/instruments/synthesis_samples/brass/crisis_brass/c4.ogg b/sound/runtime/instruments/synthesis_samples/brass/crisis_brass/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/brass/crisis_brass/c4.ogg rename to sound/runtime/instruments/synthesis_samples/brass/crisis_brass/c4.ogg diff --git a/sound/instruments/synthesis_samples/brass/crisis_brass/c5.ogg b/sound/runtime/instruments/synthesis_samples/brass/crisis_brass/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/brass/crisis_brass/c5.ogg rename to sound/runtime/instruments/synthesis_samples/brass/crisis_brass/c5.ogg diff --git a/sound/instruments/synthesis_samples/brass/crisis_trombone/C2.ogg b/sound/runtime/instruments/synthesis_samples/brass/crisis_trombone/C2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/brass/crisis_trombone/C2.ogg rename to sound/runtime/instruments/synthesis_samples/brass/crisis_trombone/C2.ogg diff --git a/sound/instruments/synthesis_samples/brass/crisis_trombone/C3.ogg b/sound/runtime/instruments/synthesis_samples/brass/crisis_trombone/C3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/brass/crisis_trombone/C3.ogg rename to sound/runtime/instruments/synthesis_samples/brass/crisis_trombone/C3.ogg diff --git a/sound/instruments/synthesis_samples/brass/crisis_trombone/C4.ogg b/sound/runtime/instruments/synthesis_samples/brass/crisis_trombone/C4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/brass/crisis_trombone/C4.ogg rename to sound/runtime/instruments/synthesis_samples/brass/crisis_trombone/C4.ogg diff --git a/sound/instruments/synthesis_samples/brass/crisis_trombone/C5.ogg b/sound/runtime/instruments/synthesis_samples/brass/crisis_trombone/C5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/brass/crisis_trombone/C5.ogg rename to sound/runtime/instruments/synthesis_samples/brass/crisis_trombone/C5.ogg diff --git a/sound/instruments/synthesis_samples/brass/crisis_trumpet/C4.ogg b/sound/runtime/instruments/synthesis_samples/brass/crisis_trumpet/C4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/brass/crisis_trumpet/C4.ogg rename to sound/runtime/instruments/synthesis_samples/brass/crisis_trumpet/C4.ogg diff --git a/sound/instruments/synthesis_samples/brass/crisis_trumpet/C5.ogg b/sound/runtime/instruments/synthesis_samples/brass/crisis_trumpet/C5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/brass/crisis_trumpet/C5.ogg rename to sound/runtime/instruments/synthesis_samples/brass/crisis_trumpet/C5.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C2.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/fluid_celeste/C2.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C2.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C3.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/fluid_celeste/C3.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C3.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C4.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/fluid_celeste/C4.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C4.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C5.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/fluid_celeste/C5.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C5.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C6.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C6.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/fluid_celeste/C6.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C6.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C7.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C7.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/fluid_celeste/C7.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C7.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/fluid_celeste/C8.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C8.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/fluid_celeste/C8.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/fluid_celeste/C8.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/sgmbox/c2.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/sgmbox/c2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/sgmbox/c2.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/sgmbox/c2.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/sgmbox/c3.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/sgmbox/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/sgmbox/c3.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/sgmbox/c3.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/sgmbox/c4.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/sgmbox/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/sgmbox/c4.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/sgmbox/c4.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/sgmbox/c5.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/sgmbox/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/sgmbox/c5.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/sgmbox/c5.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/vibraphone1/c2.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/vibraphone1/c2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/vibraphone1/c2.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/vibraphone1/c2.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/vibraphone1/c3.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/vibraphone1/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/vibraphone1/c3.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/vibraphone1/c3.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/vibraphone1/c4.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/vibraphone1/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/vibraphone1/c4.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/vibraphone1/c4.ogg diff --git a/sound/instruments/synthesis_samples/chromatic/vibraphone1/c5.ogg b/sound/runtime/instruments/synthesis_samples/chromatic/vibraphone1/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/chromatic/vibraphone1/c5.ogg rename to sound/runtime/instruments/synthesis_samples/chromatic/vibraphone1/c5.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_clean/C2.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_clean/C2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_clean/C2.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_clean/C2.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_clean/C3.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_clean/C3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_clean/C3.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_clean/C3.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_clean/C4.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_clean/C4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_clean/C4.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_clean/C4.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_clean/C5.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_clean/C5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_clean/C5.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_clean/C5.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_muted/C2.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_muted/C2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_muted/C2.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_muted/C2.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_muted/C3.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_muted/C3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_muted/C3.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_muted/C3.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_muted/C4.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_muted/C4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_muted/C4.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_muted/C4.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_muted/C5.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_muted/C5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_muted/C5.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_muted/C5.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_nylon/c2.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_nylon/c2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_nylon/c2.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_nylon/c2.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_nylon/c3.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_nylon/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_nylon/c3.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_nylon/c3.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_nylon/c4.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_nylon/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_nylon/c4.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_nylon/c4.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_nylon/c5.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_nylon/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_nylon/c5.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_nylon/c5.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_steel/c2.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_steel/c2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_steel/c2.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_steel/c2.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_steel/c3.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_steel/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_steel/c3.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_steel/c3.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_steel/c4.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_steel/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_steel/c4.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_steel/c4.ogg diff --git a/sound/instruments/synthesis_samples/guitar/crisis_steel/c5.ogg b/sound/runtime/instruments/synthesis_samples/guitar/crisis_steel/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/guitar/crisis_steel/c5.ogg rename to sound/runtime/instruments/synthesis_samples/guitar/crisis_steel/c5.ogg diff --git a/sound/runtime/instruments/synthesis_samples/meowsynth/LICENSE.txt b/sound/runtime/instruments/synthesis_samples/meowsynth/LICENSE.txt new file mode 100644 index 0000000000..f00f3ce86c --- /dev/null +++ b/sound/runtime/instruments/synthesis_samples/meowsynth/LICENSE.txt @@ -0,0 +1,14 @@ +The audio samples in this folder were created using the MeowSynth VST plugin. +MeowSynth was created by a user named zipp and was released on knobster.org under the following terms: + +All KNOBSTER synthesizers are absolutely free, even for commercial use. Nevertheless, the author will gladly accept material gratitude, especially if it is done from the heart. You can send it to any of the wallets listed below: + + Yandex money: + 41001357297942 + + webmoney: + Z407831455581 + R770671369144 + U877500879439 + +Remember: by helping the author financially, you stimulate the improvement of existing and the creation of new free synthesizers. Thank you. diff --git a/sound/runtime/instruments/synthesis_samples/meowsynth/c2.ogg b/sound/runtime/instruments/synthesis_samples/meowsynth/c2.ogg new file mode 100644 index 0000000000..1b2da03cf0 Binary files /dev/null and b/sound/runtime/instruments/synthesis_samples/meowsynth/c2.ogg differ diff --git a/sound/runtime/instruments/synthesis_samples/meowsynth/c3.ogg b/sound/runtime/instruments/synthesis_samples/meowsynth/c3.ogg new file mode 100644 index 0000000000..6066d4a712 Binary files /dev/null and b/sound/runtime/instruments/synthesis_samples/meowsynth/c3.ogg differ diff --git a/sound/runtime/instruments/synthesis_samples/meowsynth/c4.ogg b/sound/runtime/instruments/synthesis_samples/meowsynth/c4.ogg new file mode 100644 index 0000000000..6e6bfad597 Binary files /dev/null and b/sound/runtime/instruments/synthesis_samples/meowsynth/c4.ogg differ diff --git a/sound/runtime/instruments/synthesis_samples/meowsynth/c5.ogg b/sound/runtime/instruments/synthesis_samples/meowsynth/c5.ogg new file mode 100644 index 0000000000..225f8d8fe6 Binary files /dev/null and b/sound/runtime/instruments/synthesis_samples/meowsynth/c5.ogg differ diff --git a/sound/runtime/instruments/synthesis_samples/meowsynth/c6.ogg b/sound/runtime/instruments/synthesis_samples/meowsynth/c6.ogg new file mode 100644 index 0000000000..796ccdca82 Binary files /dev/null and b/sound/runtime/instruments/synthesis_samples/meowsynth/c6.ogg differ diff --git a/sound/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_accordian/c4.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_accordian/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_accordian/c4.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_accordian/c4.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_accordian/c5.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_accordian/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_accordian/c5.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_accordian/c5.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_church/c2.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_church/c2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_church/c2.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_church/c2.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_church/c3.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_church/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_church/c3.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_church/c3.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_church/c4.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_church/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_church/c4.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_church/c4.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_church/c5.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_church/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_church/c5.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_church/c5.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_hammond/c2.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_hammond/c2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_hammond/c2.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_hammond/c2.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_hammond/c3.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_hammond/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_hammond/c3.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_hammond/c3.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_harmonica/c3.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_harmonica/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_harmonica/c3.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_harmonica/c3.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c4.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_tangaccordian/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c4.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_tangaccordian/c4.ogg diff --git a/sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c5.ogg b/sound/runtime/instruments/synthesis_samples/organ/crisis_tangaccordian/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c5.ogg rename to sound/runtime/instruments/synthesis_samples/organ/crisis_tangaccordian/c5.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c2.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_bright_piano/c2.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c2.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c3.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_bright_piano/c3.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c3.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c4.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_bright_piano/c4.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c4.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c5.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_bright_piano/c5.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c5.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c6.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c6.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_bright_piano/c6.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c6.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c7.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c7.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_bright_piano/c7.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c7.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_bright_piano/c8.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c8.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_bright_piano/c8.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_bright_piano/c8.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c2.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_grand_piano/c2.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c2.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c3.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_grand_piano/c3.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c3.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c4.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_grand_piano/c4.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c4.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c5.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_grand_piano/c5.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c5.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c6.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c6.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_grand_piano/c6.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c6.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c7.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c7.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_grand_piano/c7.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c7.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_grand_piano/c8.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c8.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_grand_piano/c8.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_grand_piano/c8.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c2.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_harpsichord/c2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_harpsichord/c2.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_harpsichord/c2.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c3.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_harpsichord/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_harpsichord/c3.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_harpsichord/c3.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c4.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_harpsichord/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_harpsichord/c4.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_harpsichord/c4.ogg diff --git a/sound/instruments/synthesis_samples/piano/crisis_harpsichord/c5.ogg b/sound/runtime/instruments/synthesis_samples/piano/crisis_harpsichord/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/crisis_harpsichord/c5.ogg rename to sound/runtime/instruments/synthesis_samples/piano/crisis_harpsichord/c5.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C2.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_harpsi/C2.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C2.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C3.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_harpsi/C3.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C3.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C4.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_harpsi/C4.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C4.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C5.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_harpsi/C5.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C5.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C6.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C6.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_harpsi/C6.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C6.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C7.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C7.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_harpsi/C7.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C7.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_harpsi/C8.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C8.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_harpsi/C8.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_harpsi/C8.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c2.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c2.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_piano/c2.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c2.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c3.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c3.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_piano/c3.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c3.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c4.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c4.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_piano/c4.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c4.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c5.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c5.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_piano/c5.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c5.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c6.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c6.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_piano/c6.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c6.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c7.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c7.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_piano/c7.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c7.ogg diff --git a/sound/instruments/synthesis_samples/piano/fluid_piano/c8.ogg b/sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c8.ogg similarity index 100% rename from sound/instruments/synthesis_samples/piano/fluid_piano/c8.ogg rename to sound/runtime/instruments/synthesis_samples/piano/fluid_piano/c8.ogg diff --git a/sound/instruments/synthesis_samples/tones/Sawtooth.ogg b/sound/runtime/instruments/synthesis_samples/tones/Sawtooth.ogg similarity index 100% rename from sound/instruments/synthesis_samples/tones/Sawtooth.ogg rename to sound/runtime/instruments/synthesis_samples/tones/Sawtooth.ogg diff --git a/sound/instruments/synthesis_samples/tones/Sine.ogg b/sound/runtime/instruments/synthesis_samples/tones/Sine.ogg similarity index 100% rename from sound/instruments/synthesis_samples/tones/Sine.ogg rename to sound/runtime/instruments/synthesis_samples/tones/Sine.ogg diff --git a/sound/instruments/synthesis_samples/tones/Square.ogg b/sound/runtime/instruments/synthesis_samples/tones/Square.ogg similarity index 100% rename from sound/instruments/synthesis_samples/tones/Square.ogg rename to sound/runtime/instruments/synthesis_samples/tones/Square.ogg diff --git a/sound/instruments/trombone/Ab2.mid b/sound/runtime/instruments/trombone/Ab2.mid similarity index 100% rename from sound/instruments/trombone/Ab2.mid rename to sound/runtime/instruments/trombone/Ab2.mid diff --git a/sound/instruments/trombone/Ab3.mid b/sound/runtime/instruments/trombone/Ab3.mid similarity index 100% rename from sound/instruments/trombone/Ab3.mid rename to sound/runtime/instruments/trombone/Ab3.mid diff --git a/sound/instruments/trombone/Ab4.mid b/sound/runtime/instruments/trombone/Ab4.mid similarity index 100% rename from sound/instruments/trombone/Ab4.mid rename to sound/runtime/instruments/trombone/Ab4.mid diff --git a/sound/instruments/trombone/Ab5.mid b/sound/runtime/instruments/trombone/Ab5.mid similarity index 100% rename from sound/instruments/trombone/Ab5.mid rename to sound/runtime/instruments/trombone/Ab5.mid diff --git a/sound/instruments/trombone/Ab6.mid b/sound/runtime/instruments/trombone/Ab6.mid similarity index 100% rename from sound/instruments/trombone/Ab6.mid rename to sound/runtime/instruments/trombone/Ab6.mid diff --git a/sound/instruments/trombone/An2.mid b/sound/runtime/instruments/trombone/An2.mid similarity index 100% rename from sound/instruments/trombone/An2.mid rename to sound/runtime/instruments/trombone/An2.mid diff --git a/sound/instruments/trombone/An3.mid b/sound/runtime/instruments/trombone/An3.mid similarity index 100% rename from sound/instruments/trombone/An3.mid rename to sound/runtime/instruments/trombone/An3.mid diff --git a/sound/instruments/trombone/An4.mid b/sound/runtime/instruments/trombone/An4.mid similarity index 100% rename from sound/instruments/trombone/An4.mid rename to sound/runtime/instruments/trombone/An4.mid diff --git a/sound/instruments/trombone/An5.mid b/sound/runtime/instruments/trombone/An5.mid similarity index 100% rename from sound/instruments/trombone/An5.mid rename to sound/runtime/instruments/trombone/An5.mid diff --git a/sound/instruments/trombone/An6.mid b/sound/runtime/instruments/trombone/An6.mid similarity index 100% rename from sound/instruments/trombone/An6.mid rename to sound/runtime/instruments/trombone/An6.mid diff --git a/sound/instruments/trombone/Bb2.mid b/sound/runtime/instruments/trombone/Bb2.mid similarity index 100% rename from sound/instruments/trombone/Bb2.mid rename to sound/runtime/instruments/trombone/Bb2.mid diff --git a/sound/instruments/trombone/Bb3.mid b/sound/runtime/instruments/trombone/Bb3.mid similarity index 100% rename from sound/instruments/trombone/Bb3.mid rename to sound/runtime/instruments/trombone/Bb3.mid diff --git a/sound/instruments/trombone/Bb4.mid b/sound/runtime/instruments/trombone/Bb4.mid similarity index 100% rename from sound/instruments/trombone/Bb4.mid rename to sound/runtime/instruments/trombone/Bb4.mid diff --git a/sound/instruments/trombone/Bb5.mid b/sound/runtime/instruments/trombone/Bb5.mid similarity index 100% rename from sound/instruments/trombone/Bb5.mid rename to sound/runtime/instruments/trombone/Bb5.mid diff --git a/sound/instruments/trombone/Bb6.mid b/sound/runtime/instruments/trombone/Bb6.mid similarity index 100% rename from sound/instruments/trombone/Bb6.mid rename to sound/runtime/instruments/trombone/Bb6.mid diff --git a/sound/instruments/trombone/Bn2.mid b/sound/runtime/instruments/trombone/Bn2.mid similarity index 100% rename from sound/instruments/trombone/Bn2.mid rename to sound/runtime/instruments/trombone/Bn2.mid diff --git a/sound/instruments/trombone/Bn3.mid b/sound/runtime/instruments/trombone/Bn3.mid similarity index 100% rename from sound/instruments/trombone/Bn3.mid rename to sound/runtime/instruments/trombone/Bn3.mid diff --git a/sound/instruments/trombone/Bn4.mid b/sound/runtime/instruments/trombone/Bn4.mid similarity index 100% rename from sound/instruments/trombone/Bn4.mid rename to sound/runtime/instruments/trombone/Bn4.mid diff --git a/sound/instruments/trombone/Bn5.mid b/sound/runtime/instruments/trombone/Bn5.mid similarity index 100% rename from sound/instruments/trombone/Bn5.mid rename to sound/runtime/instruments/trombone/Bn5.mid diff --git a/sound/instruments/trombone/Bn6.mid b/sound/runtime/instruments/trombone/Bn6.mid similarity index 100% rename from sound/instruments/trombone/Bn6.mid rename to sound/runtime/instruments/trombone/Bn6.mid diff --git a/sound/instruments/trombone/Cn2.mid b/sound/runtime/instruments/trombone/Cn2.mid similarity index 100% rename from sound/instruments/trombone/Cn2.mid rename to sound/runtime/instruments/trombone/Cn2.mid diff --git a/sound/instruments/trombone/Cn3.mid b/sound/runtime/instruments/trombone/Cn3.mid similarity index 100% rename from sound/instruments/trombone/Cn3.mid rename to sound/runtime/instruments/trombone/Cn3.mid diff --git a/sound/instruments/trombone/Cn4.mid b/sound/runtime/instruments/trombone/Cn4.mid similarity index 100% rename from sound/instruments/trombone/Cn4.mid rename to sound/runtime/instruments/trombone/Cn4.mid diff --git a/sound/instruments/trombone/Cn5.mid b/sound/runtime/instruments/trombone/Cn5.mid similarity index 100% rename from sound/instruments/trombone/Cn5.mid rename to sound/runtime/instruments/trombone/Cn5.mid diff --git a/sound/instruments/trombone/Cn6.mid b/sound/runtime/instruments/trombone/Cn6.mid similarity index 100% rename from sound/instruments/trombone/Cn6.mid rename to sound/runtime/instruments/trombone/Cn6.mid diff --git a/sound/instruments/trombone/Db2.mid b/sound/runtime/instruments/trombone/Db2.mid similarity index 100% rename from sound/instruments/trombone/Db2.mid rename to sound/runtime/instruments/trombone/Db2.mid diff --git a/sound/instruments/trombone/Db3.mid b/sound/runtime/instruments/trombone/Db3.mid similarity index 100% rename from sound/instruments/trombone/Db3.mid rename to sound/runtime/instruments/trombone/Db3.mid diff --git a/sound/instruments/trombone/Db4.mid b/sound/runtime/instruments/trombone/Db4.mid similarity index 100% rename from sound/instruments/trombone/Db4.mid rename to sound/runtime/instruments/trombone/Db4.mid diff --git a/sound/instruments/trombone/Db5.mid b/sound/runtime/instruments/trombone/Db5.mid similarity index 100% rename from sound/instruments/trombone/Db5.mid rename to sound/runtime/instruments/trombone/Db5.mid diff --git a/sound/instruments/trombone/Db6.mid b/sound/runtime/instruments/trombone/Db6.mid similarity index 100% rename from sound/instruments/trombone/Db6.mid rename to sound/runtime/instruments/trombone/Db6.mid diff --git a/sound/instruments/trombone/Dn2.mid b/sound/runtime/instruments/trombone/Dn2.mid similarity index 100% rename from sound/instruments/trombone/Dn2.mid rename to sound/runtime/instruments/trombone/Dn2.mid diff --git a/sound/instruments/trombone/Dn3.mid b/sound/runtime/instruments/trombone/Dn3.mid similarity index 100% rename from sound/instruments/trombone/Dn3.mid rename to sound/runtime/instruments/trombone/Dn3.mid diff --git a/sound/instruments/trombone/Dn4.mid b/sound/runtime/instruments/trombone/Dn4.mid similarity index 100% rename from sound/instruments/trombone/Dn4.mid rename to sound/runtime/instruments/trombone/Dn4.mid diff --git a/sound/instruments/trombone/Dn5.mid b/sound/runtime/instruments/trombone/Dn5.mid similarity index 100% rename from sound/instruments/trombone/Dn5.mid rename to sound/runtime/instruments/trombone/Dn5.mid diff --git a/sound/instruments/trombone/Dn6.mid b/sound/runtime/instruments/trombone/Dn6.mid similarity index 100% rename from sound/instruments/trombone/Dn6.mid rename to sound/runtime/instruments/trombone/Dn6.mid diff --git a/sound/instruments/trombone/Eb2.mid b/sound/runtime/instruments/trombone/Eb2.mid similarity index 100% rename from sound/instruments/trombone/Eb2.mid rename to sound/runtime/instruments/trombone/Eb2.mid diff --git a/sound/instruments/trombone/Eb3.mid b/sound/runtime/instruments/trombone/Eb3.mid similarity index 100% rename from sound/instruments/trombone/Eb3.mid rename to sound/runtime/instruments/trombone/Eb3.mid diff --git a/sound/instruments/trombone/Eb4.mid b/sound/runtime/instruments/trombone/Eb4.mid similarity index 100% rename from sound/instruments/trombone/Eb4.mid rename to sound/runtime/instruments/trombone/Eb4.mid diff --git a/sound/instruments/trombone/Eb5.mid b/sound/runtime/instruments/trombone/Eb5.mid similarity index 100% rename from sound/instruments/trombone/Eb5.mid rename to sound/runtime/instruments/trombone/Eb5.mid diff --git a/sound/instruments/trombone/Eb6.mid b/sound/runtime/instruments/trombone/Eb6.mid similarity index 100% rename from sound/instruments/trombone/Eb6.mid rename to sound/runtime/instruments/trombone/Eb6.mid diff --git a/sound/instruments/trombone/En2.mid b/sound/runtime/instruments/trombone/En2.mid similarity index 100% rename from sound/instruments/trombone/En2.mid rename to sound/runtime/instruments/trombone/En2.mid diff --git a/sound/instruments/trombone/En3.mid b/sound/runtime/instruments/trombone/En3.mid similarity index 100% rename from sound/instruments/trombone/En3.mid rename to sound/runtime/instruments/trombone/En3.mid diff --git a/sound/instruments/trombone/En4.mid b/sound/runtime/instruments/trombone/En4.mid similarity index 100% rename from sound/instruments/trombone/En4.mid rename to sound/runtime/instruments/trombone/En4.mid diff --git a/sound/instruments/trombone/En5.mid b/sound/runtime/instruments/trombone/En5.mid similarity index 100% rename from sound/instruments/trombone/En5.mid rename to sound/runtime/instruments/trombone/En5.mid diff --git a/sound/instruments/trombone/En6.mid b/sound/runtime/instruments/trombone/En6.mid similarity index 100% rename from sound/instruments/trombone/En6.mid rename to sound/runtime/instruments/trombone/En6.mid diff --git a/sound/instruments/trombone/Fn2.mid b/sound/runtime/instruments/trombone/Fn2.mid similarity index 100% rename from sound/instruments/trombone/Fn2.mid rename to sound/runtime/instruments/trombone/Fn2.mid diff --git a/sound/instruments/trombone/Fn3.mid b/sound/runtime/instruments/trombone/Fn3.mid similarity index 100% rename from sound/instruments/trombone/Fn3.mid rename to sound/runtime/instruments/trombone/Fn3.mid diff --git a/sound/instruments/trombone/Fn4.mid b/sound/runtime/instruments/trombone/Fn4.mid similarity index 100% rename from sound/instruments/trombone/Fn4.mid rename to sound/runtime/instruments/trombone/Fn4.mid diff --git a/sound/instruments/trombone/Fn5.mid b/sound/runtime/instruments/trombone/Fn5.mid similarity index 100% rename from sound/instruments/trombone/Fn5.mid rename to sound/runtime/instruments/trombone/Fn5.mid diff --git a/sound/instruments/trombone/Fn6.mid b/sound/runtime/instruments/trombone/Fn6.mid similarity index 100% rename from sound/instruments/trombone/Fn6.mid rename to sound/runtime/instruments/trombone/Fn6.mid diff --git a/sound/instruments/trombone/Gb2.mid b/sound/runtime/instruments/trombone/Gb2.mid similarity index 100% rename from sound/instruments/trombone/Gb2.mid rename to sound/runtime/instruments/trombone/Gb2.mid diff --git a/sound/instruments/trombone/Gb3.mid b/sound/runtime/instruments/trombone/Gb3.mid similarity index 100% rename from sound/instruments/trombone/Gb3.mid rename to sound/runtime/instruments/trombone/Gb3.mid diff --git a/sound/instruments/trombone/Gb4.mid b/sound/runtime/instruments/trombone/Gb4.mid similarity index 100% rename from sound/instruments/trombone/Gb4.mid rename to sound/runtime/instruments/trombone/Gb4.mid diff --git a/sound/instruments/trombone/Gb5.mid b/sound/runtime/instruments/trombone/Gb5.mid similarity index 100% rename from sound/instruments/trombone/Gb5.mid rename to sound/runtime/instruments/trombone/Gb5.mid diff --git a/sound/instruments/trombone/Gb6.mid b/sound/runtime/instruments/trombone/Gb6.mid similarity index 100% rename from sound/instruments/trombone/Gb6.mid rename to sound/runtime/instruments/trombone/Gb6.mid diff --git a/sound/instruments/trombone/Gn2.mid b/sound/runtime/instruments/trombone/Gn2.mid similarity index 100% rename from sound/instruments/trombone/Gn2.mid rename to sound/runtime/instruments/trombone/Gn2.mid diff --git a/sound/instruments/trombone/Gn3.mid b/sound/runtime/instruments/trombone/Gn3.mid similarity index 100% rename from sound/instruments/trombone/Gn3.mid rename to sound/runtime/instruments/trombone/Gn3.mid diff --git a/sound/instruments/trombone/Gn4.mid b/sound/runtime/instruments/trombone/Gn4.mid similarity index 100% rename from sound/instruments/trombone/Gn4.mid rename to sound/runtime/instruments/trombone/Gn4.mid diff --git a/sound/instruments/trombone/Gn5.mid b/sound/runtime/instruments/trombone/Gn5.mid similarity index 100% rename from sound/instruments/trombone/Gn5.mid rename to sound/runtime/instruments/trombone/Gn5.mid diff --git a/sound/instruments/trombone/Gn6.mid b/sound/runtime/instruments/trombone/Gn6.mid similarity index 100% rename from sound/instruments/trombone/Gn6.mid rename to sound/runtime/instruments/trombone/Gn6.mid diff --git a/sound/instruments/violin/Ab1.mid b/sound/runtime/instruments/violin/Ab1.mid similarity index 100% rename from sound/instruments/violin/Ab1.mid rename to sound/runtime/instruments/violin/Ab1.mid diff --git a/sound/instruments/violin/Ab2.mid b/sound/runtime/instruments/violin/Ab2.mid similarity index 100% rename from sound/instruments/violin/Ab2.mid rename to sound/runtime/instruments/violin/Ab2.mid diff --git a/sound/instruments/violin/Ab3.mid b/sound/runtime/instruments/violin/Ab3.mid similarity index 100% rename from sound/instruments/violin/Ab3.mid rename to sound/runtime/instruments/violin/Ab3.mid diff --git a/sound/instruments/violin/Ab4.mid b/sound/runtime/instruments/violin/Ab4.mid similarity index 100% rename from sound/instruments/violin/Ab4.mid rename to sound/runtime/instruments/violin/Ab4.mid diff --git a/sound/instruments/violin/Ab5.mid b/sound/runtime/instruments/violin/Ab5.mid similarity index 100% rename from sound/instruments/violin/Ab5.mid rename to sound/runtime/instruments/violin/Ab5.mid diff --git a/sound/instruments/violin/Ab6.mid b/sound/runtime/instruments/violin/Ab6.mid similarity index 100% rename from sound/instruments/violin/Ab6.mid rename to sound/runtime/instruments/violin/Ab6.mid diff --git a/sound/instruments/violin/Ab7.mid b/sound/runtime/instruments/violin/Ab7.mid similarity index 100% rename from sound/instruments/violin/Ab7.mid rename to sound/runtime/instruments/violin/Ab7.mid diff --git a/sound/instruments/violin/Ab8.mid b/sound/runtime/instruments/violin/Ab8.mid similarity index 100% rename from sound/instruments/violin/Ab8.mid rename to sound/runtime/instruments/violin/Ab8.mid diff --git a/sound/instruments/violin/An1.mid b/sound/runtime/instruments/violin/An1.mid similarity index 100% rename from sound/instruments/violin/An1.mid rename to sound/runtime/instruments/violin/An1.mid diff --git a/sound/instruments/violin/An2.mid b/sound/runtime/instruments/violin/An2.mid similarity index 100% rename from sound/instruments/violin/An2.mid rename to sound/runtime/instruments/violin/An2.mid diff --git a/sound/instruments/violin/An3.mid b/sound/runtime/instruments/violin/An3.mid similarity index 100% rename from sound/instruments/violin/An3.mid rename to sound/runtime/instruments/violin/An3.mid diff --git a/sound/instruments/violin/An4.mid b/sound/runtime/instruments/violin/An4.mid similarity index 100% rename from sound/instruments/violin/An4.mid rename to sound/runtime/instruments/violin/An4.mid diff --git a/sound/instruments/violin/An5.mid b/sound/runtime/instruments/violin/An5.mid similarity index 100% rename from sound/instruments/violin/An5.mid rename to sound/runtime/instruments/violin/An5.mid diff --git a/sound/instruments/violin/An6.mid b/sound/runtime/instruments/violin/An6.mid similarity index 100% rename from sound/instruments/violin/An6.mid rename to sound/runtime/instruments/violin/An6.mid diff --git a/sound/instruments/violin/An7.mid b/sound/runtime/instruments/violin/An7.mid similarity index 100% rename from sound/instruments/violin/An7.mid rename to sound/runtime/instruments/violin/An7.mid diff --git a/sound/instruments/violin/An8.mid b/sound/runtime/instruments/violin/An8.mid similarity index 100% rename from sound/instruments/violin/An8.mid rename to sound/runtime/instruments/violin/An8.mid diff --git a/sound/instruments/violin/Bb1.mid b/sound/runtime/instruments/violin/Bb1.mid similarity index 100% rename from sound/instruments/violin/Bb1.mid rename to sound/runtime/instruments/violin/Bb1.mid diff --git a/sound/instruments/violin/Bb2.mid b/sound/runtime/instruments/violin/Bb2.mid similarity index 100% rename from sound/instruments/violin/Bb2.mid rename to sound/runtime/instruments/violin/Bb2.mid diff --git a/sound/instruments/violin/Bb3.mid b/sound/runtime/instruments/violin/Bb3.mid similarity index 100% rename from sound/instruments/violin/Bb3.mid rename to sound/runtime/instruments/violin/Bb3.mid diff --git a/sound/instruments/violin/Bb4.mid b/sound/runtime/instruments/violin/Bb4.mid similarity index 100% rename from sound/instruments/violin/Bb4.mid rename to sound/runtime/instruments/violin/Bb4.mid diff --git a/sound/instruments/violin/Bb5.mid b/sound/runtime/instruments/violin/Bb5.mid similarity index 100% rename from sound/instruments/violin/Bb5.mid rename to sound/runtime/instruments/violin/Bb5.mid diff --git a/sound/instruments/violin/Bb6.mid b/sound/runtime/instruments/violin/Bb6.mid similarity index 100% rename from sound/instruments/violin/Bb6.mid rename to sound/runtime/instruments/violin/Bb6.mid diff --git a/sound/instruments/violin/Bb7.mid b/sound/runtime/instruments/violin/Bb7.mid similarity index 100% rename from sound/instruments/violin/Bb7.mid rename to sound/runtime/instruments/violin/Bb7.mid diff --git a/sound/instruments/violin/Bb8.mid b/sound/runtime/instruments/violin/Bb8.mid similarity index 100% rename from sound/instruments/violin/Bb8.mid rename to sound/runtime/instruments/violin/Bb8.mid diff --git a/sound/instruments/violin/Bn1.mid b/sound/runtime/instruments/violin/Bn1.mid similarity index 100% rename from sound/instruments/violin/Bn1.mid rename to sound/runtime/instruments/violin/Bn1.mid diff --git a/sound/instruments/violin/Bn2.mid b/sound/runtime/instruments/violin/Bn2.mid similarity index 100% rename from sound/instruments/violin/Bn2.mid rename to sound/runtime/instruments/violin/Bn2.mid diff --git a/sound/instruments/violin/Bn3.mid b/sound/runtime/instruments/violin/Bn3.mid similarity index 100% rename from sound/instruments/violin/Bn3.mid rename to sound/runtime/instruments/violin/Bn3.mid diff --git a/sound/instruments/violin/Bn4.mid b/sound/runtime/instruments/violin/Bn4.mid similarity index 100% rename from sound/instruments/violin/Bn4.mid rename to sound/runtime/instruments/violin/Bn4.mid diff --git a/sound/instruments/violin/Bn5.mid b/sound/runtime/instruments/violin/Bn5.mid similarity index 100% rename from sound/instruments/violin/Bn5.mid rename to sound/runtime/instruments/violin/Bn5.mid diff --git a/sound/instruments/violin/Bn6.mid b/sound/runtime/instruments/violin/Bn6.mid similarity index 100% rename from sound/instruments/violin/Bn6.mid rename to sound/runtime/instruments/violin/Bn6.mid diff --git a/sound/instruments/violin/Bn7.mid b/sound/runtime/instruments/violin/Bn7.mid similarity index 100% rename from sound/instruments/violin/Bn7.mid rename to sound/runtime/instruments/violin/Bn7.mid diff --git a/sound/instruments/violin/Bn8.mid b/sound/runtime/instruments/violin/Bn8.mid similarity index 100% rename from sound/instruments/violin/Bn8.mid rename to sound/runtime/instruments/violin/Bn8.mid diff --git a/sound/instruments/violin/Cn1.mid b/sound/runtime/instruments/violin/Cn1.mid similarity index 100% rename from sound/instruments/violin/Cn1.mid rename to sound/runtime/instruments/violin/Cn1.mid diff --git a/sound/instruments/violin/Cn2.mid b/sound/runtime/instruments/violin/Cn2.mid similarity index 100% rename from sound/instruments/violin/Cn2.mid rename to sound/runtime/instruments/violin/Cn2.mid diff --git a/sound/instruments/violin/Cn3.mid b/sound/runtime/instruments/violin/Cn3.mid similarity index 100% rename from sound/instruments/violin/Cn3.mid rename to sound/runtime/instruments/violin/Cn3.mid diff --git a/sound/instruments/violin/Cn4.mid b/sound/runtime/instruments/violin/Cn4.mid similarity index 100% rename from sound/instruments/violin/Cn4.mid rename to sound/runtime/instruments/violin/Cn4.mid diff --git a/sound/instruments/violin/Cn5.mid b/sound/runtime/instruments/violin/Cn5.mid similarity index 100% rename from sound/instruments/violin/Cn5.mid rename to sound/runtime/instruments/violin/Cn5.mid diff --git a/sound/instruments/violin/Cn6.mid b/sound/runtime/instruments/violin/Cn6.mid similarity index 100% rename from sound/instruments/violin/Cn6.mid rename to sound/runtime/instruments/violin/Cn6.mid diff --git a/sound/instruments/violin/Cn7.mid b/sound/runtime/instruments/violin/Cn7.mid similarity index 100% rename from sound/instruments/violin/Cn7.mid rename to sound/runtime/instruments/violin/Cn7.mid diff --git a/sound/instruments/violin/Cn8.mid b/sound/runtime/instruments/violin/Cn8.mid similarity index 100% rename from sound/instruments/violin/Cn8.mid rename to sound/runtime/instruments/violin/Cn8.mid diff --git a/sound/instruments/violin/Cn9.mid b/sound/runtime/instruments/violin/Cn9.mid similarity index 100% rename from sound/instruments/violin/Cn9.mid rename to sound/runtime/instruments/violin/Cn9.mid diff --git a/sound/instruments/violin/Db1.mid b/sound/runtime/instruments/violin/Db1.mid similarity index 100% rename from sound/instruments/violin/Db1.mid rename to sound/runtime/instruments/violin/Db1.mid diff --git a/sound/instruments/violin/Db2.mid b/sound/runtime/instruments/violin/Db2.mid similarity index 100% rename from sound/instruments/violin/Db2.mid rename to sound/runtime/instruments/violin/Db2.mid diff --git a/sound/instruments/violin/Db3.mid b/sound/runtime/instruments/violin/Db3.mid similarity index 100% rename from sound/instruments/violin/Db3.mid rename to sound/runtime/instruments/violin/Db3.mid diff --git a/sound/instruments/violin/Db4.mid b/sound/runtime/instruments/violin/Db4.mid similarity index 100% rename from sound/instruments/violin/Db4.mid rename to sound/runtime/instruments/violin/Db4.mid diff --git a/sound/instruments/violin/Db5.mid b/sound/runtime/instruments/violin/Db5.mid similarity index 100% rename from sound/instruments/violin/Db5.mid rename to sound/runtime/instruments/violin/Db5.mid diff --git a/sound/instruments/violin/Db6.mid b/sound/runtime/instruments/violin/Db6.mid similarity index 100% rename from sound/instruments/violin/Db6.mid rename to sound/runtime/instruments/violin/Db6.mid diff --git a/sound/instruments/violin/Db7.mid b/sound/runtime/instruments/violin/Db7.mid similarity index 100% rename from sound/instruments/violin/Db7.mid rename to sound/runtime/instruments/violin/Db7.mid diff --git a/sound/instruments/violin/Db8.mid b/sound/runtime/instruments/violin/Db8.mid similarity index 100% rename from sound/instruments/violin/Db8.mid rename to sound/runtime/instruments/violin/Db8.mid diff --git a/sound/instruments/violin/Dn1.mid b/sound/runtime/instruments/violin/Dn1.mid similarity index 100% rename from sound/instruments/violin/Dn1.mid rename to sound/runtime/instruments/violin/Dn1.mid diff --git a/sound/instruments/violin/Dn2.mid b/sound/runtime/instruments/violin/Dn2.mid similarity index 100% rename from sound/instruments/violin/Dn2.mid rename to sound/runtime/instruments/violin/Dn2.mid diff --git a/sound/instruments/violin/Dn3.mid b/sound/runtime/instruments/violin/Dn3.mid similarity index 100% rename from sound/instruments/violin/Dn3.mid rename to sound/runtime/instruments/violin/Dn3.mid diff --git a/sound/instruments/violin/Dn4.mid b/sound/runtime/instruments/violin/Dn4.mid similarity index 100% rename from sound/instruments/violin/Dn4.mid rename to sound/runtime/instruments/violin/Dn4.mid diff --git a/sound/instruments/violin/Dn5.mid b/sound/runtime/instruments/violin/Dn5.mid similarity index 100% rename from sound/instruments/violin/Dn5.mid rename to sound/runtime/instruments/violin/Dn5.mid diff --git a/sound/instruments/violin/Dn6.mid b/sound/runtime/instruments/violin/Dn6.mid similarity index 100% rename from sound/instruments/violin/Dn6.mid rename to sound/runtime/instruments/violin/Dn6.mid diff --git a/sound/instruments/violin/Dn7.mid b/sound/runtime/instruments/violin/Dn7.mid similarity index 100% rename from sound/instruments/violin/Dn7.mid rename to sound/runtime/instruments/violin/Dn7.mid diff --git a/sound/instruments/violin/Dn8.mid b/sound/runtime/instruments/violin/Dn8.mid similarity index 100% rename from sound/instruments/violin/Dn8.mid rename to sound/runtime/instruments/violin/Dn8.mid diff --git a/sound/instruments/violin/Eb1.mid b/sound/runtime/instruments/violin/Eb1.mid similarity index 100% rename from sound/instruments/violin/Eb1.mid rename to sound/runtime/instruments/violin/Eb1.mid diff --git a/sound/instruments/violin/Eb2.mid b/sound/runtime/instruments/violin/Eb2.mid similarity index 100% rename from sound/instruments/violin/Eb2.mid rename to sound/runtime/instruments/violin/Eb2.mid diff --git a/sound/instruments/violin/Eb3.mid b/sound/runtime/instruments/violin/Eb3.mid similarity index 100% rename from sound/instruments/violin/Eb3.mid rename to sound/runtime/instruments/violin/Eb3.mid diff --git a/sound/instruments/violin/Eb4.mid b/sound/runtime/instruments/violin/Eb4.mid similarity index 100% rename from sound/instruments/violin/Eb4.mid rename to sound/runtime/instruments/violin/Eb4.mid diff --git a/sound/instruments/violin/Eb5.mid b/sound/runtime/instruments/violin/Eb5.mid similarity index 100% rename from sound/instruments/violin/Eb5.mid rename to sound/runtime/instruments/violin/Eb5.mid diff --git a/sound/instruments/violin/Eb6.mid b/sound/runtime/instruments/violin/Eb6.mid similarity index 100% rename from sound/instruments/violin/Eb6.mid rename to sound/runtime/instruments/violin/Eb6.mid diff --git a/sound/instruments/violin/Eb7.mid b/sound/runtime/instruments/violin/Eb7.mid similarity index 100% rename from sound/instruments/violin/Eb7.mid rename to sound/runtime/instruments/violin/Eb7.mid diff --git a/sound/instruments/violin/Eb8.mid b/sound/runtime/instruments/violin/Eb8.mid similarity index 100% rename from sound/instruments/violin/Eb8.mid rename to sound/runtime/instruments/violin/Eb8.mid diff --git a/sound/instruments/violin/En1.mid b/sound/runtime/instruments/violin/En1.mid similarity index 100% rename from sound/instruments/violin/En1.mid rename to sound/runtime/instruments/violin/En1.mid diff --git a/sound/instruments/violin/En2.mid b/sound/runtime/instruments/violin/En2.mid similarity index 100% rename from sound/instruments/violin/En2.mid rename to sound/runtime/instruments/violin/En2.mid diff --git a/sound/instruments/violin/En3.mid b/sound/runtime/instruments/violin/En3.mid similarity index 100% rename from sound/instruments/violin/En3.mid rename to sound/runtime/instruments/violin/En3.mid diff --git a/sound/instruments/violin/En4.mid b/sound/runtime/instruments/violin/En4.mid similarity index 100% rename from sound/instruments/violin/En4.mid rename to sound/runtime/instruments/violin/En4.mid diff --git a/sound/instruments/violin/En5.mid b/sound/runtime/instruments/violin/En5.mid similarity index 100% rename from sound/instruments/violin/En5.mid rename to sound/runtime/instruments/violin/En5.mid diff --git a/sound/instruments/violin/En6.mid b/sound/runtime/instruments/violin/En6.mid similarity index 100% rename from sound/instruments/violin/En6.mid rename to sound/runtime/instruments/violin/En6.mid diff --git a/sound/instruments/violin/En7.mid b/sound/runtime/instruments/violin/En7.mid similarity index 100% rename from sound/instruments/violin/En7.mid rename to sound/runtime/instruments/violin/En7.mid diff --git a/sound/instruments/violin/En8.mid b/sound/runtime/instruments/violin/En8.mid similarity index 100% rename from sound/instruments/violin/En8.mid rename to sound/runtime/instruments/violin/En8.mid diff --git a/sound/instruments/violin/Fn1.mid b/sound/runtime/instruments/violin/Fn1.mid similarity index 100% rename from sound/instruments/violin/Fn1.mid rename to sound/runtime/instruments/violin/Fn1.mid diff --git a/sound/instruments/violin/Fn2.mid b/sound/runtime/instruments/violin/Fn2.mid similarity index 100% rename from sound/instruments/violin/Fn2.mid rename to sound/runtime/instruments/violin/Fn2.mid diff --git a/sound/instruments/violin/Fn3.mid b/sound/runtime/instruments/violin/Fn3.mid similarity index 100% rename from sound/instruments/violin/Fn3.mid rename to sound/runtime/instruments/violin/Fn3.mid diff --git a/sound/instruments/violin/Fn4.mid b/sound/runtime/instruments/violin/Fn4.mid similarity index 100% rename from sound/instruments/violin/Fn4.mid rename to sound/runtime/instruments/violin/Fn4.mid diff --git a/sound/instruments/violin/Fn5.mid b/sound/runtime/instruments/violin/Fn5.mid similarity index 100% rename from sound/instruments/violin/Fn5.mid rename to sound/runtime/instruments/violin/Fn5.mid diff --git a/sound/instruments/violin/Fn6.mid b/sound/runtime/instruments/violin/Fn6.mid similarity index 100% rename from sound/instruments/violin/Fn6.mid rename to sound/runtime/instruments/violin/Fn6.mid diff --git a/sound/instruments/violin/Fn7.mid b/sound/runtime/instruments/violin/Fn7.mid similarity index 100% rename from sound/instruments/violin/Fn7.mid rename to sound/runtime/instruments/violin/Fn7.mid diff --git a/sound/instruments/violin/Fn8.mid b/sound/runtime/instruments/violin/Fn8.mid similarity index 100% rename from sound/instruments/violin/Fn8.mid rename to sound/runtime/instruments/violin/Fn8.mid diff --git a/sound/instruments/violin/Gb1.mid b/sound/runtime/instruments/violin/Gb1.mid similarity index 100% rename from sound/instruments/violin/Gb1.mid rename to sound/runtime/instruments/violin/Gb1.mid diff --git a/sound/instruments/violin/Gb2.mid b/sound/runtime/instruments/violin/Gb2.mid similarity index 100% rename from sound/instruments/violin/Gb2.mid rename to sound/runtime/instruments/violin/Gb2.mid diff --git a/sound/instruments/violin/Gb3.mid b/sound/runtime/instruments/violin/Gb3.mid similarity index 100% rename from sound/instruments/violin/Gb3.mid rename to sound/runtime/instruments/violin/Gb3.mid diff --git a/sound/instruments/violin/Gb4.mid b/sound/runtime/instruments/violin/Gb4.mid similarity index 100% rename from sound/instruments/violin/Gb4.mid rename to sound/runtime/instruments/violin/Gb4.mid diff --git a/sound/instruments/violin/Gb5.mid b/sound/runtime/instruments/violin/Gb5.mid similarity index 100% rename from sound/instruments/violin/Gb5.mid rename to sound/runtime/instruments/violin/Gb5.mid diff --git a/sound/instruments/violin/Gb6.mid b/sound/runtime/instruments/violin/Gb6.mid similarity index 100% rename from sound/instruments/violin/Gb6.mid rename to sound/runtime/instruments/violin/Gb6.mid diff --git a/sound/instruments/violin/Gb7.mid b/sound/runtime/instruments/violin/Gb7.mid similarity index 100% rename from sound/instruments/violin/Gb7.mid rename to sound/runtime/instruments/violin/Gb7.mid diff --git a/sound/instruments/violin/Gb8.mid b/sound/runtime/instruments/violin/Gb8.mid similarity index 100% rename from sound/instruments/violin/Gb8.mid rename to sound/runtime/instruments/violin/Gb8.mid diff --git a/sound/instruments/violin/Gn1.mid b/sound/runtime/instruments/violin/Gn1.mid similarity index 100% rename from sound/instruments/violin/Gn1.mid rename to sound/runtime/instruments/violin/Gn1.mid diff --git a/sound/instruments/violin/Gn2.mid b/sound/runtime/instruments/violin/Gn2.mid similarity index 100% rename from sound/instruments/violin/Gn2.mid rename to sound/runtime/instruments/violin/Gn2.mid diff --git a/sound/instruments/violin/Gn3.mid b/sound/runtime/instruments/violin/Gn3.mid similarity index 100% rename from sound/instruments/violin/Gn3.mid rename to sound/runtime/instruments/violin/Gn3.mid diff --git a/sound/instruments/violin/Gn4.mid b/sound/runtime/instruments/violin/Gn4.mid similarity index 100% rename from sound/instruments/violin/Gn4.mid rename to sound/runtime/instruments/violin/Gn4.mid diff --git a/sound/instruments/violin/Gn5.mid b/sound/runtime/instruments/violin/Gn5.mid similarity index 100% rename from sound/instruments/violin/Gn5.mid rename to sound/runtime/instruments/violin/Gn5.mid diff --git a/sound/instruments/violin/Gn6.mid b/sound/runtime/instruments/violin/Gn6.mid similarity index 100% rename from sound/instruments/violin/Gn6.mid rename to sound/runtime/instruments/violin/Gn6.mid diff --git a/sound/instruments/violin/Gn7.mid b/sound/runtime/instruments/violin/Gn7.mid similarity index 100% rename from sound/instruments/violin/Gn7.mid rename to sound/runtime/instruments/violin/Gn7.mid diff --git a/sound/instruments/violin/Gn8.mid b/sound/runtime/instruments/violin/Gn8.mid similarity index 100% rename from sound/instruments/violin/Gn8.mid rename to sound/runtime/instruments/violin/Gn8.mid diff --git a/sound/instruments/xylophone/Ab2.mid b/sound/runtime/instruments/xylophone/Ab2.mid similarity index 100% rename from sound/instruments/xylophone/Ab2.mid rename to sound/runtime/instruments/xylophone/Ab2.mid diff --git a/sound/instruments/xylophone/Ab3.mid b/sound/runtime/instruments/xylophone/Ab3.mid similarity index 100% rename from sound/instruments/xylophone/Ab3.mid rename to sound/runtime/instruments/xylophone/Ab3.mid diff --git a/sound/instruments/xylophone/Ab4.mid b/sound/runtime/instruments/xylophone/Ab4.mid similarity index 100% rename from sound/instruments/xylophone/Ab4.mid rename to sound/runtime/instruments/xylophone/Ab4.mid diff --git a/sound/instruments/xylophone/Ab5.mid b/sound/runtime/instruments/xylophone/Ab5.mid similarity index 100% rename from sound/instruments/xylophone/Ab5.mid rename to sound/runtime/instruments/xylophone/Ab5.mid diff --git a/sound/instruments/xylophone/Ab6.mid b/sound/runtime/instruments/xylophone/Ab6.mid similarity index 100% rename from sound/instruments/xylophone/Ab6.mid rename to sound/runtime/instruments/xylophone/Ab6.mid diff --git a/sound/instruments/xylophone/An2.mid b/sound/runtime/instruments/xylophone/An2.mid similarity index 100% rename from sound/instruments/xylophone/An2.mid rename to sound/runtime/instruments/xylophone/An2.mid diff --git a/sound/instruments/xylophone/An3.mid b/sound/runtime/instruments/xylophone/An3.mid similarity index 100% rename from sound/instruments/xylophone/An3.mid rename to sound/runtime/instruments/xylophone/An3.mid diff --git a/sound/instruments/xylophone/An4.mid b/sound/runtime/instruments/xylophone/An4.mid similarity index 100% rename from sound/instruments/xylophone/An4.mid rename to sound/runtime/instruments/xylophone/An4.mid diff --git a/sound/instruments/xylophone/An5.mid b/sound/runtime/instruments/xylophone/An5.mid similarity index 100% rename from sound/instruments/xylophone/An5.mid rename to sound/runtime/instruments/xylophone/An5.mid diff --git a/sound/instruments/xylophone/An6.mid b/sound/runtime/instruments/xylophone/An6.mid similarity index 100% rename from sound/instruments/xylophone/An6.mid rename to sound/runtime/instruments/xylophone/An6.mid diff --git a/sound/instruments/xylophone/Bb2.mid b/sound/runtime/instruments/xylophone/Bb2.mid similarity index 100% rename from sound/instruments/xylophone/Bb2.mid rename to sound/runtime/instruments/xylophone/Bb2.mid diff --git a/sound/instruments/xylophone/Bb3.mid b/sound/runtime/instruments/xylophone/Bb3.mid similarity index 100% rename from sound/instruments/xylophone/Bb3.mid rename to sound/runtime/instruments/xylophone/Bb3.mid diff --git a/sound/instruments/xylophone/Bb4.mid b/sound/runtime/instruments/xylophone/Bb4.mid similarity index 100% rename from sound/instruments/xylophone/Bb4.mid rename to sound/runtime/instruments/xylophone/Bb4.mid diff --git a/sound/instruments/xylophone/Bb5.mid b/sound/runtime/instruments/xylophone/Bb5.mid similarity index 100% rename from sound/instruments/xylophone/Bb5.mid rename to sound/runtime/instruments/xylophone/Bb5.mid diff --git a/sound/instruments/xylophone/Bb6.mid b/sound/runtime/instruments/xylophone/Bb6.mid similarity index 100% rename from sound/instruments/xylophone/Bb6.mid rename to sound/runtime/instruments/xylophone/Bb6.mid diff --git a/sound/instruments/xylophone/Bn2.mid b/sound/runtime/instruments/xylophone/Bn2.mid similarity index 100% rename from sound/instruments/xylophone/Bn2.mid rename to sound/runtime/instruments/xylophone/Bn2.mid diff --git a/sound/instruments/xylophone/Bn3.mid b/sound/runtime/instruments/xylophone/Bn3.mid similarity index 100% rename from sound/instruments/xylophone/Bn3.mid rename to sound/runtime/instruments/xylophone/Bn3.mid diff --git a/sound/instruments/xylophone/Bn4.mid b/sound/runtime/instruments/xylophone/Bn4.mid similarity index 100% rename from sound/instruments/xylophone/Bn4.mid rename to sound/runtime/instruments/xylophone/Bn4.mid diff --git a/sound/instruments/xylophone/Bn5.mid b/sound/runtime/instruments/xylophone/Bn5.mid similarity index 100% rename from sound/instruments/xylophone/Bn5.mid rename to sound/runtime/instruments/xylophone/Bn5.mid diff --git a/sound/instruments/xylophone/Bn6.mid b/sound/runtime/instruments/xylophone/Bn6.mid similarity index 100% rename from sound/instruments/xylophone/Bn6.mid rename to sound/runtime/instruments/xylophone/Bn6.mid diff --git a/sound/instruments/xylophone/Cn2.mid b/sound/runtime/instruments/xylophone/Cn2.mid similarity index 100% rename from sound/instruments/xylophone/Cn2.mid rename to sound/runtime/instruments/xylophone/Cn2.mid diff --git a/sound/instruments/xylophone/Cn3.mid b/sound/runtime/instruments/xylophone/Cn3.mid similarity index 100% rename from sound/instruments/xylophone/Cn3.mid rename to sound/runtime/instruments/xylophone/Cn3.mid diff --git a/sound/instruments/xylophone/Cn4.mid b/sound/runtime/instruments/xylophone/Cn4.mid similarity index 100% rename from sound/instruments/xylophone/Cn4.mid rename to sound/runtime/instruments/xylophone/Cn4.mid diff --git a/sound/instruments/xylophone/Cn5.mid b/sound/runtime/instruments/xylophone/Cn5.mid similarity index 100% rename from sound/instruments/xylophone/Cn5.mid rename to sound/runtime/instruments/xylophone/Cn5.mid diff --git a/sound/instruments/xylophone/Cn6.mid b/sound/runtime/instruments/xylophone/Cn6.mid similarity index 100% rename from sound/instruments/xylophone/Cn6.mid rename to sound/runtime/instruments/xylophone/Cn6.mid diff --git a/sound/instruments/xylophone/Db2.mid b/sound/runtime/instruments/xylophone/Db2.mid similarity index 100% rename from sound/instruments/xylophone/Db2.mid rename to sound/runtime/instruments/xylophone/Db2.mid diff --git a/sound/instruments/xylophone/Db3.mid b/sound/runtime/instruments/xylophone/Db3.mid similarity index 100% rename from sound/instruments/xylophone/Db3.mid rename to sound/runtime/instruments/xylophone/Db3.mid diff --git a/sound/instruments/xylophone/Db4.mid b/sound/runtime/instruments/xylophone/Db4.mid similarity index 100% rename from sound/instruments/xylophone/Db4.mid rename to sound/runtime/instruments/xylophone/Db4.mid diff --git a/sound/instruments/xylophone/Db5.mid b/sound/runtime/instruments/xylophone/Db5.mid similarity index 100% rename from sound/instruments/xylophone/Db5.mid rename to sound/runtime/instruments/xylophone/Db5.mid diff --git a/sound/instruments/xylophone/Db6.mid b/sound/runtime/instruments/xylophone/Db6.mid similarity index 100% rename from sound/instruments/xylophone/Db6.mid rename to sound/runtime/instruments/xylophone/Db6.mid diff --git a/sound/instruments/xylophone/Dn2.mid b/sound/runtime/instruments/xylophone/Dn2.mid similarity index 100% rename from sound/instruments/xylophone/Dn2.mid rename to sound/runtime/instruments/xylophone/Dn2.mid diff --git a/sound/instruments/xylophone/Dn3.mid b/sound/runtime/instruments/xylophone/Dn3.mid similarity index 100% rename from sound/instruments/xylophone/Dn3.mid rename to sound/runtime/instruments/xylophone/Dn3.mid diff --git a/sound/instruments/xylophone/Dn4.mid b/sound/runtime/instruments/xylophone/Dn4.mid similarity index 100% rename from sound/instruments/xylophone/Dn4.mid rename to sound/runtime/instruments/xylophone/Dn4.mid diff --git a/sound/instruments/xylophone/Dn5.mid b/sound/runtime/instruments/xylophone/Dn5.mid similarity index 100% rename from sound/instruments/xylophone/Dn5.mid rename to sound/runtime/instruments/xylophone/Dn5.mid diff --git a/sound/instruments/xylophone/Dn6.mid b/sound/runtime/instruments/xylophone/Dn6.mid similarity index 100% rename from sound/instruments/xylophone/Dn6.mid rename to sound/runtime/instruments/xylophone/Dn6.mid diff --git a/sound/instruments/xylophone/Eb2.mid b/sound/runtime/instruments/xylophone/Eb2.mid similarity index 100% rename from sound/instruments/xylophone/Eb2.mid rename to sound/runtime/instruments/xylophone/Eb2.mid diff --git a/sound/instruments/xylophone/Eb3.mid b/sound/runtime/instruments/xylophone/Eb3.mid similarity index 100% rename from sound/instruments/xylophone/Eb3.mid rename to sound/runtime/instruments/xylophone/Eb3.mid diff --git a/sound/instruments/xylophone/Eb4.mid b/sound/runtime/instruments/xylophone/Eb4.mid similarity index 100% rename from sound/instruments/xylophone/Eb4.mid rename to sound/runtime/instruments/xylophone/Eb4.mid diff --git a/sound/instruments/xylophone/Eb5.mid b/sound/runtime/instruments/xylophone/Eb5.mid similarity index 100% rename from sound/instruments/xylophone/Eb5.mid rename to sound/runtime/instruments/xylophone/Eb5.mid diff --git a/sound/instruments/xylophone/Eb6.mid b/sound/runtime/instruments/xylophone/Eb6.mid similarity index 100% rename from sound/instruments/xylophone/Eb6.mid rename to sound/runtime/instruments/xylophone/Eb6.mid diff --git a/sound/instruments/xylophone/En2.mid b/sound/runtime/instruments/xylophone/En2.mid similarity index 100% rename from sound/instruments/xylophone/En2.mid rename to sound/runtime/instruments/xylophone/En2.mid diff --git a/sound/instruments/xylophone/En3.mid b/sound/runtime/instruments/xylophone/En3.mid similarity index 100% rename from sound/instruments/xylophone/En3.mid rename to sound/runtime/instruments/xylophone/En3.mid diff --git a/sound/instruments/xylophone/En4.mid b/sound/runtime/instruments/xylophone/En4.mid similarity index 100% rename from sound/instruments/xylophone/En4.mid rename to sound/runtime/instruments/xylophone/En4.mid diff --git a/sound/instruments/xylophone/En5.mid b/sound/runtime/instruments/xylophone/En5.mid similarity index 100% rename from sound/instruments/xylophone/En5.mid rename to sound/runtime/instruments/xylophone/En5.mid diff --git a/sound/instruments/xylophone/En6.mid b/sound/runtime/instruments/xylophone/En6.mid similarity index 100% rename from sound/instruments/xylophone/En6.mid rename to sound/runtime/instruments/xylophone/En6.mid diff --git a/sound/instruments/xylophone/Fn2.mid b/sound/runtime/instruments/xylophone/Fn2.mid similarity index 100% rename from sound/instruments/xylophone/Fn2.mid rename to sound/runtime/instruments/xylophone/Fn2.mid diff --git a/sound/instruments/xylophone/Fn3.mid b/sound/runtime/instruments/xylophone/Fn3.mid similarity index 100% rename from sound/instruments/xylophone/Fn3.mid rename to sound/runtime/instruments/xylophone/Fn3.mid diff --git a/sound/instruments/xylophone/Fn4.mid b/sound/runtime/instruments/xylophone/Fn4.mid similarity index 100% rename from sound/instruments/xylophone/Fn4.mid rename to sound/runtime/instruments/xylophone/Fn4.mid diff --git a/sound/instruments/xylophone/Fn5.mid b/sound/runtime/instruments/xylophone/Fn5.mid similarity index 100% rename from sound/instruments/xylophone/Fn5.mid rename to sound/runtime/instruments/xylophone/Fn5.mid diff --git a/sound/instruments/xylophone/Fn6.mid b/sound/runtime/instruments/xylophone/Fn6.mid similarity index 100% rename from sound/instruments/xylophone/Fn6.mid rename to sound/runtime/instruments/xylophone/Fn6.mid diff --git a/sound/instruments/xylophone/Gb2.mid b/sound/runtime/instruments/xylophone/Gb2.mid similarity index 100% rename from sound/instruments/xylophone/Gb2.mid rename to sound/runtime/instruments/xylophone/Gb2.mid diff --git a/sound/instruments/xylophone/Gb3.mid b/sound/runtime/instruments/xylophone/Gb3.mid similarity index 100% rename from sound/instruments/xylophone/Gb3.mid rename to sound/runtime/instruments/xylophone/Gb3.mid diff --git a/sound/instruments/xylophone/Gb4.mid b/sound/runtime/instruments/xylophone/Gb4.mid similarity index 100% rename from sound/instruments/xylophone/Gb4.mid rename to sound/runtime/instruments/xylophone/Gb4.mid diff --git a/sound/instruments/xylophone/Gb5.mid b/sound/runtime/instruments/xylophone/Gb5.mid similarity index 100% rename from sound/instruments/xylophone/Gb5.mid rename to sound/runtime/instruments/xylophone/Gb5.mid diff --git a/sound/instruments/xylophone/Gb6.mid b/sound/runtime/instruments/xylophone/Gb6.mid similarity index 100% rename from sound/instruments/xylophone/Gb6.mid rename to sound/runtime/instruments/xylophone/Gb6.mid diff --git a/sound/instruments/xylophone/Gn2.mid b/sound/runtime/instruments/xylophone/Gn2.mid similarity index 100% rename from sound/instruments/xylophone/Gn2.mid rename to sound/runtime/instruments/xylophone/Gn2.mid diff --git a/sound/instruments/xylophone/Gn3.mid b/sound/runtime/instruments/xylophone/Gn3.mid similarity index 100% rename from sound/instruments/xylophone/Gn3.mid rename to sound/runtime/instruments/xylophone/Gn3.mid diff --git a/sound/instruments/xylophone/Gn4.mid b/sound/runtime/instruments/xylophone/Gn4.mid similarity index 100% rename from sound/instruments/xylophone/Gn4.mid rename to sound/runtime/instruments/xylophone/Gn4.mid diff --git a/sound/instruments/xylophone/Gn5.mid b/sound/runtime/instruments/xylophone/Gn5.mid similarity index 100% rename from sound/instruments/xylophone/Gn5.mid rename to sound/runtime/instruments/xylophone/Gn5.mid diff --git a/sound/instruments/xylophone/Gn6.mid b/sound/runtime/instruments/xylophone/Gn6.mid similarity index 100% rename from sound/instruments/xylophone/Gn6.mid rename to sound/runtime/instruments/xylophone/Gn6.mid diff --git a/tgui/packages/tgui/interfaces/InstrumentEditor.tsx b/tgui/packages/tgui/interfaces/InstrumentEditor.tsx new file mode 100644 index 0000000000..d607d62c8a --- /dev/null +++ b/tgui/packages/tgui/interfaces/InstrumentEditor.tsx @@ -0,0 +1,371 @@ +import { useBackend } from 'tgui/backend'; +import { Window } from 'tgui/layouts'; +import { + Box, + Button, + Collapsible, + Divider, + Dropdown, + Input, + NumberInput, + Section, + Stack, + Tooltip, +} from 'tgui-core/components'; +import type { BooleanLike } from 'tgui-core/react'; + +type Data = { + id: string; + using_instrument: string; + note_shift_min: number; + note_shift_max: number; + note_shift: number; + octaves: number; + sustain_modes: string[]; + sustain_mode: string; + sustain_mode_button: string; + sustain_mode_duration: number; + instrument_ready: BooleanLike; + volume: number; + volume_dropoff_threshold: number; + min_volume: number; + max_volume: number; + sustain_indefinitely: BooleanLike; + sustain_mode_min: number; + sustain_mode_max: number; + playing: BooleanLike; + max_repeats: number; + repeat: number; + bpm: number; + lines: LineData[]; + can_switch_instrument: BooleanLike; + possible_instruments: InstrumentData[]; + max_line_chars: number; + max_lines: number; +}; + +type InstrumentData = { + name: string; + id: string; +}; + +type LineData = { + line_count: number; + line_text: string; +}; + +export const InstrumentEditor = (props) => { + const { data } = useBackend(); + + return ( + + + + + + + + + + + + ); +}; + +const InstrumentSettings = (props) => { + const { act, data } = useBackend(); + const { + id, + playing, + repeat, + max_repeats, + can_switch_instrument, + possible_instruments = [], + instrument_ready, + using_instrument, + note_shift_min, + note_shift_max, + note_shift, + octaves, + sustain_modes, + sustain_mode, + sustain_mode_button, + sustain_mode_duration, + sustain_indefinitely, + sustain_mode_min, + sustain_mode_max, + volume, + min_volume, + max_volume, + volume_dropoff_threshold, + lines, + } = data; + + const instrument_id_by_name = (name) => { + return possible_instruments.find((instrument) => instrument.name === name) + ?.id; + }; + + return ( +
+ {lines.length > 0 && ( + + + + )} + + + + ID: + + + act('set_instrument_id', { id: value })} + /> + + + Repeats Left: + + act('set_repeat_amount', { + amount: value, + }) + } + /> + + + {!!can_switch_instrument && ( + + Instrument Using + + instrument.name, + )} + onSelected={(value) => + act('change_instrument', { + new_instrument: instrument_id_by_name(value), + }) + } + /> + + + )} + + + + Playback Settings: + + + act('set_note_shift', { + amount: value, + }) + } + /> + keys / {octaves} octaves + + + Mode: + + + act('set_sustain_mode', { + new_mode: value, + }) + } + /> + + + + {sustain_mode_button}: + + act('edit_sustain_mode', { + amount: value, + }) + } + /> + + + + + + Status: + {instrument_ready ? ( + Ready + ) : ( + + {` Instrument Definition Error!`} + + )} + + + Volume: + + act('set_volume', { + amount: value, + }) + } + /> + + + Volume Dropoff Threshold: + + act('set_dropoff_volume', { + amount: value, + }) + } + /> + + + + + + +
+ ); +}; + +const EditingSettings = (props) => { + const { act, data } = useBackend(); + const { bpm, lines } = data; + + return ( +
+ + + + + + {`Tempo: `} + + {` ${bpm} BPM `} + + + + {lines.map((line, index) => ( + + Line {index}: + + + {line.line_text} + + ))} + + + + +
+ ); +}; + +const HelpSection = (props) => { + const { data } = useBackend(); + const { max_line_chars, max_lines } = data; + + return ( +
+ + Lines are a series of chords, separated by commas (,), each with notes + separated by hyphens (-). +
+ Every note in a chord will play together, with chord timed by the tempo. +
+ Notes are played by the names of the note, and optionally, the + accidental, and/or the octave number. +
+ By default, every note is natural and in octave 3. Defining otherwise is + remembered for each note. +
+ Example: C,D,E,F,G,A,B will play a C major scale. +
+ After a note has an accidental placed, it will be remembered:{' '} + C,C4,C,C3 is C3,C4,C4,C3 +
+ Chords can be played simply by seperating each note with a hyphon:{' '} + A-C#,Cn-E,E-G#,Gn-B +
A pause may be denoted by an empty chord: C,E,,C,G +
+ To make a chord be a different time, end it with /x, where the chord + length will be length +
+ defined by tempo / x: C,G/2,E/4 +
+ Combined, an example is: E-E4/4,F#/2,G#/8,B/8,E3-E4/4 +
+ Lines may be up to {max_line_chars} characters. +
A song may only contain up to {max_lines} lines. +
+ +
+ ); +}; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sound.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sound.tsx index ecd6d774df..3209c1bb62 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sound.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sound.tsx @@ -1,7 +1,9 @@ import { CheckboxInput, + type Feature, FeatureNumberInput, type FeatureNumeric, + FeatureSliderInput, type FeatureToggle, } from '../base'; @@ -26,6 +28,13 @@ export const SOUND_AMBIENCE: FeatureToggle = { component: CheckboxInput, }; +export const sound_instruments: Feature = { + name: 'Instruments volume', + category: 'SOUND', + description: 'Volume of instruments.', + component: FeatureSliderInput, +}; + export const SOUND_JUKEBOX: FeatureToggle = { name: 'Play Jukebox Music', category: 'SOUNDS', diff --git a/vorestation.dme b/vorestation.dme index 637661fa32..dad529c7c0 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -162,6 +162,7 @@ #include "code\__defines\simple_mob.dm" #include "code\__defines\size.dm" #include "code\__defines\slosh.dm" +#include "code\__defines\song.dm" #include "code\__defines\soulcatcher.dm" #include "code\__defines\sound.dm" #include "code\__defines\span.dm" @@ -210,6 +211,7 @@ #include "code\__defines\dcs\signals\signals_client.dm" #include "code\__defines\dcs\signals\signals_datum.dm" #include "code\__defines\dcs\signals\signals_material_container.dm" +#include "code\__defines\dcs\signals\signals_music.dm" #include "code\__defines\dcs\signals\signals_object.dm" #include "code\__defines\dcs\signals\signals_subsystem.dm" #include "code\__defines\dcs\signals\signals_techweb.dm" @@ -2860,6 +2862,7 @@ #include "code\modules\identification\identification.dm" #include "code\modules\identification\item_procs.dm" #include "code\modules\instruments\items.dm" +#include "code\modules\instruments\piano_synth.dm" #include "code\modules\instruments\stationary.dm" #include "code\modules\instruments\instrument_data\_instrument_data.dm" #include "code\modules\instruments\instrument_data\_instrument_key.dm"