Disable Streamed Audio for now, better late than broken

Author: Raltyro

source/funkin/menus/FreeplayState.hx

@@ -261,15 +261,15 @@ class FreeplayState extends MusicBeatState
 		if (!disableAutoPlay && !songInstPlaying && (autoplayElapsed > timeUntilAutoplay)) {
 			if (curPlayingInst != (curPlayingInst = Paths.inst(curSong.name, curDifficulties[curDifficulty], curSong.instSuffix))) {
 				var streamed = false;
-				if (Options.streamedMusic) {
+				/*if (Options.streamedMusic) {
 					var sound = Assets.getMusic(curPlayingInst, true, false);
 					streamed = sound != null;
 
 					if (streamed && autoplayShouldPlay) {
 						FlxG.sound.playMusic(sound, 0);
 						Conductor.changeBPM(curSong.bpm, curSong.beatsPerMeasure, curSong.stepsPerBeat);
 					}
-				}
+				}*/
 
 				if (!streamed) {
 					var huh:Void->Void = function() {
@@ -290,7 +290,7 @@ class FreeplayState extends MusicBeatState
 				}
 			}
 			songInstPlaying = true;
-			if (disableAsyncLoading && !Options.streamedMusic) dontPlaySongThisFrame = true;
+			if (disableAsyncLoading/* && !Options.streamedMusic*/) dontPlaySongThisFrame = true;
 		}
 		#end
 

source/funkin/options/Options.hx

@@ -43,8 +43,8 @@ class Options
 	public static var framerate:Int = 120;
 	public static var gpuOnlyBitmaps:Bool = #if (mac || web) false #else true #end; // causes issues on mac and web
 	public static var language = "en"; // default to english, Flags.DEFAULT_LANGUAGE should not modify this
-	public static var streamedMusic:Bool = true;
-	public static var streamedVocals:Bool = true;
+	public static var streamedMusic:Bool = false;
+	public static var streamedVocals:Bool = false;
 	public static var quality:Int = 1;
 	public static var allowConfigWarning:Bool = true;
 	#if MODCHARTING_FEATURES

source/funkin/options/categories/GameplayOptions.hx

@@ -67,7 +67,14 @@ class AdvancedGameplayOptions extends TreeMenuScreen {
 	public function new() {
 		super('optionsMenu.advanced', 'optionsTree.gameplay.advanced-desc', 'GameplayOptions.Advanced.');
 
-		add(new Checkbox(getNameID('streamedMusic'), getDescID('streamedMusic'), 'streamedMusic'));
-		add(new Checkbox(getNameID('streamedVocals'), getDescID('streamedVocals'), 'streamedVocals'));
+		// Remove locked whenever this PR from FunkinCrew is merged.
+		// https://github.com/FunkinCrew/lime/pull/57
+		for (checkbox in [
+			new Checkbox(getNameID('streamedMusic'), getDescID('streamedMusic'), 'streamedMusic'),
+			new Checkbox(getNameID('streamedVocals'), getDescID('streamedVocals'), 'streamedVocals')
+		]) {
+			checkbox.locked = true;
+			add(checkbox);
+		}
 	}
 }

source/openfl/utils/Assets.hx

@@ -247,15 +247,15 @@ class Assets
 			var sound = cache.getSound(id);
 			if (isValidSound(sound)) return sound;
 		}
-		#if (lime_vorbis && lime > "7.9.0" && !macro)
+		/*#if (lime_vorbis && lime > "7.9.0" && !macro)
 		if (Options.streamedMusic) {
 			var bytes = getBytes(id);
 			if (bytes == null) return null;
 			// TODO: What if it is a WAV or non-Vorbis file?
 			var vorbisFile = VorbisFile.fromBytes(bytes);
 			if (vorbisFile != null) return Sound.fromAudioBuffer(AudioBuffer.fromVorbisFile(vorbisFile));
 		}
-		#end
+		#end*/
 		return if (staticFallback) getSound(id, useCache); else null;
 	}