aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush/smush_mixer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/smush/smush_mixer.cpp')
-rw-r--r--scumm/smush/smush_mixer.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp
index a20b5e68a3..ad14292f39 100644
--- a/scumm/smush/smush_mixer.cpp
+++ b/scumm/smush/smush_mixer.cpp
@@ -21,13 +21,18 @@
#include "stdafx.h"
#include "common/util.h"
-#include "smush_mixer.h"
-#include "channel.h"
-#include "sound/mixer.h"
+
+#include "scumm/smush/smush_mixer.h"
+#include "scumm/smush/channel.h"
#include "scumm/scumm.h"
#include "scumm/sound.h"
#include "scumm/imuse.h"
+#include "sound/mixer.h"
+
+
+namespace Scumm {
+
SmushMixer::SmushMixer(SoundMixer *m) :
_mixer(m),
_nextIndex(0),
@@ -158,3 +163,5 @@ bool SmushMixer::stop() {
}
return true;
}
+
+} // End of namespace Scumm