zdoom/zmusic
0
0
Fork 0
mirror of https://github.com/ZDoom/ZMusic.git synced 2025-02-07 08:01:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

allow switching between XMP and Dumb for module playback via config variable.

Browse source
This commit is contained in:
Christoph Oelckers 2024-10-05 11:41:34 +02:00
parent b71e1a2639
commit 6c5cf572aa
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/zmusic.h
View file

@ -151,6 +151,7 @@ typedef enum EIntConfigKey_
zmusic_snd_mididevice, zmusic_snd_mididevice,
zmusic_snd_outputrate, zmusic_snd_outputrate,
zmusic_mod_preferredplayer,
NUM_ZMUSIC_INT_CONFIGS NUM_ZMUSIC_INT_CONFIGS
} EIntConfigKey; } EIntConfigKey;

5
source/zmusic/configuration.cpp
View file

@ -652,6 +652,10 @@ DLL_EXPORT zmusic_bool ChangeMusicSettingInt(EIntConfigKey key, MusInfo *currSon
miscConfig.snd_outputrate = value; miscConfig.snd_outputrate = value;
return false; return false;
case zmusic_mod_preferredplayer:
dumbConfig.mod_preferred_player = value;
return false;
} }
return false; return false;
} }
@ -942,6 +946,7 @@ static ZMusicConfigurationSetting config[] = {
{"zmusic_mod_autochip_size_force", zmusic_mod_autochip_size_force, ZMUSIC_VAR_INT, 100}, {"zmusic_mod_autochip_size_force", zmusic_mod_autochip_size_force, ZMUSIC_VAR_INT, 100},
{"zmusic_mod_autochip_size_scan", zmusic_mod_autochip_size_scan, ZMUSIC_VAR_INT, 500}, {"zmusic_mod_autochip_size_scan", zmusic_mod_autochip_size_scan, ZMUSIC_VAR_INT, 500},
{"zmusic_mod_autochip_scan_threshold", zmusic_mod_autochip_scan_threshold, ZMUSIC_VAR_INT, 12}, {"zmusic_mod_autochip_scan_threshold", zmusic_mod_autochip_scan_threshold, ZMUSIC_VAR_INT, 12},
{"zmusic_mod_preferred_player", zmusic_mod_preferredplayer, ZMUSIC_VAR_INT, 0},
{"zmusic_mod_dumb_mastervolume", zmusic_mod_dumb_mastervolume, ZMUSIC_VAR_FLOAT, 1}, {"zmusic_mod_dumb_mastervolume", zmusic_mod_dumb_mastervolume, ZMUSIC_VAR_FLOAT, 1},
{"zmusic_gme_stereodepth", zmusic_gme_stereodepth, ZMUSIC_VAR_FLOAT, 0}, {"zmusic_gme_stereodepth", zmusic_gme_stereodepth, ZMUSIC_VAR_FLOAT, 0},

1
source/zmusic/midiconfig.h
View file

@ -129,6 +129,7 @@ struct DumbConfig
int mod_autochip_size_force = 100; int mod_autochip_size_force = 100;
int mod_autochip_size_scan = 500; int mod_autochip_size_scan = 500;
int mod_autochip_scan_threshold = 12; int mod_autochip_scan_threshold = 12;
int mod_preferred_player = 0;
float mod_dumb_mastervolume = 1; float mod_dumb_mastervolume = 1;
}; };

13
source/zmusic/zmusic.cpp
View file

@ -263,13 +263,22 @@ static MusInfo *ZMusic_OpenSongInternal (MusicIO::FileInterface *reader, EMidiD
} }
else else
{ {
// give the calling app an option to select between XMP and DUMB.
if (dumbConfig.mod_preferred_player != 0)
{
streamsource = MOD_OpenSong(reader, miscConfig.snd_outputrate);
}
if (!streamsource)
{
reader->seek(0, SEEK_SET);
streamsource = XMP_OpenSong(reader, miscConfig.snd_outputrate); streamsource = XMP_OpenSong(reader, miscConfig.snd_outputrate);
if (!streamsource) { if (!streamsource && dumbConfig.mod_preferred_player == 0)
ZMusic_Printf(ZMUSIC_MSG_WARNING, "Fallback to DUMB\n"); {
reader->seek(0, SEEK_SET); reader->seek(0, SEEK_SET);
streamsource = MOD_OpenSong(reader, miscConfig.snd_outputrate); streamsource = MOD_OpenSong(reader, miscConfig.snd_outputrate);
} }
} }
}
if (streamsource == nullptr) if (streamsource == nullptr)
{ {
streamsource = SndFile_OpenSong(reader); // this only takes over the reader if it succeeds. We need to look out for this. streamsource = SndFile_OpenSong(reader); // this only takes over the reader if it succeeds. We need to look out for this.