Renamed /gui to /graphics and /sfx to /sound, to better illustrate their purpose

svn-id: r47007

engines/sci/console.cpp

@@ -36,15 +36,15 @@
 #include "sci/engine/gc.h"
 #include "sci/engine/kernel_types.h"	// for determine_reg_type
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/songlib.h"	// for SongLibrary
-#include "sci/sfx/iterator/iterator.h"	// for SCI_SONG_ITERATOR_TYPE_SCI0
+#include "sci/sound/iterator/songlib.h"	// for SongLibrary
+#include "sci/sound/iterator/iterator.h"	// for SCI_SONG_ITERATOR_TYPE_SCI0
 #else
-#include "sci/sfx/music.h"
+#include "sci/sound/music.h"
 #endif
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/softseq/mididriver.h"
 #include "sci/vocabulary.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_cursor.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_cursor.h"
 
 #include "graphics/video/avi_decoder.h"
 #include "sci/video/seq_decoder.h"

engines/sci/engine/game.cpp

@@ -34,8 +34,8 @@
 #include "sci/engine/kernel.h"
 #include "sci/engine/kernel_types.h"
 #include "sci/engine/message.h"
-#include "sci/gui/gui.h"
-#include "sci/sfx/music.h"
+#include "sci/graphics/gui.h"
+#include "sci/sound/music.h"
 
 namespace Sci {
 

engines/sci/engine/kernel32.cpp

@@ -28,7 +28,7 @@
 #include "sci/engine/kernel.h"
 #include "sci/engine/segment.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui.h"
+#include "sci/graphics/gui.h"
 
 namespace Sci {
 

engines/sci/engine/kevent.cpp

@@ -29,8 +29,8 @@
 #include "sci/console.h"
 #include "sci/debug.h"	// for g_debug_simulated_key
 #include "sci/event.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_cursor.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_cursor.h"
 
 namespace Sci {
 

engines/sci/engine/kgraphics.cpp

@@ -33,11 +33,11 @@
 #include "sci/video/seq_decoder.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_animate.h"
-#include "sci/gui/gui_cursor.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_view.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_animate.h"
+#include "sci/graphics/gui_cursor.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_view.h"
 
 namespace Sci {
 

engines/sci/engine/kmenu.cpp

@@ -27,8 +27,8 @@
 #include "sci/resource.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_cursor.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_cursor.h"
 
 namespace Sci {
 

engines/sci/engine/kmisc.cpp

@@ -31,7 +31,7 @@
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/gc.h"
-#include "sci/gui/gui.h"
+#include "sci/graphics/gui.h"
 
 namespace Sci {
 

engines/sci/engine/kmovement.cpp

@@ -27,7 +27,7 @@
 #include "sci/resource.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gui/gui_animate.h"
+#include "sci/graphics/gui_animate.h"
 
 namespace Sci {
 

engines/sci/engine/kpathing.cpp

@@ -26,7 +26,7 @@
 #include "sci/sci.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gui/gui.h"
+#include "sci/graphics/gui.h"
 
 #include "common/list.h"
 

engines/sci/engine/ksound.cpp

@@ -25,7 +25,7 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/sfx/soundcmd.h"
+#include "sci/sound/soundcmd.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/vm.h"		// for Object
 

engines/sci/engine/savegame.cpp

@@ -36,13 +36,13 @@
 #include "sci/engine/message.h"
 #include "sci/engine/savegame.h"
 #include "sci/engine/vm_types.h"
-#include "sci/gui/gui.h"
-#include "sci/sfx/audio.h"
+#include "sci/graphics/gui.h"
+#include "sci/sound/audio.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/core.h"
-#include "sci/sfx/iterator/iterator.h"
+#include "sci/sound/iterator/core.h"
+#include "sci/sound/iterator/iterator.h"
 #else
-#include "sci/sfx/music.h"
+#include "sci/sound/music.h"
 #endif
 
 namespace Sci {

engines/sci/engine/state.h

@@ -41,11 +41,11 @@ namespace Common {
 #include "sci/engine/kernel.h"	// for kfunct_sig_pair_t
 #include "sci/engine/script.h"
 #include "sci/engine/seg_manager.h"
-#include "sci/sfx/audio.h"
+#include "sci/sound/audio.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/core.h"
+#include "sci/sound/iterator/core.h"
 #endif
-#include "sci/sfx/soundcmd.h"
+#include "sci/sound/soundcmd.h"
 
 namespace Sci {
 

engines/sci/graphics/gui.cpp

@@ -30,18 +30,18 @@
 #include "sci/debug.h"	// for g_debug_sleeptime_factor
 #include "sci/event.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_cursor.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_windowmgr.h"
-#include "sci/gui/gui_animate.h"
-#include "sci/gui/gui_controls.h"
-#include "sci/gui/gui_menu.h"
-#include "sci/gui/gui_text.h"
-#include "sci/gui/gui_transitions.h"
-#include "sci/gui/gui_view.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_cursor.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_windowmgr.h"
+#include "sci/graphics/gui_animate.h"
+#include "sci/graphics/gui_controls.h"
+#include "sci/graphics/gui_menu.h"
+#include "sci/graphics/gui_text.h"
+#include "sci/graphics/gui_transitions.h"
+#include "sci/graphics/gui_view.h"
 
 namespace Sci {
 

engines/sci/graphics/gui.h

@@ -26,7 +26,7 @@
 #ifndef SCI_GUI_GUI_H
 #define SCI_GUI_GUI_H
 
-#include "sci/gui/gui_helpers.h"
+#include "sci/graphics/gui_helpers.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_animate.cpp

@@ -30,11 +30,11 @@
 #include "sci/sci.h"
 #include "sci/engine/state.h"
 #include "sci/engine/vm.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_view.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_transitions.h"
-#include "sci/gui/gui_animate.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_view.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_transitions.h"
+#include "sci/graphics/gui_animate.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_animate.h

@@ -26,7 +26,7 @@
 #ifndef SCI_GUI_ANIMATE_H
 #define SCI_GUI_ANIMATE_H
 
-#include "sci/gui/gui_helpers.h"
+#include "sci/graphics/gui_helpers.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_controls.cpp

@@ -30,10 +30,10 @@
 #include "sci/sci.h"
 #include "sci/event.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_font.h"
-#include "sci/gui/gui_text.h"
-#include "sci/gui/gui_controls.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_font.h"
+#include "sci/graphics/gui_text.h"
+#include "sci/graphics/gui_controls.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_cursor.cpp

@@ -29,10 +29,10 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_view.h"
-#include "sci/gui/gui_cursor.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_view.h"
+#include "sci/graphics/gui_cursor.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_font.cpp

@@ -25,8 +25,8 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_font.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_font.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_font.h

@@ -26,7 +26,7 @@
 #ifndef SCI_GUI_FONT_H
 #define SCI_GUI_FONT_H
 
-#include "sci/gui/gui_helpers.h"
+#include "sci/graphics/gui_helpers.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_gfx.cpp

@@ -29,14 +29,14 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_animate.h"
-#include "sci/gui/gui_font.h"
-#include "sci/gui/gui_picture.h"
-#include "sci/gui/gui_view.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_text.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_animate.h"
+#include "sci/graphics/gui_font.h"
+#include "sci/graphics/gui_picture.h"
+#include "sci/graphics/gui_view.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_text.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_gfx.h

@@ -26,7 +26,7 @@
 #ifndef SCI_GUI_GFX_H
 #define SCI_GUI_GFX_H
 
-#include "sci/gui/gui.h"
+#include "sci/graphics/gui.h"
 
 #include "common/hashmap.h"
 

engines/sci/graphics/gui_menu.cpp

@@ -30,13 +30,13 @@
 #include "sci/sci.h"
 #include "sci/event.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_helpers.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_cursor.h"
-#include "sci/gui/gui_font.h"
-#include "sci/gui/gui_text.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_menu.h"
+#include "sci/graphics/gui_helpers.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_cursor.h"
+#include "sci/graphics/gui_font.h"
+#include "sci/graphics/gui_text.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_menu.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_palette.cpp

@@ -28,8 +28,8 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_palette.h

@@ -26,7 +26,7 @@
 #ifndef SCI_GUI_PALETTE_H
 #define SCI_GUI_PALETTE_H
 
-#include "sci/gui/gui_helpers.h"
+#include "sci/graphics/gui_helpers.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_picture.cpp

@@ -26,10 +26,10 @@
 #include "common/stack.h"
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_picture.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_picture.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_portrait.cpp

@@ -29,9 +29,9 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_portrait.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_portrait.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_screen.cpp

@@ -29,7 +29,7 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_screen.h"
+#include "sci/graphics/gui_screen.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_screen.h

@@ -27,7 +27,7 @@
 #define SCI_GUI_SCREEN_H
 
 #include "sci/sci.h"
-#include "sci/gui/gui_helpers.h"
+#include "sci/graphics/gui_helpers.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_text.cpp

@@ -29,9 +29,9 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_font.h"
-#include "sci/gui/gui_text.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_font.h"
+#include "sci/graphics/gui_text.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_transitions.cpp

@@ -30,10 +30,10 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_transitions.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_transitions.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_transitions.h

@@ -26,7 +26,7 @@
 #ifndef SCI_GUI_TRANSITIONS_H
 #define SCI_GUI_TRANSITIONS_H
 
-#include "sci/gui/gui_helpers.h"
+#include "sci/graphics/gui_helpers.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_view.cpp

@@ -25,10 +25,10 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_view.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_view.h"
 
 namespace Sci {
 

engines/sci/graphics/gui_windowmgr.cpp

@@ -27,11 +27,11 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_animate.h"
-#include "sci/gui/gui_text.h"
-#include "sci/gui/gui_windowmgr.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_animate.h"
+#include "sci/graphics/gui_text.h"
+#include "sci/graphics/gui_windowmgr.h"
 
 namespace Sci {
 

engines/sci/module.mk

@@ -35,34 +35,34 @@ MODULE_OBJS := \
 	engine/static_selectors.o \
 	engine/state.o \
 	engine/vm.o \
-	gui/gui.o \
-	gui/gui_animate.o \
-	gui/gui_controls.o \
-	gui/gui_cursor.o \
-	gui/gui_font.o \
-	gui/gui_gfx.o \
-	gui/gui_menu.o \
-	gui/gui_palette.o \
-	gui/gui_picture.o \
-	gui/gui_portrait.o \
-	gui/gui_screen.o \
-	gui/gui_text.o \
-	gui/gui_transitions.o \
-	gui/gui_view.o \
-	gui/gui_windowmgr.o \
-	sfx/audio.o \
-	sfx/midiparser.o \
-	sfx/music.o \
-	sfx/soundcmd.o \
-	sfx/iterator/core.o \
-	sfx/iterator/iterator.o \
-	sfx/iterator/songlib.o \
-	sfx/seq/gm.o \
-	sfx/seq/instrument-map.o \
-	sfx/seq/map-mt32-to-gm.o \
-	sfx/softseq/adlib.o \
-	sfx/softseq/amiga.o \
-	sfx/softseq/pcjr.o \
+	graphics/gui.o \
+	graphics/gui_animate.o \
+	graphics/gui_controls.o \
+	graphics/gui_cursor.o \
+	graphics/gui_font.o \
+	graphics/gui_gfx.o \
+	graphics/gui_menu.o \
+	graphics/gui_palette.o \
+	graphics/gui_picture.o \
+	graphics/gui_portrait.o \
+	graphics/gui_screen.o \
+	graphics/gui_text.o \
+	graphics/gui_transitions.o \
+	graphics/gui_view.o \
+	graphics/gui_windowmgr.o \
+	sound/audio.o \
+	sound/midiparser.o \
+	sound/music.o \
+	sound/soundcmd.o \
+	sound/iterator/core.o \
+	sound/iterator/iterator.o \
+	sound/iterator/songlib.o \
+	sound/seq/gm.o \
+	sound/seq/instrument-map.o \
+	sound/seq/map-mt32-to-gm.o \
+	sound/softseq/adlib.o \
+	sound/softseq/amiga.o \
+	sound/softseq/pcjr.o \
 	video/seq_decoder.o \
 	video/vmd_decoder.o
 	

engines/sci/resource.h

@@ -34,7 +34,7 @@
 #include "sound/audiostream.h"
 #include "sound/mixer.h"			// for SoundHandle
 
-#include "gui/gui_helpers.h"		// for ViewType
+#include "graphics/gui_helpers.h"		// for ViewType
 
 #include "sci/decompressor.h"
 #include "sci/sci.h"

engines/sci/sci.cpp

@@ -36,12 +36,12 @@
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
 
-#include "sci/sfx/audio.h"
-#include "sci/sfx/soundcmd.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_cursor.h"
-#include "sci/gui/gui_screen.h"
+#include "sci/sound/audio.h"
+#include "sci/sound/soundcmd.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_cursor.h"
+#include "sci/graphics/gui_screen.h"
 
 namespace Sci {
 

engines/sci/sound/audio.cpp

@@ -26,7 +26,7 @@
 #include "sci/resource.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/seg_manager.h"
-#include "sci/sfx/audio.h"
+#include "sci/sound/audio.h"
 
 #include "common/system.h"
 

engines/sci/sound/iterator/core.cpp

@@ -28,11 +28,11 @@
 #include "sci/sci.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
 
-#include "sci/sfx/iterator/core.h"
-#include "sci/sfx/iterator/iterator.h"
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/iterator/core.h"
+#include "sci/sound/iterator/iterator.h"
+#include "sci/sound/softseq/mididriver.h"
 
-#include "sci/sfx/softseq/pcjr.h"
+#include "sci/sound/softseq/pcjr.h"
 
 #include "common/system.h"
 #include "common/timer.h"

engines/sci/sound/iterator/core.h

@@ -32,7 +32,7 @@
 #include "sci/sci.h"	// for USE_OLD_MUSIC_FUNCTIONS
 
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/songlib.h"
+#include "sci/sound/iterator/songlib.h"
 #include "sci/resource.h"
 
 namespace Sci {

engines/sci/sound/iterator/iterator.cpp

@@ -30,9 +30,9 @@
 #include "sci/sci.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
 
-#include "sci/sfx/iterator/iterator_internal.h"
+#include "sci/sound/iterator/iterator_internal.h"
 #include "sci/engine/state.h"	// for sfx_player_tell_synth :/
-#include "sci/sfx/iterator/core.h"	// for sfx_player_tell_synth
+#include "sci/sound/iterator/core.h"	// for sfx_player_tell_synth
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"

engines/sci/sound/iterator/iterator.h

@@ -31,7 +31,7 @@
 #include "sci/sci.h"	// for USE_OLD_MUSIC_FUNCTIONS
 
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/softseq/mididriver.h"
 
 namespace Audio {
 	class AudioStream;

engines/sci/sound/iterator/iterator_internal.h

@@ -29,8 +29,8 @@
 #include "sci/sci.h"	// for USE_OLD_MUSIC_FUNCTIONS
 
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/iterator.h"
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/iterator/iterator.h"
+#include "sci/sound/softseq/mididriver.h"
 
 #include "common/array.h"
 #include "common/list.h"

engines/sci/sound/iterator/songlib.cpp

@@ -26,8 +26,8 @@
 #include "sci/sci.h"	// for USE_OLD_MUSIC_FUNCTIONS
 
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/core.h"
-#include "sci/sfx/iterator/iterator.h"
+#include "sci/sound/iterator/core.h"
+#include "sci/sound/iterator/iterator.h"
 
 namespace Sci {
 

engines/sci/sound/midiparser_sci.cpp

@@ -25,8 +25,8 @@
 
 #include "sci/engine/kernel.h"
 #include "sci/engine/state.h"
-#include "sci/sfx/midiparser.h"
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/midiparser_sci.h"
+#include "sci/sound/softseq/mididriver.h"
 
 namespace Sci {
 
@@ -142,7 +142,7 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
 		if (info.channel() == 0xF) {// SCI special
 			// Reference for some events:
 			// http://wiki.scummvm.org/index.php/SCI/Specifications/Sound/SCI0_Resource_Format#Status_Reference
-			// Also, sci/sfx/iterator/iterator.cpp, function BaseSongIterator::parseMidiCommand()
+			// Also, sci/sound/iterator/iterator.cpp, function BaseSongIterator::parseMidiCommand()
 			switch (info.basic.param1) {
 			case kSetReverb:
 				// TODO: Not implemented yet

engines/sci/sound/midiparser_sci.h

@@ -27,7 +27,7 @@
 #define SCI_MIDIPARSER_H
 
 #include "sci/resource.h"
-#include "sci/sfx/music.h"
+#include "sci/sound/music.h"
 #include "sound/midiparser.h"
 
 /*

engines/sci/sound/music.cpp

@@ -31,9 +31,9 @@
 #include "sci/resource.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/state.h"
-#include "sci/sfx/midiparser.h"
-#include "sci/sfx/music.h"
-#include "sci/sfx/softseq/pcjr.h"
+#include "sci/sound/midiparser_sci.h"
+#include "sci/sound/music.h"
+#include "sci/sound/softseq/pcjr.h"
 
 namespace Sci {
 

engines/sci/sound/music.h

@@ -37,7 +37,7 @@
 
 #include "sci/sci.h"
 #include "sci/resource.h"
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/softseq/mididriver.h"
 
 namespace Sci {
 

engines/sci/sound/seq/gm.cpp

@@ -25,8 +25,8 @@
 
 #include "common/util.h"
 
-#include "sci/sfx/seq/midiwriter.h"
-#include "sci/sfx/seq/instrument-map.h"
+#include "sci/sound/seq/midiwriter.h"
+#include "sci/sound/seq/instrument-map.h"
 
 namespace Sci {
 

engines/sci/sound/seq/instrument-map.cpp

@@ -24,8 +24,8 @@
  */
 
 #include "common/scummsys.h"
-#include "sci/sfx/softseq/mididriver.h"
-#include "sci/sfx/seq/instrument-map.h"
+#include "sci/sound/softseq/mididriver.h"
+#include "sci/sound/seq/instrument-map.h"
 
 namespace Sci {
 

engines/sci/sound/seq/instrument-map.h

@@ -28,7 +28,7 @@
 #ifndef SCI_SFX_SEQ_INSTRUMENT_MAP_H
 #define SCI_SFX_SEQ_INSTRUMENT_MAP_H
 
-#include "sci/sfx/seq/midiwriter.h"
+#include "sci/sound/seq/midiwriter.h"
 
 namespace Sci {
 

engines/sci/sound/seq/map-mt32-to-gm.cpp

@@ -26,7 +26,7 @@
 #include "common/scummsys.h"
 #include "sci/resource.h"
 #include "sci/engine/state.h"
-#include "sci/sfx/seq/instrument-map.h"
+#include "sci/sound/seq/instrument-map.h"
 
 namespace Sci {
 

engines/sci/sound/softseq/adlib.cpp

@@ -29,7 +29,7 @@
 #include "sound/softsynth/emumidi.h"
 
 #include "sci/resource.h"
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/softseq/mididriver.h"
 
 namespace Sci {
 

engines/sci/sound/softseq/amiga.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "sound/softsynth/emumidi.h"
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/softseq/mididriver.h"
 
 #include "common/file.h"
 #include "common/frac.h"

engines/sci/sound/softseq/pcjr.cpp

@@ -23,8 +23,8 @@
  *
  */
 
-#include "sci/sfx/softseq/mididriver.h"
-#include "sci/sfx/softseq/pcjr.h"
+#include "sci/sound/softseq/mididriver.h"
+#include "sci/sound/softseq/pcjr.h"
 
 namespace Sci {
 

engines/sci/sound/softseq/pcjr.h

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/softseq/mididriver.h"
 
 namespace Sci {
 

engines/sci/sound/soundcmd.cpp

@@ -26,11 +26,11 @@
 #include "sci/sci.h"	// for USE_OLD_MUSIC_FUNCTIONS
 
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/iterator.h"	// for SongIteratorStatus
+#include "sci/sound/iterator/iterator.h"	// for SongIteratorStatus
 #endif
 
-#include "sci/sfx/music.h"
-#include "sci/sfx/soundcmd.h"
+#include "sci/sound/music.h"
+#include "sci/sound/soundcmd.h"
 
 namespace Sci {