aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sfx/softseq
diff options
context:
space:
mode:
authorOystein Eftevaag2009-02-21 10:23:36 +0000
committerOystein Eftevaag2009-02-21 10:23:36 +0000
commit25f7c371718f74eb26fed5bd66a803f220c89c3b (patch)
treee78250ba07d5d28ffecf1621421ab33061edf1e4 /engines/sci/sfx/softseq
parent44ea7966108cf56df4a4eb3fd0b2b7df31d937e1 (diff)
downloadscummvm-rg350-25f7c371718f74eb26fed5bd66a803f220c89c3b.tar.gz
scummvm-rg350-25f7c371718f74eb26fed5bd66a803f220c89c3b.tar.bz2
scummvm-rg350-25f7c371718f74eb26fed5bd66a803f220c89c3b.zip
Wrapped the SCI engine in the Sci namespace.
svn-id: r38676
Diffstat (limited to 'engines/sci/sfx/softseq')
-rw-r--r--engines/sci/sfx/softseq/SN76496.cpp4
-rw-r--r--engines/sci/sfx/softseq/amiga.cpp4
-rw-r--r--engines/sci/sfx/softseq/fluidsynth.cpp4
-rw-r--r--engines/sci/sfx/softseq/opl2.cpp4
-rw-r--r--engines/sci/sfx/softseq/pcspeaker.cpp4
-rw-r--r--engines/sci/sfx/softseq/softsequencers.cpp4
6 files changed, 24 insertions, 0 deletions
diff --git a/engines/sci/sfx/softseq/SN76496.cpp b/engines/sci/sfx/softseq/SN76496.cpp
index 8ec8eb89e4..b341fcaa64 100644
--- a/engines/sci/sfx/softseq/SN76496.cpp
+++ b/engines/sci/sfx/softseq/SN76496.cpp
@@ -28,6 +28,8 @@
#include "sci/sfx/softseq.h"
#include "sci/include/sci_midi.h"
+namespace Sci {
+
#define FREQUENCY 44100
#define CHANNELS_NR 3
#define VOLUME_SHIFT 3
@@ -235,3 +237,5 @@ sfx_softseq_t sfx_softseq_SN76496 = {
3, /* # of voices */
{FREQUENCY, SFX_PCM_MONO, SFX_PCM_FORMAT_S16_NATIVE}
};
+
+} // End of namespace Sci
diff --git a/engines/sci/sfx/softseq/amiga.cpp b/engines/sci/sfx/softseq/amiga.cpp
index c45807583c..815d84f17f 100644
--- a/engines/sci/sfx/softseq/amiga.cpp
+++ b/engines/sci/sfx/softseq/amiga.cpp
@@ -29,6 +29,8 @@
#include "common/frac.h"
+namespace Sci {
+
#define FREQUENCY 44100
#define CHANNELS_NR 10
#define HW_CHANNELS_NR 16
@@ -635,3 +637,5 @@ sfx_softseq_t sfx_softseq_amiga = {
HW_CHANNELS_NR, /* # of voices */
{FREQUENCY, SFX_PCM_STEREO_LR, SFX_PCM_FORMAT_S16_NATIVE}
};
+
+} // End of namespace Sci
diff --git a/engines/sci/sfx/softseq/fluidsynth.cpp b/engines/sci/sfx/softseq/fluidsynth.cpp
index c3ef336f80..05e99c5738 100644
--- a/engines/sci/sfx/softseq/fluidsynth.cpp
+++ b/engines/sci/sfx/softseq/fluidsynth.cpp
@@ -36,6 +36,8 @@
#include "../device.h"
#include "resource.h"
+namespace Sci {
+
static sfx_sequencer_t *gmseq;
static fluid_settings_t* settings;
static fluid_synth_t* synth;
@@ -243,4 +245,6 @@ sfx_softseq_t sfx_softseq_fluidsynth = {
{SAMPLE_RATE, CHANNELS, SFX_PCM_FORMAT_S16_NATIVE}
};
+} // End of namespace Sci
+
#endif /* HAVE_FLUIDSYNTH_H */
diff --git a/engines/sci/sfx/softseq/opl2.cpp b/engines/sci/sfx/softseq/opl2.cpp
index d84a114158..29f600a634 100644
--- a/engines/sci/sfx/softseq/opl2.cpp
+++ b/engines/sci/sfx/softseq/opl2.cpp
@@ -50,6 +50,8 @@
#include "sound/fmopl.h"
+namespace Sci {
+
#ifdef __DC__
#define SAMPLE_RATE 22050
#define CHANNELS SFX_PCM_MONO
@@ -699,3 +701,5 @@ sfx_softseq_t sfx_softseq_opl2 = {
ADLIB_VOICES, /* # of voices */
{SAMPLE_RATE, CHANNELS, SFX_PCM_FORMAT_S16_NATIVE}
};
+
+} // End of namespace Sci
diff --git a/engines/sci/sfx/softseq/pcspeaker.cpp b/engines/sci/sfx/softseq/pcspeaker.cpp
index f0685914f1..c03724524d 100644
--- a/engines/sci/sfx/softseq/pcspeaker.cpp
+++ b/engines/sci/sfx/softseq/pcspeaker.cpp
@@ -28,6 +28,8 @@
#include "sci/sfx/softseq.h"
#include "sci/include/sci_midi.h"
+namespace Sci {
+
#define FREQUENCY 94020
static int volume = 0x0600;
@@ -172,3 +174,5 @@ sfx_softseq_t sfx_softseq_pcspeaker = {
1, /* # of voices */
{FREQUENCY, SFX_PCM_MONO, SFX_PCM_FORMAT_S16_NATIVE}
};
+
+} // End of namespace Sci
diff --git a/engines/sci/sfx/softseq/softsequencers.cpp b/engines/sci/sfx/softseq/softsequencers.cpp
index e10ef6edd2..e43e9b8cda 100644
--- a/engines/sci/sfx/softseq/softsequencers.cpp
+++ b/engines/sci/sfx/softseq/softsequencers.cpp
@@ -29,6 +29,8 @@
#include "../softseq.h"
+namespace Sci {
+
extern sfx_softseq_t sfx_softseq_opl2;
extern sfx_softseq_t sfx_softseq_SN76496;
extern sfx_softseq_t sfx_softseq_pcspeaker;
@@ -64,3 +66,5 @@ sfx_find_softseq(const char *name) {
return NULL; /* Not found */
}
}
+
+} // End of namespace Sci