[Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec47.cpp,1.72,1.73 saud_channel.cpp,1.29,1.30 smush_font.cpp,1.32,1.33 smush_mixer.cpp,1.45,1.46 smush_player.cpp,1.175,1.176

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12353/scumm/smush

Modified Files:
	codec47.cpp saud_channel.cpp smush_font.cpp smush_mixer.cpp 
	smush_player.cpp 
Log Message:

Replace warnings with debug, errors or printfs:
-To catch any missing cases/functions used.
-To prevent users reporting warnings as bugs


Index: codec47.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- codec47.cpp	30 Jul 2005 21:11:33 -0000	1.72
+++ codec47.cpp	14 Aug 2005 02:04:26 -0000	1.73
@@ -576,7 +576,7 @@
 		memcpy(_curBuf, gfx_data, _frameSize);
 		break;
 	case 1:
-		warning("codec47: not implemented decode1 proc");
+		error("codec47: not implemented decode1 proc");
 		break;
 	case 2:
 		if (seq_nb == _prevSeqNb + 1) {

Index: saud_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/saud_channel.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- saud_channel.cpp	30 Jul 2005 21:11:34 -0000	1.29
+++ saud_channel.cpp	14 Aug 2005 02:04:26 -0000	1.30
@@ -41,7 +41,7 @@
 void SaudChannel::handleShdr(Chunk &b) {
 	int32 size = b.getSize();
 	if (size != 4)
-		warning("SMRK has a invalid size : %d", size);
+		error("SMRK has a invalid size : %d", size);
 }
 
 bool SaudChannel::handleSubTags(int32 &offset) {

Index: smush_font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_font.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- smush_font.cpp	30 Jul 2005 21:11:34 -0000	1.32
+++ smush_font.cpp	14 Aug 2005 02:04:26 -0000	1.33
@@ -38,7 +38,7 @@
 int SmushFont::getStringWidth(const char *str) {
 	assert(str);
 	if (!_loaded) {
-		warning("SmushFont::getStringWidth() Font is not loaded");
+		error("SmushFont::getStringWidth() Font is not loaded");
 		return 0;
 	}
 
@@ -56,7 +56,7 @@
 int SmushFont::getStringHeight(const char *str) {
 	assert(str);
 	if (!_loaded) {
-		warning("SmushFont::getStringHeight() Font is not loaded");
+		error("SmushFont::getStringHeight() Font is not loaded");
 		return 0;
 	}
 

Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- smush_mixer.cpp	30 Jul 2005 21:11:34 -0000	1.45
+++ smush_mixer.cpp	14 Aug 2005 02:04:26 -0000	1.46
@@ -69,7 +69,7 @@
 
 	for (i = 0; i < NUM_CHANNELS; i++) {
 		if (_channels[i].id == track)
-			warning("SmushMixer::addChannel(%d): channel already exists", track);
+			debugC(DEBUG_SMUSH, "SmushMixer::addChannel(%d): channel already exists", track);
 	}
 
 	for (i = 0; i < NUM_CHANNELS; i++) {
@@ -81,7 +81,7 @@
 	}
 
 	for (i = 0; i < NUM_CHANNELS; i++) {
-		warning("channel %d : %p(%d, %d)", i, (void *)_channels[i].chan,
+		debugC(DEBUG_SMUSH, "channel %d : %p(%d, %d)", i, (void *)_channels[i].chan,
 			_channels[i].chan ? _channels[i].chan->getTrackIdentifier() : -1,
 			_channels[i].chan ? _channels[i].chan->isTerminated() : 1);
 	}

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- smush_player.cpp	10 Aug 2005 12:42:56 -0000	1.175
+++ smush_player.cpp	14 Aug 2005 02:04:26 -0000	1.176
@@ -637,7 +637,7 @@
 		sf->drawStringWrap(str, _dst, _width, _height, pos_x, MAX(pos_y, top), left, MIN(left + right, _width), true);
 		break;
 	default:
-		warning("SmushPlayer::handleTextResource. Not handled flags: %d", flags);
+		error("SmushPlayer::handleTextResource. Not handled flags: %d", flags);
 	}
 
 	if (string != NULL) {