GitHub/Super-Mario-Bros.-Remastered-Public
1
0
Fork 0
mirror of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git synced 2025-10-23 07:58:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #306 from ValHam1/main

Browse Source 
Added OGG music support
This commit is contained in:
Joe H
2025-09-21 12:43:09 +01:00
committed by GitHub
parent 7f6f2dfaa6 83192a5dd5
commit 67b59cde99
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Scripts/Classes/Singletons/AudioManager.gd
View File

@@ -244,6 +244,8 @@ func create_stream_from_json(json_path := "") -> AudioStream:
return AudioStreamWAV.load_from_file(ResourceSetter.get_pure_resource_path(json_path)) return AudioStreamWAV.load_from_file(ResourceSetter.get_pure_resource_path(json_path))
"mp3": "mp3":
return AudioStreamMP3.load_from_file(ResourceSetter.get_pure_resource_path(json_path)) return AudioStreamMP3.load_from_file(ResourceSetter.get_pure_resource_path(json_path))
"ogg":
return AudioStreamOggVorbis.load_from_file(ResourceSetter.get_pure_resource_path(json_path))
elif path.contains("res://"): elif path.contains("res://"):
return load(path) return load(path)
var bgm_file = $ResourceSetterNew.get_variation_json(JSON.parse_string(FileAccess.open(ResourceSetter.get_pure_resource_path(json_path), FileAccess.READ).get_as_text()).variations).source var bgm_file = $ResourceSetterNew.get_variation_json(JSON.parse_string(FileAccess.open(ResourceSetter.get_pure_resource_path(json_path), FileAccess.READ).get_as_text()).variations).source
@@ -255,8 +257,10 @@ func create_stream_from_json(json_path := "") -> AudioStream:
else: else:
if path.contains("res://"): if path.contains("res://"):
stream = load(path) stream = load(path)
else: elif path.contains(".mp3"):
stream = AudioStreamMP3.load_from_file(path) stream = AudioStreamMP3.load_from_file(path)
elif path.contains(".ogg"):
stream = AudioStreamOggVorbis.load_from_file(path)
return stream return stream
func generate_interactive_stream(bgm_file := {}) -> AudioStreamInteractive: func generate_interactive_stream(bgm_file := {}) -> AudioStreamInteractive:
@@ -274,11 +278,16 @@ func import_stream(file_path := "", loop_point := -1.0) -> AudioStream:
stream = load(path) stream = load(path)
elif path.contains(".mp3"): elif path.contains(".mp3"):
stream = AudioStreamMP3.load_from_file(ResourceSetter.get_pure_resource_path(file_path)) stream = AudioStreamMP3.load_from_file(ResourceSetter.get_pure_resource_path(file_path))
elif path.contains(".ogg"):
stream = AudioStreamOggVorbis.load_from_file(ResourceSetter.get_pure_resource_path(file_path))
elif path.contains(".wav"): elif path.contains(".wav"):
stream = AudioStreamWAV.load_from_file(path) stream = AudioStreamWAV.load_from_file(path)
print([path, stream]) print([path, stream])
if path.contains(".mp3"): if path.contains(".mp3"):
stream.set_loop(loop_point >= 0) stream.set_loop(loop_point >= 0)
stream.set_loop_offset(loop_point) stream.set_loop_offset(loop_point)
elif path.contains(".ogg"):
stream.set_loop(loop_point >= 0)
stream.set_loop_offset(loop_point)
return stream return stream