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

Remove second EMIDICard / ForceEMIDI parameter from MUSIC_Init which only served to clobber the value entered using the cvar

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8257 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-10-24 05:47:06 +00:00 committed by Christoph Oelckers
parent 9215812ed6
commit 55744eff09
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/audiolib/include/music.h
View file

@ -61,7 +61,7 @@ typedef struct
extern const char *MUSIC_ErrorString(int ErrorNumber); extern const char *MUSIC_ErrorString(int ErrorNumber);
int MUSIC_Init(int SoundCard, int ForceEMIDI = -1); int MUSIC_Init(int SoundCard);
int MUSIC_Shutdown(void); int MUSIC_Shutdown(void);
void MUSIC_SetVolume(int volume); void MUSIC_SetVolume(int volume);
int MUSIC_GetVolume(void); int MUSIC_GetVolume(void);

3
source/audiolib/src/music.cpp
View file

@ -52,7 +52,7 @@ const char *MUSIC_ErrorString(int ErrorNumber)
} }
int MUSIC_Init(int SoundCard, int EMIDICard /*= -1*/) int MUSIC_Init(int SoundCard)
{ {
int detected = 0; int detected = 0;
@ -82,7 +82,6 @@ failed:
} }
ASS_MIDISoundDriver = SoundCard; ASS_MIDISoundDriver = SoundCard;
ASS_EMIDICard = EMIDICard;
int status = SoundDriver_MIDI_Init(&MUSIC_MidiFunctions); int status = SoundDriver_MIDI_Init(&MUSIC_MidiFunctions);

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

@ -1197,7 +1197,7 @@ void MusicStartup(void)
{ {
// if they chose None lets return // if they chose None lets return
if (MUSIC_Init(0, 0) == MUSIC_Ok || MUSIC_Init(1, 0) == MUSIC_Ok) if (MUSIC_Init(MusicDevice) == MUSIC_Ok || MUSIC_Init(0) == MUSIC_Ok || MUSIC_Init(1) == MUSIC_Ok)
{ {
MusicInitialized = TRUE; MusicInitialized = TRUE;
MUSIC_SetVolume(mus_volume); MUSIC_SetVolume(mus_volume);