Wrapped the SCI engine in the Sci namespace.

svn-id: r38676

6 files changed, 21 insertions, 0 deletions

diff --git a/engines/sci/sfx/seq/gm.cpp b/engines/sci/sfx/seq/gm.cpp
index 9ad94a54cc..13520b2eec 100644
--- a/engines/sci/sfx/seq/gm.cpp
+++ b/engines/sci/sfx/seq/gm.cpp
@@ -35,6 +35,8 @@
 #include "instrument-map.h"
 #include <resource.h>
 
+namespace Sci {
+
 static midi_writer_t *writer = NULL;
 
 static int
@@ -175,3 +177,5 @@ sfx_sequencer_t sfx_sequencer_gm = {
 	64,	/* max polyphony */
 	0	/* no write-ahead needed inherently */
 };
+
+} // End of namespace Sci
diff --git a/engines/sci/sfx/seq/instrument-map.cpp b/engines/sci/sfx/seq/instrument-map.cpp
index 2382d89003..8f9ee56371 100644
--- a/engines/sci/sfx/seq/instrument-map.cpp
+++ b/engines/sci/sfx/seq/instrument-map.cpp
@@ -29,6 +29,8 @@
 #include "instrument-map.h"
 #include "sfx_engine.h"
 
+namespace Sci {
+
 sfx_instrument_map_t *
 sfx_instrument_map_new(int velocity_maps_nr) {
 	sfx_instrument_map_t *map = (sfx_instrument_map_t *)sci_malloc(sizeof(sfx_instrument_map_t));
@@ -522,3 +524,4 @@ sfx_mapped_writer(midi_writer_t *writer, sfx_instrument_map_t *map) {
 	return (midi_writer_t *) retval;
 }
 
+} // End of namespace Sci
diff --git a/engines/sci/sfx/seq/instrument-map.h b/engines/sci/sfx/seq/instrument-map.h
index 45dc64262c..a18bdaff79 100644
--- a/engines/sci/sfx/seq/instrument-map.h
+++ b/engines/sci/sfx/seq/instrument-map.h
@@ -32,6 +32,8 @@
 #include "resource.h"
 #include "../device.h"
 
+namespace Sci {
+
 #define SFX_INSTRUMENTS_NR	0x80
 #define SFX_RHYTHM_NR		0x80
 #define SFX_VELOCITIES_NR	0x80
@@ -126,5 +128,6 @@ sfx_mapped_writer(midi_writer_t *writer, sfx_instrument_map_t *map);
 ** deallocates the instrument map when the writer is closed.
 */
 
+} // End of namespace Sci
 
 #endif /* !defined(SCI_INSTRUMENT_MAP_) */
diff --git a/engines/sci/sfx/seq/map-mt32-to-gm.cpp b/engines/sci/sfx/seq/map-mt32-to-gm.cpp
index 4f21f24f7a..bc472935d4 100644
--- a/engines/sci/sfx/seq/map-mt32-to-gm.cpp
+++ b/engines/sci/sfx/seq/map-mt32-to-gm.cpp
@@ -28,6 +28,8 @@
 #include <stdarg.h>
 #include "instrument-map.h"
 
+namespace Sci {
+
 #define DEBUG_MT32_TO_GM
 
 static const char
@@ -797,3 +799,4 @@ sfx_instrument_map_mt32_to_gm(byte *data, size_t size) {
 	return map;
 }
 
+} // End of namespace Sci
diff --git a/engines/sci/sfx/seq/oss-adlib.cpp b/engines/sci/sfx/seq/oss-adlib.cpp
index 361b0ad43c..be12033efb 100644
--- a/engines/sci/sfx/seq/oss-adlib.cpp
+++ b/engines/sci/sfx/seq/oss-adlib.cpp
@@ -38,6 +38,8 @@
 #include <sys/soundcard.h>
 #include <sfx_iterator.h> /* for some MIDI information */
 
+namespace Sci {
+
 #if 1
 SEQ_DEFINEBUF(2048);
 static int seqfd;
@@ -363,4 +365,6 @@ sfx_sequencer_t sfx_sequencer_oss_adlib = {
 	0 /* Does not require any write-ahead by its own */
 };
 
+} // End of namespace Sci
+
 #endif /* HAVE_SYS_SOUNDCARD_H */
diff --git a/engines/sci/sfx/seq/sequencers.cpp b/engines/sci/sfx/seq/sequencers.cpp
index 2f4751b963..561f4c4cf7 100644
--- a/engines/sci/sfx/seq/sequencers.cpp
+++ b/engines/sci/sfx/seq/sequencers.cpp
@@ -26,6 +26,8 @@
 #include "../sequencer.h"
 #include "sci/include/resource.h"
 
+namespace Sci {
+
 sfx_sequencer_t *sfx_sequencers[] = {
 	NULL
 };
@@ -48,3 +50,5 @@ sfx_find_sequencer(char *name) {
 		return sfx_sequencers[n];
 	}
 }
+
+} // End of namespace Sci