From 483c3a51c39da67b53a97f89108e4b5817706225 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Wed, 24 Jun 2009 21:47:54 +0000
Subject: Clarifying some warnings

svn-id: r41836
---
 engines/gob/script.cpp           |  2 +-
 engines/gob/sound/adlib.cpp      | 12 ++++++------
 engines/gob/sound/cdrom.cpp      |  2 +-
 engines/gob/sound/infogrames.cpp |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/engines/gob/script.cpp b/engines/gob/script.cpp
index 2cb719db26..134ad428ce 100644
--- a/engines/gob/script.cpp
+++ b/engines/gob/script.cpp
@@ -368,7 +368,7 @@ bool Script::loadTOT(const Common::String &fileName) {
 }
 
 bool Script::loadLOM(const Common::String &fileName) {
-	warning("Urban Stub: loadLOM %s", _totFile.c_str());
+	warning("Stub: Script::loadLOM(%s)", _totFile.c_str());
 
 	_lomHandle = _vm->_dataIO->openData(_totFile.c_str());
 	if (_lomHandle < 0)
diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp
index 12544f78ea..7ab8e1f8dd 100644
--- a/engines/gob/sound/adlib.cpp
+++ b/engines/gob/sound/adlib.cpp
@@ -243,7 +243,7 @@ void AdLib::setKey(byte voice, byte note, bool on, bool spec) {
 	writeOPL(0xB0 + voice, (freq >> 8) | (octa << 2) | 0x20 * on);
 
 	if (!freq)
-		warning("Voice %d, note %02X unknown", voice, note);
+		warning("AdLib: Voice %d, note %02X unknown", voice, note);
 }
 
 void AdLib::setVolume(byte voice, byte volume) {
@@ -402,7 +402,7 @@ void ADLPlayer::interpret() {
 				_samplesTillPoll = 0;
 				return;
 			default:
-				warning("Unknown special command in ADL, stopping playback: %X",
+				warning("ADLPlayer: Unknown special command %X, stopping playback",
 						instr & 0x0F);
 				_repCount = 0;
 				_ended = true;
@@ -410,7 +410,7 @@ void ADLPlayer::interpret() {
 			}
 			break;
 		default:
-			warning("Unknown command in ADL, stopping playback: %X",
+			warning("ADLPlayer: Unknown command %X, stopping playback",
 					instr & 0xF0);
 			_repCount = 0;
 			_ended = true;
@@ -660,7 +660,7 @@ void MDYPlayer::interpret() {
 				setVoice(channel, timbre, false);
 				break;
 			case 0xE0:
-				warning("Pitch bend not yet implemented");
+				warning("MDYPlayer: Pitch bend not yet implemented");
 
 				note = *(_playPos)++;
 				note += (unsigned)(*(_playPos++)) << 7;
@@ -675,7 +675,7 @@ void MDYPlayer::interpret() {
 				_playPos++;
 				break;
 			default:
-				warning("Bad MIDI instr byte: 0%X", instr);
+				warning("MDYPlayer: Bad MIDI instr byte: 0%X", instr);
 				while ((*_playPos) < 0x80)
 					_playPos++;
 				if (*_playPos != 0xF8)
@@ -750,7 +750,7 @@ void MDYPlayer::setVoice(byte voice, byte instr, bool set) {
 		timbrePtr = _timbres + _tbrStart + instr * 0x38 + i * 0x1A;
 		for (int j = 0; j < 27; j++) {
 			if (timbrePtr >= (_timbres + _timbresSize)) {
-				warning("Instrument %d out of range (%d, %d)", instr,
+				warning("MDYPlayer: Instrument %d out of range (%d, %d)", instr,
 						(uint32) (timbrePtr - _timbres), _timbresSize);
 				strct[j] = 0;
 			} else
diff --git a/engines/gob/sound/cdrom.cpp b/engines/gob/sound/cdrom.cpp
index 0694970950..4d6a7ec966 100644
--- a/engines/gob/sound/cdrom.cpp
+++ b/engines/gob/sound/cdrom.cpp
@@ -87,7 +87,7 @@ void CDROM::startTrack(const char *trackName) {
 
 	byte *matchPtr = getTrackBuffer(trackName);
 	if (!matchPtr) {
-		warning("Track \"%s\" not found", trackName);
+		warning("CDROM: Track \"%s\" not found", trackName);
 		return;
 	}
 
diff --git a/engines/gob/sound/infogrames.cpp b/engines/gob/sound/infogrames.cpp
index 0b46f3485c..c955dba43f 100644
--- a/engines/gob/sound/infogrames.cpp
+++ b/engines/gob/sound/infogrames.cpp
@@ -55,7 +55,7 @@ bool Infogrames::loadSong(const char *fileName) {
 			_mixer->getOutputRate(), _mixer->getOutputRate() / 75);
 
 	if (!_song->load(fileName)) {
-		warning("Couldn't load infogrames music");
+		warning("Infogrames: Couldn't load music \"%s\"", fileName);
 		clearSong();
 		return false;
 	}
@@ -92,7 +92,7 @@ void Infogrames::clearSong() {
 bool Infogrames::loadInst(const char *fileName) {
 	_instruments = new Audio::Infogrames::Instruments;
 	if (!_instruments->load(fileName)) {
-		warning("Couldn't load instruments file");
+		warning("Infogrames: Couldn't load instruments \"%s\"", fileName);
 		clearInstruments();
 		return false;
 	}
-- 
cgit v1.2.3