diff options
| author | Darkvater <Darkvater@openttd.org> | 2006-12-26 17:36:18 +0000 |
|---|---|---|
| committer | Darkvater <Darkvater@openttd.org> | 2006-12-26 17:36:18 +0000 |
| commit | 04628a1979f0ab8df4e78c0a57ca0d73381846be (patch) | |
| tree | 8dae47833ded5c522ac7a89f69f10fc0c2530e90 /music | |
| parent | 08d0319f7c50fba3ea11071d7a781478438cbbab (diff) | |
| download | openttd-04628a1979f0ab8df4e78c0a57ca0d73381846be.tar.xz | |
(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.
Diffstat (limited to 'music')
| -rw-r--r-- | music/dmusic.cpp | 10 | ||||
| -rw-r--r-- | music/extmidi.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/music/dmusic.cpp b/music/dmusic.cpp index 3af6dfc81..e20842d2e 100644 --- a/music/dmusic.cpp +++ b/music/dmusic.cpp @@ -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; } diff --git a/music/extmidi.c b/music/extmidi.c index 76a9ab504..901fa4fd7 100644 --- a/music/extmidi.c +++ b/music/extmidi.c @@ -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: |