mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
Remove second EMIDICard / ForceEMIDI parameter from MUSIC_Init which only served to clobber the value entered using the cvar
git-svn-id: https://svn.eduke32.com/eduke32@8257 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
9215812ed6
commit
55744eff09
3 changed files with 3 additions and 4 deletions
|
@ -61,7 +61,7 @@ typedef struct
|
|||
|
||||
extern const char *MUSIC_ErrorString(int ErrorNumber);
|
||||
|
||||
int MUSIC_Init(int SoundCard, int ForceEMIDI = -1);
|
||||
int MUSIC_Init(int SoundCard);
|
||||
int MUSIC_Shutdown(void);
|
||||
void MUSIC_SetVolume(int volume);
|
||||
int MUSIC_GetVolume(void);
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
@ -82,7 +82,6 @@ failed:
|
|||
}
|
||||
|
||||
ASS_MIDISoundDriver = SoundCard;
|
||||
ASS_EMIDICard = EMIDICard;
|
||||
|
||||
int status = SoundDriver_MIDI_Init(&MUSIC_MidiFunctions);
|
||||
|
||||
|
|
|
@ -1197,7 +1197,7 @@ void MusicStartup(void)
|
|||
{
|
||||
// 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;
|
||||
MUSIC_SetVolume(mus_volume);
|
||||
|
|
Loading…
Reference in a new issue