Audio tooling for GameMaker 2024.8 (and later)
diff --git a/objects/oTest/Draw_0.gml b/objects/oTest/Draw_0.gml index d3733927..7f1dc290 100644 --- a/objects/oTest/Draw_0.gml +++ b/objects/oTest/Draw_0.gml @@ -11,7 +11,7 @@ shader_reset(); draw_set_font(fntText); UIStart(10, 10, undefined, undefined, true); -UITextInline(string_concat("Vinyl ", __VINYL_VERSION, ", ", __VINYL_DATE, " by Juju Adams\nChicken Nuggets by Wangle Line")); +UITextInline(string_concat("Vinyl ", VINYL_VERSION, ", ", VINYL_DATE, " by Juju Adams\nChicken Nuggets by Wangle Line")); UINewline(); UINewline(); UITextInline(string_concat("\"Test\" mix gain = ", VinylMixGetGain("Test"))); diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 472f79b4..158c0490 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -29,7 +29,7 @@ "option_windows_steam_use_alternative_launcher":false, "option_windows_texture_page":"2048x2048", "option_windows_use_splash":false, - "option_windows_version":"6.1.3.0", + "option_windows_version":"6.1.4.0", "option_windows_vsync":false, "resourceType":"GMWindowsOptions", "resourceVersion":"2.0", diff --git a/scripts/__VinylConstants/__VinylConstants.gml b/scripts/__VinylConstants/__VinylConstants.gml new file mode 100644 index 00000000..37cf9d5f --- /dev/null +++ b/scripts/__VinylConstants/__VinylConstants.gml @@ -0,0 +1,4 @@ +// Feather disable all + +#macro VINYL_VERSION "6.1.4" +#macro VINYL_DATE "2024-09-18" \ No newline at end of file diff --git a/scripts/__VinylConstants/__VinylConstants.yy b/scripts/__VinylConstants/__VinylConstants.yy new file mode 100644 index 00000000..c2aebf61 --- /dev/null +++ b/scripts/__VinylConstants/__VinylConstants.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"__VinylConstants", + "isCompatibility":false, + "isDnD":false, + "name":"__VinylConstants", + "parent":{ + "name":"Vinyl", + "path":"folders/Vinyl.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/__VinylError/__VinylError.gml b/scripts/__VinylError/__VinylError.gml index 5e99cb13..a6f83a9b 100644 --- a/scripts/__VinylError/__VinylError.gml +++ b/scripts/__VinylError/__VinylError.gml @@ -11,6 +11,6 @@ function __VinylError() ++_i; } - show_debug_message("Vinyl " + __VINYL_VERSION + ": " + string_replace_all(_string, "\n", "\n ")); + show_debug_message("Vinyl " + VINYL_VERSION + ": " + string_replace_all(_string, "\n", "\n ")); show_error("Vinyl:\n" + _string + "\n ", true); } \ No newline at end of file diff --git a/scripts/__VinylSystem/__VinylSystem.gml b/scripts/__VinylSystem/__VinylSystem.gml index a669980a..be488d31 100644 --- a/scripts/__VinylSystem/__VinylSystem.gml +++ b/scripts/__VinylSystem/__VinylSystem.gml @@ -1,8 +1,5 @@ // Feather disable all -#macro __VINYL_VERSION "6.1.3" -#macro __VINYL_DATE "2024-09-16" - #macro __VINYL_RUNNING_FROM_IDE (GM_build_type == "run") #macro __VINYL_DEFAULT_DUCK_RATE_OF_GAIN 1 @@ -35,7 +32,7 @@ function __VinylSystem() { if (__VINYL_DEBUG_SHOW_FRAMES) __frame = 0; - __VinylTrace("Welcome to Vinyl! This is version ", __VINYL_VERSION, ", ", __VINYL_DATE); + __VinylTrace("Welcome to Vinyl! This is version ", VINYL_VERSION, ", ", VINYL_DATE); if (__VINYL_RUNNING_FROM_IDE) global.Vinyl = self; __toUpdateArray = VINYL_LIVE_EDIT? [] : undefined; diff --git a/vinyl.resource_order b/vinyl.resource_order index b79373ec..d4477fe6 100644 --- a/vinyl.resource_order +++ b/vinyl.resource_order @@ -2,22 +2,22 @@ "FolderOrderSettings":[ {"name":"Sounds","order":4,"path":"folders/Sounds.yy",}, {"name":"UI","order":5,"path":"folders/UI.yy",}, - {"name":"(Internals)","order":12,"path":"folders/Vinyl/(Internals).yy",}, + {"name":"(Internals)","order":13,"path":"folders/Vinyl/(Internals).yy",}, {"name":"Classes","order":9,"path":"folders/Vinyl/(Internals)/Classes.yy",}, {"name":"Patterns","order":3,"path":"folders/Vinyl/(Internals)/Classes/Patterns.yy",}, {"name":"Voice","order":2,"path":"folders/Vinyl/(Internals)/Classes/Voice.yy",}, {"name":"Deprecated","order":26,"path":"folders/Vinyl/(Internals)/Deprecated.yy",}, {"name":"PRNG","order":10,"path":"folders/Vinyl/(Internals)/PRNG.yy",}, - {"name":"Blend Voices","order":8,"path":"folders/Vinyl/Blend Voices.yy",}, - {"name":"Config","order":2,"path":"folders/Vinyl/Config.yy",}, - {"name":"Ducker","order":7,"path":"folders/Vinyl/Ducker.yy",}, - {"name":"Gain & Pitch","order":5,"path":"folders/Vinyl/Gain & Pitch.yy",}, - {"name":"Metadata","order":10,"path":"folders/Vinyl/Metadata.yy",}, - {"name":"Miscellaneous","order":11,"path":"folders/Vinyl/Miscellaneous.yy",}, - {"name":"Mixes","order":6,"path":"folders/Vinyl/Mixes.yy",}, - {"name":"Playback","order":4,"path":"folders/Vinyl/Playback.yy",}, - {"name":"Queues","order":9,"path":"folders/Vinyl/Queues.yy",}, - {"name":"Runtime Setup","order":3,"path":"folders/Vinyl/Runtime Setup.yy",}, + {"name":"Blend Voices","order":9,"path":"folders/Vinyl/Blend Voices.yy",}, + {"name":"Config","order":3,"path":"folders/Vinyl/Config.yy",}, + {"name":"Ducker","order":8,"path":"folders/Vinyl/Ducker.yy",}, + {"name":"Gain & Pitch","order":6,"path":"folders/Vinyl/Gain & Pitch.yy",}, + {"name":"Metadata","order":11,"path":"folders/Vinyl/Metadata.yy",}, + {"name":"Miscellaneous","order":12,"path":"folders/Vinyl/Miscellaneous.yy",}, + {"name":"Mixes","order":7,"path":"folders/Vinyl/Mixes.yy",}, + {"name":"Playback","order":5,"path":"folders/Vinyl/Playback.yy",}, + {"name":"Queues","order":10,"path":"folders/Vinyl/Queues.yy",}, + {"name":"Runtime Setup","order":4,"path":"folders/Vinyl/Runtime Setup.yy",}, ], "ResourceOrderSettings":[ {"name":"acTest","order":10,"path":"animcurves/acTest/acTest.yy",}, @@ -41,6 +41,7 @@ {"name":"__VinylClassVoiceSound","order":1,"path":"scripts/__VinylClassVoiceSound/__VinylClassVoiceSound.yy",}, {"name":"__VinylCompiledSoundArrayEnsure","order":25,"path":"scripts/__VinylCompiledSoundArrayEnsure/__VinylCompiledSoundArrayEnsure.yy",}, {"name":"__VinylConfigJSON","order":2,"path":"scripts/__VinylConfigJSON/__VinylConfigJSON.yy",}, + {"name":"__VinylConstants","order":2,"path":"scripts/__VinylConstants/__VinylConstants.yy",}, {"name":"__VinylError","order":5,"path":"scripts/__VinylError/__VinylError.yy",}, {"name":"__VinylFindMatchingAudioAssets","order":24,"path":"scripts/__VinylFindMatchingAudioAssets/__VinylFindMatchingAudioAssets.yy",}, {"name":"__VinylGetMixMacro","order":12,"path":"scripts/__VinylGetMixMacro/__VinylGetMixMacro.yy",}, diff --git a/vinyl.yyp b/vinyl.yyp index 8da735d2..6417530d 100644 --- a/vinyl.yyp +++ b/vinyl.yyp @@ -64,6 +64,7 @@ {"id":{"name":"__VinylCompiledSoundArrayEnsure","path":"scripts/__VinylCompiledSoundArrayEnsure/__VinylCompiledSoundArrayEnsure.yy",},}, {"id":{"name":"__VinylConfigJSON","path":"scripts/__VinylConfigJSON/__VinylConfigJSON.yy",},}, {"id":{"name":"__VinylConfigMacros","path":"scripts/__VinylConfigMacros/__VinylConfigMacros.yy",},}, + {"id":{"name":"__VinylConstants","path":"scripts/__VinylConstants/__VinylConstants.yy",},}, {"id":{"name":"__VinylEnsurePatternSound","path":"scripts/__VinylEnsurePatternSound/__VinylEnsurePatternSound.yy",},}, {"id":{"name":"__VinylEnsureSoundVoice","path":"scripts/__VinylEnsureSoundVoice/__VinylEnsureSoundVoice.yy",},}, {"id":{"name":"__VinylError","path":"scripts/__VinylError/__VinylError.yy",},},