[Scummvm-cvs-logs] CVS: scummvm/sky/music gmchannel.cpp,1.7,1.8 gmchannel.h,1.4,1.5 mt32music.cpp,1.9,1.10 mt32music.h,1.4,1.5 musicbase.cpp,1.12,1.13 musicbase.h,1.9,1.10

Max Horn fingolfin at users.sourceforge.net
Wed Sep 10 05:50:55 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1:/tmp/cvs-serv17947

Modified Files:
	gmchannel.cpp gmchannel.h mt32music.cpp mt32music.h 
	musicbase.cpp musicbase.h 
Log Message:
moved declaration of error/warning/debug from engine.h to util.h

Index: gmchannel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmchannel.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gmchannel.cpp	10 Sep 2003 12:35:29 -0000	1.7
+++ gmchannel.cpp	10 Sep 2003 12:40:41 -0000	1.8
@@ -21,6 +21,7 @@
 
 #include "common/util.h"
 #include "gmchannel.h"
+#include "common/util.h"
 
 SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap, uint8 *veloTab)
 {

Index: gmchannel.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmchannel.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gmchannel.h	20 Aug 2003 12:12:11 -0000	1.4
+++ gmchannel.h	10 Sep 2003 12:40:41 -0000	1.5
@@ -24,7 +24,6 @@
 
 #include "stdafx.h"
 #include "sound/mididrv.h"
-#include "common/engine.h"
 #include "sky/music/musicbase.h"
 
 typedef struct {

Index: mt32music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/mt32music.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mt32music.cpp	10 Sep 2003 12:35:29 -0000	1.9
+++ mt32music.cpp	10 Sep 2003 12:40:41 -0000	1.10
@@ -19,8 +19,8 @@
  *
  */
 
-#include "common/util.h"
 #include "sky/music/mt32music.h"
+#include "common/util.h"
 
 void SkyMT32Music::passTimerFunc(void *param) {
 

Index: mt32music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/mt32music.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mt32music.h	1 Jul 2003 01:27:50 -0000	1.4
+++ mt32music.h	10 Sep 2003 12:40:41 -0000	1.5
@@ -23,7 +23,6 @@
 #define MT32MUSIC_H
 
 #include "stdafx.h"
-#include "common/engine.h"
 #include "musicbase.h"
 #include "sound/mididrv.h"
 #include "gmchannel.h"

Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- musicbase.cpp	10 Sep 2003 12:35:29 -0000	1.12
+++ musicbase.cpp	10 Sep 2003 12:40:41 -0000	1.13
@@ -19,8 +19,8 @@
  *
  */
 
-#include "common/util.h"
 #include "musicbase.h"
+#include "common/util.h"
 
 SkyMusicBase::SkyMusicBase(SkyDisk *pSkyDisk, OSystem *system) {
 

Index: musicbase.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- musicbase.h	9 Jul 2003 04:31:24 -0000	1.9
+++ musicbase.h	10 Sep 2003 12:40:41 -0000	1.10
@@ -23,8 +23,8 @@
 #define MUSICBASE_H
 
 #include "stdafx.h"
-#include "common/engine.h"
 #include "sky/disk.h"
+#include "common/system.h"
 
 #define FILES_PER_SECTION 4
 





More information about the Scummvm-git-logs mailing list