(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to

use in debug.h. grfmsg() is now used as a specific debug-function for grf.
This commit is contained in:
Darkvater
2006-12-26 17:36:18 +00:00
parent 08d0319f7c
commit 04628a1979
63 changed files with 442 additions and 475 deletions

View File

@@ -162,7 +162,7 @@ static void DMusicMidiPlaySong(const char* filename)
if (FAILED(loader->GetObject(
&obj_desc, IID_IDirectMusicSegment, (LPVOID*)&segment
))) {
DEBUG(misc, 0) ("DirectMusic: Get object failed");
DEBUG(driver, 0, "DirectMusic: GetObject failed");
return;
}
@@ -170,19 +170,19 @@ static void DMusicMidiPlaySong(const char* filename)
if (FAILED(segment->SetParam(
GUID_StandardMIDIFile, 0xFFFFFFFF, 0, 0, performance
))) {
DEBUG(misc, 0) ("DirectMusic: SetParam (MIDI file) failed");
DEBUG(driver, 0, "DirectMusic: SetParam (MIDI file) failed");
return;
}
// tell the segment to 'download' the instruments
if (FAILED(segment->SetParam(GUID_Download, 0xFFFFFFFF, 0, 0, performance))) {
DEBUG(misc, 0) ("DirectMusic: Failed to download instruments");
DEBUG(driver, 0, "DirectMusic: failed to download instruments");
return;
}
// start playing the MIDI file
if (FAILED(performance->PlaySegment(segment, 0, 0, NULL))) {
DEBUG(misc, 0) ("DirectMusic: PlaySegment failed");
DEBUG(driver, 0, "DirectMusic: PlaySegment failed");
return;
}
@@ -193,7 +193,7 @@ static void DMusicMidiPlaySong(const char* filename)
static void DMusicMidiStopSong(void)
{
if (FAILED(performance->Stop(segment, NULL, 0, 0))) {
DEBUG(misc, 0) ("DirecMusic: StopSegment failed");
DEBUG(driver, 0, "DirectMusic: StopSegment failed");
}
seeking = false;
}

View File

@@ -59,7 +59,7 @@ static bool ExtMidiIsPlaying(void)
static void ExtMidiSetVolume(byte vol)
{
DEBUG(driver, 1) ("extmidi: set volume not implemented");
DEBUG(driver, 1, "extmidi: set volume not implemented");
}
static void DoPlay(void)
@@ -82,7 +82,7 @@ static void DoPlay(void)
}
case -1:
DEBUG(driver, 0) ("extmidi: couldn't fork: %s", strerror(errno));
DEBUG(driver, 0, "extmidi: couldn't fork: %s", strerror(errno));
/* FALLTHROUGH */
default: