[Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.9,1.10 adlibchannel.h,1.6,1.7 adlibmusic.cpp,1.13,1.14 adlibmusic.h,1.6,1.7 gmchannel.cpp,1.11,1.12 gmchannel.h,1.6,1.7 gmmusic.cpp,1.13,1.14 gmmusic.h,1.7,1.8 mt32music.cpp,1.11,1.12 mt32music.h,1.5,1.6 musicbase.cpp,1.14,1.15 musicbase.h,1.10,1.11

Max Horn fingolfin at users.sourceforge.net
Sun Oct 5 13:22:03 CEST 2003


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

Modified Files:
	adlibchannel.cpp adlibchannel.h adlibmusic.cpp adlibmusic.h 
	gmchannel.cpp gmchannel.h gmmusic.cpp gmmusic.h mt32music.cpp 
	mt32music.h musicbase.cpp musicbase.h 
Log Message:
renamed SkyState to SkyEngine; cleaned the #include dependency mess a bit (try to only #include files when you *have* to -> this reduces compilation time to a minimum when header file changes are made)

Index: adlibchannel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibchannel.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- adlibchannel.cpp	24 Sep 2003 06:28:04 -0000	1.9
+++ adlibchannel.cpp	5 Oct 2003 20:21:20 -0000	1.10
@@ -19,8 +19,9 @@
  *
  */
 
-#include "adlibchannel.h"
-#include "sound/fmopl.h"
+#include "common/util.h"
+#include "sky/music/adlibchannel.h"
+#include "sky/sky.h"
 
 SkyAdlibChannel::SkyAdlibChannel(FM_OPL *opl, uint8 *pMusicData, uint16 startOfData)
 {
@@ -42,7 +43,7 @@
 
 	uint16 instrumentDataLoc;
 
-	if (SkyState::_systemVars.gameVersion == 109) {
+	if (SkyEngine::_systemVars.gameVersion == 109) {
 		//instrumentDataLoc = (_musicData[0x11D0] << 8) | _musicData[0x11CF];
 		//_frequenceTable = (uint16*)(_musicData + 0x835);
 		//_registerTable = _musicData + 0xE35;
@@ -54,7 +55,7 @@
 		_registerTable = _musicData + 0xE68;
 		_opOutputTable = _musicData + 0xE7A;
 		_adlibRegMirror = _musicData + 0xF7D;
-	} else if (SkyState::_systemVars.gameVersion == 267) {
+	} else if (SkyEngine::_systemVars.gameVersion == 267) {
 		instrumentDataLoc = READ_LE_UINT16(_musicData + 0x11FB);
 		_frequenceTable = (uint16*)(_musicData + 0x7F4);
 		_registerTable = _musicData + 0xDF4;

Index: adlibchannel.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibchannel.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- adlibchannel.h	1 Oct 2003 09:40:28 -0000	1.6
+++ adlibchannel.h	5 Oct 2003 20:21:20 -0000	1.7
@@ -22,9 +22,6 @@
 #ifndef ADLIBCHANNEL_H
 #define ADLIBCHANNEL_H
 
-#include "stdafx.h"
-#include "base/engine.h"
-#include "sky/sky.h"
 #include "sky/music/musicbase.h"
 #include "sound/fmopl.h"
 

Index: adlibmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- adlibmusic.cpp	1 Oct 2003 09:40:28 -0000	1.13
+++ adlibmusic.cpp	5 Oct 2003 20:21:20 -0000	1.14
@@ -20,7 +20,9 @@
  */
 
 #include "sky/music/adlibmusic.h"
-#include "sound/fmopl.h"
+#include "sky/music/adlibchannel.h"
+#include "sound/mixer.h"
+#include "sky/sky.h"
 
 void SkyAdlibMusic::passMixerFunc(void *param, int16 *buf, uint len) {
 
@@ -91,14 +93,14 @@
 
 void SkyAdlibMusic::setupPointers(void) {
 
-	if (SkyState::_systemVars.gameVersion == 109) {
+	if (SkyEngine::_systemVars.gameVersion == 109) {
 		// disk demo uses a different adlib driver version, some offsets have changed
 		//_musicDataLoc = (_musicData[0x11CC] << 8) | _musicData[0x11CB];
 		//_initSequence = _musicData + 0xEC8;
 		
 		_musicDataLoc = READ_LE_UINT16(_musicData + 0x1200);
 		_initSequence = _musicData + 0xEFB;
-	} else if (SkyState::_systemVars.gameVersion == 267) {
+	} else if (SkyEngine::_systemVars.gameVersion == 267) {
 		_musicDataLoc = READ_LE_UINT16(_musicData + 0x11F7);
 		_initSequence = _musicData + 0xE87;
 	} else {

Index: adlibmusic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- adlibmusic.h	18 Sep 2003 02:07:18 -0000	1.6
+++ adlibmusic.h	5 Oct 2003 20:21:20 -0000	1.7
@@ -22,13 +22,10 @@
 #ifndef ADLIBMUSIC_H
 #define ADLIBMUSIC_H
 
-#include "stdafx.h"
-#include "sky/sky.h"
-#include "sound/mixer.h"
-#include "base/engine.h"
-#include "adlibchannel.h"
-#include "musicbase.h"
+#include "sky/music/musicbase.h"
 #include "sound/fmopl.h"
+
+class SoundMixer;
 
 class SkyAdlibMusic : public SkyMusicBase {
 public:

Index: gmchannel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmchannel.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gmchannel.cpp	1 Oct 2003 09:40:28 -0000	1.11
+++ gmchannel.cpp	5 Oct 2003 20:21:20 -0000	1.12
@@ -21,6 +21,7 @@
 
 #include "gmchannel.h"
 #include "common/util.h"
+#include "sound/mididrv.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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gmchannel.h	1 Oct 2003 09:40:28 -0000	1.6
+++ gmchannel.h	5 Oct 2003 20:21:20 -0000	1.7
@@ -22,9 +22,9 @@
 #ifndef SKYGMCHANNEL_H
 #define SKYGMCHANNEL_H
 
-#include "stdafx.h"
-#include "sound/mididrv.h"
 #include "sky/music/musicbase.h"
+
+class MidiDriver;
 
 typedef struct {
 	uint16 eventDataPtr;

Index: gmmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmmusic.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gmmusic.cpp	1 Oct 2003 09:40:28 -0000	1.13
+++ gmmusic.cpp	5 Oct 2003 20:21:20 -0000	1.14
@@ -20,7 +20,10 @@
  */
 
 #include "sky/music/gmmusic.h"
+#include "sky/music/gmchannel.h"
 #include "sky/sky.h"
+#include "common/util.h"
+#include "sound/mididrv.h"
 
 void SkyGmMusic::passTimerFunc(void *param) {
 
@@ -34,7 +37,7 @@
 	_midiDrv = pMidiDrv;
 	int midiRes = _midiDrv->open();
 	if (midiRes != 0) {
-		error("Can't open midi device. Errorcode: %d",midiRes);
+		error("Can't open midi device. Errorcode: %d", midiRes);
 	}
 	_midiDrv->setTimerCallback(this, passTimerFunc);
 	_ignoreNextPoll = false;
@@ -73,7 +76,7 @@
 
 void SkyGmMusic::setupPointers(void) {
 
-	if (SkyState::_systemVars.gameVersion == 109) {
+	if (SkyEngine::_systemVars.gameVersion == 109) {
 		_musicDataLoc = (_musicData[0x79C] << 8) | _musicData[0x79B];
 		_sysExSequence = _musicData + 0x1EF2;
 	} else {

Index: gmmusic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmmusic.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gmmusic.h	18 Sep 2003 02:07:18 -0000	1.7
+++ gmmusic.h	5 Oct 2003 20:21:20 -0000	1.8
@@ -22,11 +22,9 @@
 #ifndef GMMUSIC_H
 #define GMMUSIC_H
 
-#include "stdafx.h"
-#include "base/engine.h"
-#include "musicbase.h"
-#include "sound/mididrv.h"
-#include "gmchannel.h"
+#include "sky/music/musicbase.h"
+
+class MidiDriver;
 
 class SkyGmMusic : public SkyMusicBase {
 public:

Index: mt32music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/mt32music.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mt32music.cpp	3 Oct 2003 18:59:48 -0000	1.11
+++ mt32music.cpp	5 Oct 2003 20:21:20 -0000	1.12
@@ -20,7 +20,9 @@
  */
 
 #include "sky/music/mt32music.h"
+#include "sky/music/gmchannel.h"
 #include "common/util.h"
+#include "sound/mididrv.h"
 
 void SkyMT32Music::passTimerFunc(void *param) {
 

Index: mt32music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/mt32music.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mt32music.h	10 Sep 2003 12:40:41 -0000	1.5
+++ mt32music.h	5 Oct 2003 20:21:20 -0000	1.6
@@ -22,10 +22,9 @@
 #ifndef MT32MUSIC_H
 #define MT32MUSIC_H
 
-#include "stdafx.h"
-#include "musicbase.h"
-#include "sound/mididrv.h"
-#include "gmchannel.h"
+#include "sky/music/musicbase.h"
+
+class MidiDriver;
 
 class SkyMT32Music : public SkyMusicBase {
 public:

Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- musicbase.cpp	24 Sep 2003 06:28:04 -0000	1.14
+++ musicbase.cpp	5 Oct 2003 20:21:20 -0000	1.15
@@ -19,7 +19,8 @@
  *
  */
 
-#include "musicbase.h"
+#include "sky/music/musicbase.h"
+#include "sky/disk.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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- musicbase.h	10 Sep 2003 12:40:41 -0000	1.10
+++ musicbase.h	5 Oct 2003 20:21:20 -0000	1.11
@@ -23,8 +23,11 @@
 #define MUSICBASE_H
 
 #include "stdafx.h"
-#include "sky/disk.h"
+#include "common/scummsys.h"
 #include "common/system.h"
+
+class SkyDisk;
+class OSystem;
 
 #define FILES_PER_SECTION 4
 





More information about the Scummvm-git-logs mailing list