diff options
| author | Oystein Eftevaag | 2009-02-21 10:23:36 +0000 |
|---|---|---|
| committer | Oystein Eftevaag | 2009-02-21 10:23:36 +0000 |
| commit | 25f7c371718f74eb26fed5bd66a803f220c89c3b (patch) | |
| tree | e78250ba07d5d28ffecf1621421ab33061edf1e4 /engines/sci/sfx/mixer/soft.cpp | |
| parent | 44ea7966108cf56df4a4eb3fd0b2b7df31d937e1 (diff) | |
| download | scummvm-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/mixer/soft.cpp')
| -rw-r--r-- | engines/sci/sfx/mixer/soft.cpp | 6 |
1 files changed, 5 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 |