EMI: Move emisound into the emi-subfolder

engines/grim/emi/sound/codecs/scx.cpp

@@ -25,7 +25,7 @@
 #include "common/memstream.h"
 #include "common/textconsole.h"
 #include "common/stream.h"
-#include "grim/scx.h"
+#include "engines/grim/emi/sound/codecs/scx.h"
 
 namespace Grim {
 

engines/grim/emi/sound/emisound.cpp

@@ -29,11 +29,11 @@
 #include "engines/grim/grim.h"
 #include "engines/grim/resource.h"
 #include "engines/grim/textsplit.h"
-#include "engines/grim/emisound/emisound.h"
-#include "engines/grim/emisound/track.h"
-#include "engines/grim/emisound/mp3track.h"
-#include "engines/grim/emisound/scxtrack.h"
-#include "engines/grim/emisound/vimatrack.h"
+#include "engines/grim/emi/sound/emisound.h"
+#include "engines/grim/emi/sound/track.h"
+#include "engines/grim/emi/sound/mp3track.h"
+#include "engines/grim/emi/sound/scxtrack.h"
+#include "engines/grim/emi/sound/vimatrack.h"
 
 #define NUM_CHANNELS 32
 

engines/grim/emi/sound/mp3track.cpp

@@ -26,7 +26,7 @@
 #include "audio/audiostream.h"
 #include "audio/decoders/mp3.h"
 #include "engines/grim/resource.h"
-#include "engines/grim/emisound/mp3track.h"
+#include "engines/grim/emi/sound/mp3track.h"
 
 namespace Grim {
 

engines/grim/emi/sound/mp3track.h

@@ -25,7 +25,7 @@
 
 #include "common/str.h"
 #include "common/stream.h"
-#include "engines/grim/emisound/track.h"
+#include "engines/grim/emi/sound/track.h"
 
 namespace Audio {
 	class AudioStream;

engines/grim/emi/sound/scxtrack.cpp

@@ -25,8 +25,8 @@
 #include "audio/mixer.h"
 #include "audio/audiostream.h"
 #include "engines/grim/resource.h"
-#include "engines/grim/scx.h"
-#include "engines/grim/emisound/scxtrack.h"
+#include "engines/grim/emi/sound/codecs/scx.h"
+#include "engines/grim/emi/sound/scxtrack.h"
 
 namespace Grim {
 

engines/grim/emi/sound/scxtrack.h

@@ -25,7 +25,7 @@
 
 #include "common/str.h"
 #include "common/stream.h"
-#include "engines/grim/emisound/track.h"
+#include "engines/grim/emi/sound/track.h"
 
 namespace Audio {
 	class AudioStream;

engines/grim/emi/sound/track.cpp

@@ -24,7 +24,7 @@
 #include "common/str.h"
 #include "common/stream.h"
 #include "audio/mixer.h"
-#include "engines/grim/emisound/track.h"
+#include "engines/grim/emi/sound/track.h"
 
 namespace Grim {
 

engines/grim/emi/sound/vimatrack.cpp

@@ -26,7 +26,7 @@
 #include "audio/mixer.h"
 #include "audio/decoders/raw.h"
 #include "engines/grim/imuse/imuse_mcmp_mgr.h"
-#include "engines/grim/emisound/vimatrack.h"
+#include "engines/grim/emi/sound/vimatrack.h"
 
 namespace Grim {
 

engines/grim/emi/sound/vimatrack.h

@@ -24,7 +24,7 @@
 #define GRIM_VIMATRACK_H
 
 #include "common/str.h"
-#include "engines/grim/emisound/track.h"
+#include "engines/grim/emi/sound/track.h"
 
 namespace Grim {
 	

engines/grim/module.mk

@@ -16,6 +16,12 @@ MODULE_OBJS := \
 	costume/model_component.o \
 	costume/sound_component.o \
 	costume/sprite_component.o \
+	emi/sound/mp3track.o \
+	emi/sound/scxtrack.o \
+	emi/sound/vimatrack.o \
+	emi/sound/track.o \
+	emi/sound/emisound.o \
+	emi/sound/codecs/scx.o \
 	emi/modelemi.o \
 	emi/skeleton.o \
 	imuse/imuse.o \
@@ -57,11 +63,6 @@ MODULE_OBJS := \
 	movie/mpeg.o \
 	movie/smush.o \
 	movie/movie.o \
-	emisound/mp3track.o \
-	emisound/scxtrack.o \
-	emisound/vimatrack.o \
-	emisound/track.o \
-	emisound/emisound.o \
 	update/packfile.o \
 	update/mscab.o \
 	update/lang_filter.o \
@@ -102,7 +103,6 @@ MODULE_OBJS := \
 	resource.o \
 	savegame.o \
 	set.o \
-	scx.o \
 	sector.o \
 	sound.o \
 	stuffit.o \

engines/grim/sound.cpp

@@ -22,7 +22,7 @@
 
 #include "engines/grim/grim.h"
 #include "engines/grim/imuse/imuse.h"
-#include "engines/grim/emisound/emisound.h"
+#include "engines/grim/emi/sound/emisound.h"
 #include "engines/grim/sound.h"
 
 namespace Grim {