zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prefer "MIDI driver" to "Music device"

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8258 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/duke3d/src/sounds_mapster32.cpp
#	source/sw/src/sounds.cpp
This commit is contained in:
hendricks266 2019-10-24 05:47:11 +00:00 committed by Christoph Oelckers
parent 55744eff09
commit 14996d930b
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/duke3d/src/menus.cpp
View file

@ -1165,22 +1165,22 @@ static MenuRangeInt32_t MEO_SOUND_NUMVOICES = MAKE_MENURANGE( &soundvoices, &MF_
static MenuEntry_t ME_SOUND_NUMVOICES = MAKE_MENUENTRY( "Voices:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_SOUND_NUMVOICES, RangeInt32 ); static MenuEntry_t ME_SOUND_NUMVOICES = MAKE_MENUENTRY( "Voices:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_SOUND_NUMVOICES, RangeInt32 );
#endif #endif
static char const *MEOSN_SOUND_MUSICDEVICE[] = { static char const *MEOSN_SOUND_MIDIDRIVER[] = {
"OPL3", "OPL3",
#ifdef _WIN32 #ifdef _WIN32
"Windows", "Windows",
#endif #endif
}; };
static int32_t MEOSV_SOUND_MUSICDEVICE[] = { static int32_t MEOSV_SOUND_MIDIDRIVER[] = {
ASS_OPL3, ASS_OPL3,
#ifdef _WIN32 #ifdef _WIN32
ASS_WinMM, ASS_WinMM,
#endif #endif
}; };
static MenuOptionSet_t MEOS_SOUND_MUSICDEVICE = MAKE_MENUOPTIONSET( MEOSN_SOUND_MUSICDEVICE, MEOSV_SOUND_MUSICDEVICE, 0x2 ); static MenuOptionSet_t MEOS_SOUND_MIDIDRIVER = MAKE_MENUOPTIONSET( MEOSN_SOUND_MIDIDRIVER, MEOSV_SOUND_MIDIDRIVER, 0x2 );
static MenuOption_t MEO_SOUND_MUSICDEVICE = MAKE_MENUOPTION( &MF_Redfont, &MEOS_SOUND_MUSICDEVICE, &musicdevice ); static MenuOption_t MEO_SOUND_MIDIDRIVER = MAKE_MENUOPTION( &MF_Redfont, &MEOS_SOUND_MIDIDRIVER, &musicdevice );
static MenuEntry_t ME_SOUND_MUSICDEVICE = MAKE_MENUENTRY( "Music device:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_SOUND_MUSICDEVICE, Option ); static MenuEntry_t ME_SOUND_MIDIDRIVER = MAKE_MENUENTRY( "MIDI driver:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_SOUND_MIDIDRIVER, Option );
static MenuEntry_t ME_SOUND_RESTART = MAKE_MENUENTRY( "Apply Changes", &MF_Redfont, &MEF_BigOptions_Apply, &MEO_NULL, Link ); static MenuEntry_t ME_SOUND_RESTART = MAKE_MENUENTRY( "Apply Changes", &MF_Redfont, &MEF_BigOptions_Apply, &MEO_NULL, Link );
@ -1207,7 +1207,7 @@ static MenuEntry_t *MEL_ADVSOUND[] = {
&ME_SOUND_NUMVOICES, &ME_SOUND_NUMVOICES,
&ME_Space2_Redfont, &ME_Space2_Redfont,
#endif #endif
&ME_SOUND_MUSICDEVICE, &ME_SOUND_MIDIDRIVER,
&ME_SOUND_RESTART, &ME_SOUND_RESTART,
}; };

2
source/duke3d/src/sounds.cpp
View file

@ -113,7 +113,7 @@ void S_SoundShutdown(void)
void S_MusicStartup(void) void S_MusicStartup(void)
{ {
initprintf("Initializing music... "); initprintf("Initializing MIDI driver... ");
if (MUSIC_Init(ud.config.MusicDevice) == MUSIC_Ok || MUSIC_Init(0) == MUSIC_Ok || MUSIC_Init(1) == MUSIC_Ok) if (MUSIC_Init(ud.config.MusicDevice) == MUSIC_Ok || MUSIC_Init(0) == MUSIC_Ok || MUSIC_Init(1) == MUSIC_Ok)
{ {

6
source/sw/src/sounds.cpp
View file

@ -1130,7 +1130,9 @@ SoundStartup(void)
//snd_enabled = TRUE; //snd_enabled = TRUE;
status = FX_Init(snd_numvoices, snd_numchannels, snd_mixrate, initdata);
status = FX_Init(NumVoices, NumChannels, MixRate, initdata);
if (status == FX_Ok) if (status == FX_Ok)
{ {
FxInitialized = TRUE; FxInitialized = TRUE;
@ -1197,6 +1199,8 @@ void MusicStartup(void)
{ {
// if they chose None lets return // if they chose None lets return
buildprintf("Initializing MIDI driver... ");
if (MUSIC_Init(MusicDevice) == MUSIC_Ok || MUSIC_Init(0) == MUSIC_Ok || MUSIC_Init(1) == MUSIC_Ok) if (MUSIC_Init(MusicDevice) == MUSIC_Ok || MUSIC_Init(0) == MUSIC_Ok || MUSIC_Init(1) == MUSIC_Ok)
{ {
MusicInitialized = TRUE; MusicInitialized = TRUE;