Introduce namespace 'Sky'

svn-id: r12099

12 files changed, 49 insertions, 1 deletions

diff --git a/sky/music/adlibchannel.cpp b/sky/music/adlibchannel.cpp
index 231a434230..0d3802a23d 100644
--- a/sky/music/adlibchannel.cpp
+++ b/sky/music/adlibchannel.cpp
@@ -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 @@ void SkyAdlibChannel::com90_setStartOfData(void) {
 
 	_channelData.startOfData = _channelData.eventDataPtr;
 }
+
+} // End of namespace Sky
diff --git a/sky/music/adlibchannel.h b/sky/music/adlibchannel.h
index e7f9d27e13..ab942992fb 100644
--- a/sky/music/adlibchannel.h
+++ b/sky/music/adlibchannel.h
@@ -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;
@@ -98,4 +100,6 @@ private:
 	//void com90_do_two_Lodsb(void);    // 13
 };
 
+} // End of namespace Sky
+
 #endif //ADLIBCHANNEL_H
diff --git a/sky/music/adlibmusic.cpp b/sky/music/adlibmusic.cpp
index 1ce6c3aedf..cc4e6cf9ee 100644
--- a/sky/music/adlibmusic.cpp
+++ b/sky/music/adlibmusic.cpp
@@ -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 @@ void SkyAdlibMusic::startDriver(void) {
 	}
 	_allowedCommands = 0xD;
 }
+
+} // End of namespace Sky
diff --git a/sky/music/adlibmusic.h b/sky/music/adlibmusic.h
index 09782f5512..37c362dac0 100644
--- a/sky/music/adlibmusic.h
+++ b/sky/music/adlibmusic.h
@@ -27,6 +27,8 @@
 
 class SoundMixer;
 
+namespace Sky {
+
 class SkyAdlibMusic : public SkyMusicBase {
 public:
 	SkyAdlibMusic(SoundMixer *pMixer, SkyDisk *pSkyDisk, OSystem *system);
@@ -45,4 +47,6 @@ private:
 	static void passMixerFunc(void *param, int16 *buf, uint len);
 };
 
+} // End of namespace Sky
+
 #endif //ADLIBMUSIC_H
diff --git a/sky/music/gmchannel.cpp b/sky/music/gmchannel.cpp
index 950e4404c1..2ffcf67ea5 100644
--- a/sky/music/gmchannel.cpp
+++ b/sky/music/gmchannel.cpp
@@ -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 @@ void SkyGmChannel::com90_getChannelControl(void) {
 	_channelData.eventDataPtr += 2;
 	_midiDrv->send((0xB0 | _channelData.midiChannelNumber) | (conNum << 8) | (conDat << 16));
 }
+
+} // End of namespace Sky
diff --git a/sky/music/gmchannel.h b/sky/music/gmchannel.h
index 7214168586..17c5a0f261 100644
--- a/sky/music/gmchannel.h
+++ b/sky/music/gmchannel.h
@@ -26,6 +26,8 @@
 
 class MidiDriver;
 
+namespace Sky {
+
 typedef struct {
 	uint16 eventDataPtr;
 	int32 nextEventTime;
@@ -74,4 +76,6 @@ private:
 	void com90_getChannelControl(void);     // 13
 };
 
+} // End of namespace Sky
+
 #endif //SKYGMCHANNEL_H
diff --git a/sky/music/gmmusic.cpp b/sky/music/gmmusic.cpp
index b19486f7d1..c4278c9c46 100644
--- a/sky/music/gmmusic.cpp
+++ b/sky/music/gmmusic.cpp
@@ -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 @@ uint8 SkyGmMusic::_veloTab[128] = {
 	0x7C, 0x7C, 0x7D, 0x7D, 0x7E, 0x7E, 0x7F, 0x7F
 };
 
+} // End of namespace Sky
diff --git a/sky/music/gmmusic.h b/sky/music/gmmusic.h
index 85bb43d033..ab836ed98f 100644
--- a/sky/music/gmmusic.h
+++ b/sky/music/gmmusic.h
@@ -26,6 +26,8 @@
 
 class MidiDriver;
 
+namespace Sky {
+
 class SkyGmMusic : public SkyMusicBase {
 public:
 	SkyGmMusic(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, OSystem *system);
@@ -46,4 +48,6 @@ private:
 	virtual void startDriver(void);
 };
 
+} // End of namespace Sky
+
 #endif //GMMUSIC_H
diff --git a/sky/music/mt32music.cpp b/sky/music/mt32music.cpp
index 81937d77cb..c65615f372 100644
--- a/sky/music/mt32music.cpp
+++ b/sky/music/mt32music.cpp
@@ -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 @@ void SkyMT32Music::startDriver(void) {
 	while (processPatchSysEx(sysExData))
 		sysExData += 5;
 }
+
+} // End of namespace Sky
diff --git a/sky/music/mt32music.h b/sky/music/mt32music.h
index 78cc439ac9..928651b4ea 100644
--- a/sky/music/mt32music.h
+++ b/sky/music/mt32music.h
@@ -26,6 +26,8 @@
 
 class MidiDriver;
 
+namespace Sky {
+
 class SkyMT32Music : public SkyMusicBase {
 public:
 	SkyMT32Music(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, OSystem *system);
@@ -46,4 +48,6 @@ private:
 	virtual void startDriver(void);
 };
 
+} // End of namespace Sky
+
 #endif //MT32MUSIC_H
diff --git a/sky/music/musicbase.cpp b/sky/music/musicbase.cpp
index 640aa64bc4..1843be84d3 100644
--- a/sky/music/musicbase.cpp
+++ b/sky/music/musicbase.cpp
@@ -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 @@ void SkyMusicBase::pollMusic(void) {
 	_system->unlock_mutex(_mutex);
 	_aktTime &= 0xFFFF;
 }
+
+} // End of namespace Sky
diff --git a/sky/music/musicbase.h b/sky/music/musicbase.h
index d5d17986c8..43e993cef2 100644
--- a/sky/music/musicbase.h
+++ b/sky/music/musicbase.h
@@ -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 {
@@ -91,4 +94,6 @@ protected:
 	void setFMVolume(uint16 param);                                              // 13
 };
 
+} // End of namespace Sky
+
 #endif //MUSICBASE_H