Prefer "MIDI driver" to "Music device"

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

View file

@ -1130,7 +1130,9 @@ SoundStartup(void)
//snd_enabled = TRUE;
status = FX_Init(snd_numvoices, snd_numchannels, snd_mixrate, initdata);
status = FX_Init(NumVoices, NumChannels, MixRate, initdata);
if (status == FX_Ok)
{
FxInitialized = TRUE;
@ -1197,6 +1199,8 @@ void MusicStartup(void)
{
// 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)
{
MusicInitialized = TRUE;