aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sfx/mixer
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sci/sfx/mixer')
-rw-r--r--engines/sci/sfx/mixer/soft.cpp6
-rw-r--r--engines/sci/sfx/mixer/test.cpp4
2 files changed, 9 insertions, 1 deletions
diff --git a/engines/sci/sfx/mixer/soft.cpp b/engines/sci/sfx/mixer/soft.cpp
index 5aa80c11ae..01f132393d 100644
--- a/engines/sci/sfx/mixer/soft.cpp
+++ b/engines/sci/sfx/mixer/soft.cpp
@@ -27,6 +27,8 @@
#include "../mixer.h"
#include "sci/include/sci_memory.h"
+namespace Sci {
+
/* Max. number of microseconds in difference allowed between independent audio streams */
#define TIMESTAMP_MAX_ALLOWED_DELTA 2000
@@ -970,4 +972,6 @@ sfx_pcm_mixer_t sfx_pcm_mixer_soft_linear = {
NULL
};
-sfx_pcm_mixer_t* getMixer() { return &sfx_pcm_mixer_soft_linear; } \ No newline at end of file
+sfx_pcm_mixer_t* getMixer() { return &sfx_pcm_mixer_soft_linear; }
+
+} // End of namespace Sci
diff --git a/engines/sci/sfx/mixer/test.cpp b/engines/sci/sfx/mixer/test.cpp
index fead1d7916..f35a546cfd 100644
--- a/engines/sci/sfx/mixer/test.cpp
+++ b/engines/sci/sfx/mixer/test.cpp
@@ -29,6 +29,8 @@
#include "../mixer.h"
#include <time.h>
+namespace Sci {
+
#if 0
sfx_pcm_mixer_t *mix;
@@ -344,3 +346,5 @@ main(int argc, char **argv) {
#else
int main() {}
#endif
+
+} // End of namespace Sci