AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-25 22:05:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

win midi: report function name in error messages

Browse Source
This commit is contained in:
Roman Fomin 2022-07-16 09:59:11 +07:00
parent b434b147ce
commit e29a90f4eb
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/i_winmusic.c
View File

@ -23,6 +23,7 @@
#include "doomtype.h" #include "doomtype.h"
#include "i_sound.h" #include "i_sound.h"
#include "m_misc2.h"
#include "memio.h" #include "memio.h"
#include "mus2mid.h" #include "mus2mid.h"
#include "midifile.h" #include "midifile.h"
@ -86,7 +87,7 @@ static buffer_t buffer;
// Message box for midiStream errors. // Message box for midiStream errors.
static void MidiErrorMessageBox(DWORD dwError) static void MidiError(const char *prefix, DWORD dwError)
{ {
char szErrorBuf[MAXERRORLENGTH]; char szErrorBuf[MAXERRORLENGTH];
MMRESULT mmr; MMRESULT mmr;
@ -94,11 +95,13 @@ static void MidiErrorMessageBox(DWORD dwError)
mmr = midiOutGetErrorText(dwError, (LPSTR) szErrorBuf, MAXERRORLENGTH); mmr = midiOutGetErrorText(dwError, (LPSTR) szErrorBuf, MAXERRORLENGTH);
if (mmr == MMSYSERR_NOERROR) if (mmr == MMSYSERR_NOERROR)
{ {
MessageBox(NULL, szErrorBuf, "midiStream Error", MB_ICONEXCLAMATION); char *msg = M_StringJoin(prefix, ": ", szErrorBuf, NULL);
MessageBox(NULL, msg, "midiStream Error", MB_ICONEXCLAMATION);
free(msg);
} }
else else
{ {
fprintf(stderr, "Unknown midiStream error.\n"); fprintf(stderr, "%s: Unknown midiStream error.\n", prefix);
} }
} }
@ -165,7 +168,7 @@ static void StreamOut(void)
mmr = midiStreamOut(hMidiStream, hdr, sizeof(MIDIHDR)); mmr = midiStreamOut(hMidiStream, hdr, sizeof(MIDIHDR));
if (mmr != MMSYSERR_NOERROR) if (mmr != MMSYSERR_NOERROR)
{ {
MidiErrorMessageBox(mmr); MidiError("midiStreamOut", mmr);
} }
} }
@ -329,7 +332,7 @@ static boolean I_WIN_InitMusic(void)
CALLBACK_FUNCTION); CALLBACK_FUNCTION);
if (mmr != MMSYSERR_NOERROR) if (mmr != MMSYSERR_NOERROR)
{ {
MidiErrorMessageBox(mmr); MidiError("midiStreamOpen", mmr);
return false; return false;
} }
@ -342,7 +345,7 @@ static boolean I_WIN_InitMusic(void)
mmr = midiOutPrepareHeader((HMIDIOUT)hMidiStream, hdr, sizeof(MIDIHDR)); mmr = midiOutPrepareHeader((HMIDIOUT)hMidiStream, hdr, sizeof(MIDIHDR));
if (mmr != MMSYSERR_NOERROR) if (mmr != MMSYSERR_NOERROR)
{ {
MidiErrorMessageBox(mmr); MidiError("midiOutPrepareHeader", mmr);
return false; return false;
} }
@ -417,12 +420,12 @@ static void I_WIN_StopSong(void *handle)
mmr = midiStreamStop(hMidiStream); mmr = midiStreamStop(hMidiStream);
if (mmr != MMSYSERR_NOERROR) if (mmr != MMSYSERR_NOERROR)
{ {
MidiErrorMessageBox(mmr); MidiError("midiStreamStop", mmr);
} }
mmr = midiOutReset((HMIDIOUT)hMidiStream); mmr = midiOutReset((HMIDIOUT)hMidiStream);
if (mmr != MMSYSERR_NOERROR) if (mmr != MMSYSERR_NOERROR)
{ {
MidiErrorMessageBox(mmr); MidiError("midiOutReset", mmr);
} }
} }
@ -439,7 +442,7 @@ static void I_WIN_PlaySong(void *handle, boolean looping)
mmr = midiStreamRestart(hMidiStream); mmr = midiStreamRestart(hMidiStream);
if (mmr != MMSYSERR_NOERROR) if (mmr != MMSYSERR_NOERROR)
{ {
MidiErrorMessageBox(mmr); MidiError("midiStreamRestart", mmr);
} }
UpdateVolume(); UpdateVolume();
@ -452,7 +455,7 @@ static void I_WIN_PauseSong(void *handle)
mmr = midiStreamPause(hMidiStream); mmr = midiStreamPause(hMidiStream);
if (mmr != MMSYSERR_NOERROR) if (mmr != MMSYSERR_NOERROR)
{ {
MidiErrorMessageBox(mmr); MidiError("midiStreamPause", mmr);
} }
} }
@ -463,7 +466,7 @@ static void I_WIN_ResumeSong(void *handle)
mmr = midiStreamRestart(hMidiStream); mmr = midiStreamRestart(hMidiStream);
if (mmr != MMSYSERR_NOERROR) if (mmr != MMSYSERR_NOERROR)
{ {
MidiErrorMessageBox(mmr); MidiError("midiStreamRestart", mmr);
} }
} }
@ -523,7 +526,7 @@ static void *I_WIN_RegisterSong(void *data, int len)
MIDIPROP_SET | MIDIPROP_TIMEDIV); MIDIPROP_SET | MIDIPROP_TIMEDIV);
if (mmr != MMSYSERR_NOERROR) if (mmr != MMSYSERR_NOERROR)
{ {
MidiErrorMessageBox(mmr); MidiError("midiStreamProperty", mmr);
return NULL; return NULL;
} }
@ -534,7 +537,7 @@ static void *I_WIN_RegisterSong(void *data, int len)
MIDIPROP_SET | MIDIPROP_TEMPO); MIDIPROP_SET | MIDIPROP_TEMPO);
if (mmr != MMSYSERR_NOERROR) if (mmr != MMSYSERR_NOERROR)
{ {
MidiErrorMessageBox(mmr); MidiError("midiStreamProperty", mmr);
return NULL; return NULL;
} }
@ -570,12 +573,16 @@ static void I_WIN_ShutdownMusic(void)
I_WIN_StopSong(NULL); I_WIN_StopSong(NULL);
I_WIN_UnRegisterSong(NULL); I_WIN_UnRegisterSong(NULL);
midiOutUnprepareHeader((HMIDIOUT)hMidiStream, hdr, sizeof(MIDIHDR)); mmr = midiOutUnprepareHeader((HMIDIOUT)hMidiStream, hdr, sizeof(MIDIHDR));
if (mmr != MMSYSERR_NOERROR)
{
MidiError("midiOutUnprepareHeader", mmr);
}
mmr = midiStreamClose(hMidiStream); mmr = midiStreamClose(hMidiStream);
if (mmr != MMSYSERR_NOERROR) if (mmr != MMSYSERR_NOERROR)
{ {
MidiErrorMessageBox(mmr); MidiError("midiStreamClose", mmr);
} }
hMidiStream = NULL; hMidiStream = NULL;