TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Set music type inside load_mus_file

Browse source 
Return the type for compatibility, but set the music type immediately.
Change callers to return without using a switch to set the music type
based on the returned value.  This allows the callers to exit early on a
successful load.

Remove the `switch` in the caller, since now every path that can set
`current_music_type` will either (a) set it to None because the load
failed or (b) set it to non-None and return before reaching the
`switch`.
This commit is contained in:
Kp 2022-03-19 22:55:58 +00:00
parent f8cf0b10c2
commit c4cc119898
1 changed files with 21 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
common/arch/sdl/digi_mixer_music.cpp
View file

@ -140,7 +140,7 @@ enum class CurrentMusicType
static CurrentMusicType current_music_type = CurrentMusicType::None;
static CurrentMusicType load_mus_data(const uint8_t *data, size_t size, int loop, void (*const hook_finished_track)());
static CurrentMusicType load_mus_file(const char *filename);
static CurrentMusicType load_mus_file(const char *filename, int loop, void (*const hook_finished_track)());
}
@ -173,7 +173,11 @@ int mix_play_file(const char *filename, int loop, void (*const entry_hook_finish
// try loading music via given filename
if (current_music_type == CurrentMusicType::None)
current_music_type = load_mus_file(filename);
{
current_music_type = load_mus_file(filename, loop, hook_finished_track);
if (current_music_type != CurrentMusicType::None)
return 1;
}
// allow the shell convention tilde character to mean the user's home folder
// chiefly used for default jukebox level song music referenced in 'descent.m3u' for Mac OS X
@ -185,18 +189,18 @@ int mix_play_file(const char *filename, int loop, void (*const entry_hook_finish
&filename[1 + (!strncmp(&filename[1], sep, lensep)
? lensep
: 0)]);
current_music_type = load_mus_file(full_path.data());
current_music_type = load_mus_file(full_path.data(), loop, hook_finished_track);
if (current_music_type != CurrentMusicType::None)
filename = full_path.data(); // used later for possible error reporting
return 1;
}
// no luck. so it might be in Searchpath. So try to build absolute path
if (current_music_type == CurrentMusicType::None)
{
PHYSFSX_getRealPath(filename, full_path);
current_music_type = load_mus_file(full_path.data());
current_music_type = load_mus_file(full_path.data(), loop, hook_finished_track);
if (current_music_type != CurrentMusicType::None)
filename = full_path.data(); // used later for possible error reporting
return 1;
}
// still nothin'? Let's open via PhysFS in case it's located inside an archive
@ -213,30 +217,8 @@ int mix_play_file(const char *filename, int loop, void (*const entry_hook_finish
}
}
switch (current_music_type)
{
#if DXX_USE_ADLMIDI
case CurrentMusicType::ADLMIDI:
{
mix_set_music_type_adl(loop, hook_finished_track);
return 1;
}
#endif
case CurrentMusicType::SDLMixer:
{
mix_set_music_type_sdlmixer(loop, hook_finished_track);
return 1;
}
default:
{
con_printf(CON_CRITICAL,"Music %s could not be loaded: %s", filename, Mix_GetError());
mix_stop_music();
}
}
con_printf(CON_CRITICAL, "Music %s could not be loaded: %s", filename, Mix_GetError());
mix_stop_music();
return 0;
}
@ -314,19 +296,25 @@ static CurrentMusicType load_mus_data(const uint8_t *data, size_t size, int loop
return CurrentMusicType::None;
}
static CurrentMusicType load_mus_file(const char *filename)
static CurrentMusicType load_mus_file(const char *filename, int loop, void (*const hook_finished_track)())
{
CurrentMusicType type = CurrentMusicType::None;
#if DXX_USE_ADLMIDI
const auto adlmidi = get_adlmidi();
if (adlmidi && adl_openFile(adlmidi, filename) == 0)
type = CurrentMusicType::ADLMIDI;
{
mix_set_music_type_adl(loop, hook_finished_track);
return CurrentMusicType::ADLMIDI;
}
else
#endif
{
current_music.reset(Mix_LoadMUS(filename));
if (current_music)
type = CurrentMusicType::SDLMixer;
{
mix_set_music_type_sdlmixer(loop, hook_finished_track);
return CurrentMusicType::SDLMixer;
}
}
return type;
}