gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Disable Streamed Audio for now, better late than broken

Browse Source
This commit is contained in:
Ralty
2026-04-07 10:41:35 +07:00
parent 3fa3fbda14
commit 2a413071cd
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/menus/FreeplayState.hx
+3 -3
View File
@@ -261,7 +261,7 @@ 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;
@@ -269,7 +269,7 @@ class FreeplayState extends MusicBeatState
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
+2 -2
View File
@@ -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
+9 -2
View File
@@ -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
+2 -2
View File
@@ -247,7 +247,7 @@ 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;
@@ -255,7 +255,7 @@ class Assets
var vorbisFile = VorbisFile.fromBytes(bytes);
if (vorbisFile != null) return Sound.fromAudioBuffer(AudioBuffer.fromVorbisFile(vorbisFile));
}
#end
#end*/
return if (staticFallback) getSound(id, useCache); else null;
}