[Scummvm-cvs-logs] SF.net SVN: scummvm: [20950] scummvm/trunk/engines/scumm/imuse
Jamieson630 at users.sourceforge.net
Jamieson630 at users.sourceforge.net
Sun Feb 26 14:24:17 CET 2006
Revision: 20950
Author: Jamieson630
Date: 2006-02-26 14:23:29 -0800 (Sun, 26 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20950&view=rev
Log Message:
-----------
Removed deprecated IMUSE_DEBUG #define in favor of debugC calls using the runtime-selectable DEBUG_IMUSE category.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/imuse/imuse.cpp
scummvm/trunk/engines/scumm/imuse/imuse_player.cpp
Modified: scummvm/trunk/engines/scumm/imuse/imuse.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse.cpp 2006-02-26 21:59:44 UTC (rev 20949)
+++ scummvm/trunk/engines/scumm/imuse/imuse.cpp 2006-02-26 22:23:29 UTC (rev 20950)
@@ -711,15 +711,13 @@
if (!_initialized && (cmd || param))
return -1;
-#ifdef IMUSE_DEBUG
{
char string[128];
sprintf(string, "doCommand - %d (%d/%d)", a[0], (int)param, (int)cmd);
for (i = 1; i < numargs; ++i)
sprintf(string + strlen(string), ", %d", a[i]);
- debug(0, string);
+ debugC(DEBUG_IMUSE, string);
}
-#endif
if (param == 0) {
switch (cmd) {
Modified: scummvm/trunk/engines/scumm/imuse/imuse_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse_player.cpp 2006-02-26 21:59:44 UTC (rev 20949)
+++ scummvm/trunk/engines/scumm/imuse/imuse_player.cpp 2006-02-26 22:23:29 UTC (rev 20950)
@@ -129,9 +129,7 @@
return false;
}
-#ifdef IMUSE_DEBUG
- debug(0, "Starting music %d", sound);
-#endif
+ debugC(DEBUG_IMUSE, "Starting music %d", sound);
return true;
}
@@ -153,11 +151,8 @@
void Player::clear() {
if (!_active)
return;
+ debugC(DEBUG_IMUSE, "Stopping music %d", _id);
-#ifdef IMUSE_DEBUG
- debug(0, "Stopping music %d", _id);
-#endif
-
if (_parser) {
_parser->unloadMusic();
delete _parser;
@@ -386,7 +381,6 @@
if (len >= sizeof(buf) * 2)
return;
-#ifdef IMUSE_DEBUG
if (!_scanning) {
for (a = 0; a < len + 1 && a < 19; ++a) {
sprintf((char *)&buf[a*3], " %02X", p[a]);
@@ -396,9 +390,8 @@
++a;
} // end if
buf[a*3] = '\0';
- debug(0, "[%02d] SysEx:%s", _id, buf);
+ debugC(DEBUG_IMUSE, "[%02d] SysEx:%s", _id, buf);
}
-#endif
switch (code = *p++) {
case 0:
More information about the Scummvm-git-logs
mailing list