[Scummvm-cvs-logs] CVS: scummvm/sky/music gmmusic.cpp,1.9,1.10 mt32music.cpp,1.7,1.8 musicbase.cpp,1.10,1.11
Max Horn
fingolfin at users.sourceforge.net
Sun Jul 13 09:23:13 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon debug.cpp,1.20,1.21
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky autoroute.cpp,1.12,1.13 control.cpp,1.46,1.47 debug.cpp,1.4,1.5 disk.cpp,1.41,1.42 logic.cpp,1.124,1.125 screen.cpp,1.47,1.48 sound.cpp,1.27,1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1:/tmp/cvs-serv17573/sky/music
Modified Files:
gmmusic.cpp mt32music.cpp musicbase.cpp
Log Message:
debug/warning/error all automatically output a newline
Index: gmmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmmusic.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gmmusic.cpp 13 Jul 2003 06:04:11 -0000 1.9
+++ gmmusic.cpp 13 Jul 2003 16:22:17 -0000 1.10
@@ -34,7 +34,7 @@
_midiDrv = pMidiDrv;
int midiRes = _midiDrv->open();
if (midiRes != 0) {
- error("Can't open midi device. Errorcode: %d\n",midiRes);
+ error("Can't open midi device. Errorcode: %d",midiRes);
}
_midiDrv->setTimerCallback(this, passTimerFunc);
_ignoreNextPoll = false;
Index: mt32music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/mt32music.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mt32music.cpp 12 Jul 2003 06:20:40 -0000 1.7
+++ mt32music.cpp 13 Jul 2003 16:22:17 -0000 1.8
@@ -33,7 +33,7 @@
_midiDrv = pMidiDrv;
int midiRes = _midiDrv->open();
if (midiRes != 0) {
- error("Can't open midi device. Errorcode: %d\n",midiRes);
+ error("Can't open midi device. Errorcode: %d",midiRes);
}
_midiDrv->setTimerCallback(this, passTimerFunc);
_ignoreNextPoll = false;
Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- musicbase.cpp 13 Jul 2003 04:26:55 -0000 1.10
+++ musicbase.cpp 13 Jul 2003 16:22:17 -0000 1.11
@@ -69,25 +69,25 @@
void SkyMusicBase::musicCommand(uint16 command)
{
if (_musicData == NULL) {
- debug(1,"Got music command but driver is not yet loaded.\n");
+ debug(1,"Got music command but driver is not yet loaded");
return ;
}
if ((command >> 8) > _allowedCommands) {
- debug(1,"got musicCommand %d while expecting <= %d\n", command >> 8, _allowedCommands);
+ debug(1,"got musicCommand %d while expecting <= %d", command >> 8, _allowedCommands);
return ;
}
switch(command >> 8) {
case 0:
- debug(1,"SkyMusic: got call to startAdlibDriver(). Not necessary in this implementation.\n");
+ debug(1,"SkyMusic: got call to startAdlibDriver(). Not necessary in this implementation.");
break;
case 1:
- debug(1,"SkyMusic: got call to stopDriver(). Not necessary in this implementation.\n");
+ debug(1,"SkyMusic: got call to stopDriver(). Not necessary in this implementation.");
break;
case 2:
- debug(1,"SkyMusic: got call to SetTempo(). Tempo is fixed in this implementation.\n");
+ debug(1,"SkyMusic: got call to SetTempo(). Tempo is fixed in this implementation.");
break;
case 3:
- debug(1,"SkyMusic: ignored direct call to driverPoll().\n");
+ debug(1,"SkyMusic: ignored direct call to driverPoll().");
break;
case 4:
startMusic(command&0xFF);
@@ -102,7 +102,7 @@
setFMVolume(command&0xFF);
break;
default:
- debug(1,"musicCommand %d ignored.\n",command>>8);
+ debug(1,"musicCommand %d ignored.",command>>8);
}
}
@@ -134,7 +134,7 @@
{
uint16 musicPos;
if (_onNextPoll.musicToProcess > _musicData[_musicDataLoc]) {
- error("Music %d requested but doesn't exist in file.\n", _onNextPoll.musicToProcess);
+ error("Music %d requested but doesn't exist in file.", _onNextPoll.musicToProcess);
return;
}
if (_currentMusic != 0)
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon debug.cpp,1.20,1.21
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky autoroute.cpp,1.12,1.13 control.cpp,1.46,1.47 debug.cpp,1.4,1.5 disk.cpp,1.41,1.42 logic.cpp,1.124,1.125 screen.cpp,1.47,1.48 sound.cpp,1.27,1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list