Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-10-23 05:31:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #90481 from AThousandShips/interactive_playback

Browse Source 
[Audio] Prevent crash in interactive playback
This commit is contained in:
Rémi Verschelde 2024-07-18 10:45:23 +02:00
commit 83dd7410e0
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/interactive_music/audio_stream_interactive.cpp
View File

@ -976,6 +976,8 @@ void AudioStreamPlaybackInteractive::switch_to_clip_by_name(const StringName &p_
return;
}
ERR_FAIL_COND_MSG(stream.is_null(), "Attempted to switch while not playing back any stream.");
for (int i = 0; i < stream->get_clip_count(); i++) {
if (stream->get_clip_name(i) == p_name) {
switch_request = i;

6
modules/interactive_music/register_types.cpp
View File

@ -42,11 +42,11 @@
void initialize_interactive_music_module(ModuleInitializationLevel p_level) {
if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) {
GDREGISTER_CLASS(AudioStreamPlaylist);
GDREGISTER_VIRTUAL_CLASS(AudioStreamPlaybackPlaylist);
GDREGISTER_ABSTRACT_CLASS(AudioStreamPlaybackPlaylist);
GDREGISTER_CLASS(AudioStreamInteractive);
GDREGISTER_VIRTUAL_CLASS(AudioStreamPlaybackInteractive);
GDREGISTER_ABSTRACT_CLASS(AudioStreamPlaybackInteractive);
GDREGISTER_CLASS(AudioStreamSynchronized);
GDREGISTER_VIRTUAL_CLASS(AudioStreamPlaybackSynchronized);
GDREGISTER_ABSTRACT_CLASS(AudioStreamPlaybackSynchronized);
}
#ifdef TOOLS_ENABLED
if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {