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

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1:/tmp/cvs-serv11909/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:
Introduce namespace 'Sky'

Index: adlibchannel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibchannel.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- adlibchannel.cpp	8 Nov 2003 20:27:27 -0000	1.13
+++ adlibchannel.cpp	3 Jan 2004 01:58:58 -0000	1.14
@@ -24,6 +24,8 @@
 #include "sky/music/adlibchannel.h"
 #include "sky/sky.h"
 
+namespace Sky {
+
 SkyAdlibChannel::SkyAdlibChannel(FM_OPL *opl, uint8 *pMusicData, uint16 startOfData) {
 	_opl = opl;
 	_musicData = pMusicData;
@@ -337,3 +339,5 @@
 
 	_channelData.startOfData = _channelData.eventDataPtr;
 }
+
+} // End of namespace Sky

Index: adlibchannel.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibchannel.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- adlibchannel.h	5 Oct 2003 20:21:20 -0000	1.7
+++ adlibchannel.h	3 Jan 2004 01:58:58 -0000	1.8
@@ -25,6 +25,8 @@
 #include "sky/music/musicbase.h"
 #include "sound/fmopl.h"
 
+namespace Sky {
+
 typedef struct {
 	uint8 ad_Op1, ad_Op2;
 	uint8 sr_Op1, sr_Op2;
@@ -97,5 +99,7 @@
 	void com90_setStartOfData(void);    // 12
 	//void com90_do_two_Lodsb(void);    // 13
 };
+
+} // End of namespace Sky
 
 #endif //ADLIBCHANNEL_H

Index: adlibmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- adlibmusic.cpp	19 Dec 2003 01:08:30 -0000	1.16
+++ adlibmusic.cpp	3 Jan 2004 01:58:58 -0000	1.17
@@ -24,6 +24,8 @@
 #include "sound/mixer.h"
 #include "sky/sky.h"
 
+namespace Sky {
+
 void SkyAdlibMusic::passMixerFunc(void *param, int16 *buf, uint len) {
 
 	((SkyAdlibMusic*)param)->premixerCall(buf, len);
@@ -130,3 +132,5 @@
 	}
 	_allowedCommands = 0xD;
 }
+
+} // End of namespace Sky

Index: adlibmusic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- adlibmusic.h	5 Oct 2003 20:21:20 -0000	1.7
+++ adlibmusic.h	3 Jan 2004 01:58:58 -0000	1.8
@@ -27,6 +27,8 @@
 
 class SoundMixer;
 
+namespace Sky {
+
 class SkyAdlibMusic : public SkyMusicBase {
 public:
 	SkyAdlibMusic(SoundMixer *pMixer, SkyDisk *pSkyDisk, OSystem *system);
@@ -44,5 +46,7 @@
 	void premixerCall(int16 *buf, uint len);
 	static void passMixerFunc(void *param, int16 *buf, uint len);
 };
+
+} // End of namespace Sky
 
 #endif //ADLIBMUSIC_H

Index: gmchannel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmchannel.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gmchannel.cpp	7 Nov 2003 02:22:02 -0000	1.13
+++ gmchannel.cpp	3 Jan 2004 01:58:58 -0000	1.14
@@ -23,6 +23,8 @@
 #include "common/util.h"
 #include "sound/mididrv.h"
 
+namespace Sky {
+
 SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap, uint8 *veloTab) {
 
 	_musicData = pMusicData;
@@ -203,3 +205,5 @@
 	_channelData.eventDataPtr += 2;
 	_midiDrv->send((0xB0 | _channelData.midiChannelNumber) | (conNum << 8) | (conDat << 16));
 }
+
+} // End of namespace Sky

Index: gmchannel.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmchannel.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gmchannel.h	5 Oct 2003 20:21:20 -0000	1.7
+++ gmchannel.h	3 Jan 2004 01:58:58 -0000	1.8
@@ -26,6 +26,8 @@
 
 class MidiDriver;
 
+namespace Sky {
+
 typedef struct {
 	uint16 eventDataPtr;
 	int32 nextEventTime;
@@ -73,5 +75,7 @@
 	void com90_setStartOfData(void);     // 12
 	void com90_getChannelControl(void);     // 13
 };
+
+} // End of namespace Sky
 
 #endif //SKYGMCHANNEL_H

Index: gmmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmmusic.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gmmusic.cpp	8 Nov 2003 20:27:27 -0000	1.15
+++ gmmusic.cpp	3 Jan 2004 01:58:58 -0000	1.16
@@ -25,6 +25,8 @@
 #include "common/util.h"
 #include "sound/mididrv.h"
 
+namespace Sky {
+
 void SkyGmMusic::passTimerFunc(void *param) {
 
 	((SkyGmMusic*)param)->timerCall();
@@ -130,3 +132,4 @@
 	0x7C, 0x7C, 0x7D, 0x7D, 0x7E, 0x7E, 0x7F, 0x7F
 };
 
+} // End of namespace Sky

Index: gmmusic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmmusic.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gmmusic.h	5 Oct 2003 20:21:20 -0000	1.8
+++ gmmusic.h	3 Jan 2004 01:58:58 -0000	1.9
@@ -26,6 +26,8 @@
 
 class MidiDriver;
 
+namespace Sky {
+
 class SkyGmMusic : public SkyMusicBase {
 public:
 	SkyGmMusic(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, OSystem *system);
@@ -45,5 +47,7 @@
 	virtual void setupChannels(uint8 *channelData);
 	virtual void startDriver(void);
 };
+
+} // End of namespace Sky
 
 #endif //GMMUSIC_H

Index: mt32music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/mt32music.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- mt32music.cpp	8 Nov 2003 20:27:27 -0000	1.15
+++ mt32music.cpp	3 Jan 2004 01:58:58 -0000	1.16
@@ -24,6 +24,8 @@
 #include "common/util.h"
 #include "sound/mididrv.h"
 
+namespace Sky {
+
 void SkyMT32Music::passTimerFunc(void *param) {
 
 	((SkyMT32Music*)param)->timerCall();
@@ -164,3 +166,5 @@
 	while (processPatchSysEx(sysExData))
 		sysExData += 5;
 }
+
+} // End of namespace Sky

Index: mt32music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/mt32music.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mt32music.h	5 Oct 2003 20:21:20 -0000	1.6
+++ mt32music.h	3 Jan 2004 01:58:58 -0000	1.7
@@ -26,6 +26,8 @@
 
 class MidiDriver;
 
+namespace Sky {
+
 class SkyMT32Music : public SkyMusicBase {
 public:
 	SkyMT32Music(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, OSystem *system);
@@ -45,5 +47,7 @@
 	virtual void setupChannels(uint8 *channelData);
 	virtual void startDriver(void);
 };
+
+} // End of namespace Sky
 
 #endif //MT32MUSIC_H

Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- musicbase.cpp	8 Nov 2003 20:27:27 -0000	1.16
+++ musicbase.cpp	3 Jan 2004 01:58:58 -0000	1.17
@@ -23,6 +23,8 @@
 #include "sky/disk.h"
 #include "common/util.h"
 
+namespace Sky {
+
 SkyMusicBase::SkyMusicBase(SkyDisk *pSkyDisk, OSystem *system) {
 
 	_musicData = NULL;
@@ -182,3 +184,5 @@
 	_system->unlock_mutex(_mutex);
 	_aktTime &= 0xFFFF;
 }
+
+} // End of namespace Sky

Index: musicbase.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- musicbase.h	5 Oct 2003 20:21:20 -0000	1.11
+++ musicbase.h	3 Jan 2004 01:58:58 -0000	1.12
@@ -26,9 +26,12 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 
-class SkyDisk;
 class OSystem;
 
+namespace Sky {
+
+class SkyDisk;
+
 #define FILES_PER_SECTION 4
 
 typedef struct {
@@ -90,5 +93,7 @@
 	void stopMusic();                                                            // 7
 	void setFMVolume(uint16 param);                                              // 13
 };
+
+} // End of namespace Sky
 
 #endif //MUSICBASE_H