jaildesigner-jailgames/aee-arcade
0
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(core/audio): helper stealCurrentIntoOutgoing (DUP-04)

Browse Source 
fadeOutMusic i crossfadeMusic repetien el bloc "destruir outgoing
anterior + preFillOutgoing + robar stream + reset state+vorbis". Es
treu a stealCurrentIntoOutgoing(duration_ms) i els dos callers deleguen.

Com a efecte secundari, homogeneïtza la neteja: abans fadeOutMusic no
posava outgoing.fade.active = false en destruir l'anterior i
crossfadeMusic sí. L'helper fa sempre les dues coses. El comportament
observable no canvia perquè la fade s'assigna completament just després,
però elimina una inconsistència latent.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
JailDesignerandClaude Opus 4.7 committed 2026-04-20 12:05:28 +02:00
1 parent ee34638c89
commit dee00a8de7
2 files changed
+35 -50
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

source/core/audio/jail_audio.hpp
+34 -49
View File
@@ -400,63 +400,48 @@ namespace Ja {
}
}
inline void fadeOutMusic(const int milliseconds) {
if (!music_enabled) { return; }
if (current_music == nullptr || current_music->state != MusicState::PLAYING) { return; }
// Destruir outgoing anterior si existe
if (outgoing_music.stream != nullptr) {
SDL_DestroyAudioStream(outgoing_music.stream);
outgoing_music.stream = nullptr;
}
// Pre-omplim l'stream amb `milliseconds` de so: un cop robat, ja no
// tindrà accés al vorbis decoder i només podrà drenar el que tinga.
preFillOutgoing(current_music, milliseconds);
// Robar el stream del current_music al outgoing
outgoing_music.stream = current_music->stream;
outgoing_music.fade = {
.active = true,
.start_time = SDL_GetTicks(),
.duration_ms = milliseconds,
.initial_volume = music_volume,
};
// Dejar current_music sin stream (ya lo tiene outgoing)
current_music->stream = nullptr;
current_music->state = MusicState::STOPPED;
if (current_music->vorbis != nullptr) { stb_vorbis_seek_start(current_music->vorbis); }
incoming_fade.active = false;
}
inline void crossfadeMusic(Music* music, const int crossfade_ms, const int loop) {
if (!music_enabled || music == nullptr || music->vorbis == nullptr) { return; }
// Destruir outgoing anterior si existe (crossfade durante crossfade)
// Roba l'stream de la música actual al slot outgoing per a un fade-out de
// `duration_ms` ms. Destrueix qualsevol outgoing anterior. L'stream robat
// ja no es pot alimentar (perd l'accés al vorbis decoder), per això cal
// preFillOutgoing abans del robatori perquè tingui so suficient fins que
// acabi el fade. No-op si no hi ha música sonant amb stream vàlid.
inline void stealCurrentIntoOutgoing(const int duration_ms) {
if (outgoing_music.stream != nullptr) {
SDL_DestroyAudioStream(outgoing_music.stream);
outgoing_music.stream = nullptr;
outgoing_music.fade.active = false;
}
// Robar el stream de la musica actual al outgoing para el fade-out.
// Pre-omplim amb `crossfade_ms` de so perquè no es quede en silenci
// abans d'acabar el fade (l'stream robat ja no pot alimentar-se).
if (current_music != nullptr && current_music->state == MusicState::PLAYING && current_music->stream != nullptr) {
preFillOutgoing(current_music, crossfade_ms);
outgoing_music.stream = current_music->stream;
outgoing_music.fade = {
.active = true,
.start_time = SDL_GetTicks(),
.duration_ms = crossfade_ms,
.initial_volume = music_volume,
};
current_music->stream = nullptr;
current_music->state = MusicState::STOPPED;
if (current_music->vorbis != nullptr) { stb_vorbis_seek_start(current_music->vorbis); }
if (current_music == nullptr || current_music->state != MusicState::PLAYING || current_music->stream == nullptr) {
return;
}
preFillOutgoing(current_music, duration_ms);
outgoing_music.stream = current_music->stream;
outgoing_music.fade = {
.active = true,
.start_time = SDL_GetTicks(),
.duration_ms = duration_ms,
.initial_volume = music_volume,
};
current_music->stream = nullptr;
current_music->state = MusicState::STOPPED;
if (current_music->vorbis != nullptr) { stb_vorbis_seek_start(current_music->vorbis); }
}
inline void fadeOutMusic(const int milliseconds) {
if (!music_enabled) { return; }
if (current_music == nullptr || current_music->state != MusicState::PLAYING) { return; }
stealCurrentIntoOutgoing(milliseconds);
incoming_fade.active = false;
}
inline void crossfadeMusic(Music* music, const int crossfade_ms, const int loop) {
if (!music_enabled || music == nullptr || music->vorbis == nullptr) { return; }
stealCurrentIntoOutgoing(crossfade_ms);
// Iniciar la nueva pista con gain=0 (el fade-in la sube gradualmente)
current_music = music;
current_music->state = MusicState::PLAYING;