SCI: Renamed some sfx header files

svn-id: r39006

engines/sci/engine/state.h

@@ -41,7 +41,7 @@ namespace Common {
 #include "sci/scicore/versions.h"
 #include "sci/engine/seg_manager.h"
 #include "sci/gfx/gfx_state_internal.h"
-#include "sci/sfx/sfx_engine.h"
+#include "sci/sfx/core.h"
 
 namespace Sci {
 

engines/sci/engine/vm.cpp

@@ -34,7 +34,7 @@
 #include "sci/engine/kernel_types.h"
 #include "sci/engine/seg_manager.h"
 #include "sci/engine/gc.h"
-#include "sci/sfx/sfx_player.h"
+#include "sci/sfx/player.h"
 
 namespace Sci {
 

engines/sci/sfx/core.cpp

@@ -26,8 +26,8 @@
 /* Sound subsystem core: Event handler, sound player dispatching */
 
 #include "sci/tools.h"
-#include "sci/sfx/sfx_iterator_internal.h"
-#include "sci/sfx/sfx_player.h"
+#include "sci/sfx/iterator_internal.h"
+#include "sci/sfx/player.h"
 #include "sci/sfx/mixer.h"
 #include "sci/sfx/sci_midi.h"
 

engines/sci/sfx/core.h

@@ -27,13 +27,16 @@
 #ifndef SCI_SFX_SFX_ENGINE_H
 #define SCI_SFX_SFX_ENGINE_H
 
-#include "sci/sfx/sfx_core.h"
-#include "sci/sfx/sfx_songlib.h"
-#include "sci/sfx/sfx_iterator.h"
+#include "sci/sfx/sfx.h"
+#include "sci/sfx/songlib.h"
+//#include "sci/sfx/iterator.h"
 #include "sci/scicore/resource.h"
 
 namespace Sci {
 
+struct song_iterator_t;
+
+
 #define SOUND_TICK 1000 / 60
 /* Approximately 17 milliseconds */
 

engines/sci/sfx/iterator.cpp

@@ -26,8 +26,8 @@
 /* Song iterators */
 
 #include "common/util.h"
-#include "sci/sfx/sfx_iterator_internal.h"
-#include "sci/sfx/sfx_player.h"
+#include "sci/sfx/iterator_internal.h"
+#include "sci/sfx/player.h"
 #include "sci/tools.h"
 #include "sci/sci_memory.h"
 

engines/sci/sfx/iterator_internal.h

@@ -26,7 +26,7 @@
 #ifndef SCI_SFX_SFX_ITERATOR_INTERNAL
 #define SCI_SFX_SFX_ITERATOR_INTERNAL
 
-#include "sci/sfx/sfx_iterator.h"
+#include "sci/sfx/iterator.h"
 #include "sci/sfx/sci_midi.h"
 
 namespace Sci {

engines/sci/sfx/pcm-iterator.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sci/sfx/sfx_iterator.h"
+#include "sci/sfx/iterator.h"
 #include "sci/tools.h" /* for BREAKPOINT */
 #include "sci/sci_memory.h"
 

engines/sci/sfx/player.h

@@ -28,8 +28,8 @@
 #ifndef SCI_SFX_SFX_PLAYER_H
 #define SCI_SFX_SFX_PLAYER_H
 
-#include "sci/sfx/sfx_engine.h"
-#include "sci/sfx/sfx_iterator.h"
+#include "sci/sfx/core.h"
+#include "sci/sfx/iterator.h"
 #include "sci/scicore/resource.h"
 
 #include "common/scummsys.h"

engines/sci/sfx/player/polled.cpp

@@ -27,7 +27,7 @@
 
 #include "common/util.h"
 #include "common/file.h"
-#include "sci/sfx/sfx_player.h"
+#include "sci/sfx/player.h"
 #include "sci/sfx/softseq.h"
 #include "sci/sfx/mixer.h"
 

engines/sci/sfx/player/realtime.cpp

@@ -28,7 +28,7 @@
 ** enough, I guess.  */
 
 #include "sci/tools.h"
-#include "sci/sfx/sfx_player.h"
+#include "sci/sfx/player.h"
 #include "sci/sfx/sequencer.h"
 
 #include "common/system.h"

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

@@ -27,7 +27,7 @@
 #include "sci/sfx/sci_midi.h"
 #include "sci/sci_memory.h"
 #include "sci/sfx/seq/instrument-map.h"
-#include "sci/sfx/sfx_engine.h"
+#include "sci/sfx/core.h"
 
 namespace Sci {
 

engines/sci/sfx/sequencer.h

@@ -29,7 +29,7 @@
 
 #include "common/scummsys.h"
 
-#include "sci/sfx/sfx_core.h"
+#include "sci/sfx/sfx.h"
 #include "sci/sfx/device.h"
 
 namespace Sci {

engines/sci/sfx/sfx_pcm.h

@@ -26,7 +26,7 @@
 #ifndef SCI_SFX_SFX_PCM_H
 #define SCI_SFX_SFX_PCM_H
 
-#include "sci/sfx/sfx_core.h"
+#include "sci/sfx/sfx.h"
 #include "sci/sfx/sfx_time.h"
 
 namespace Sci {

engines/sci/sfx/softseq.h

@@ -26,7 +26,7 @@
 #ifndef SCI_SFX_SOFTSEQ_H
 #define SCI_SFX_SOFTSEQ_H
 
-#include "sci/sfx/sfx_core.h"
+#include "sci/sfx/sfx.h"
 #include "sci/sfx/sfx_pcm.h"
 #include "sci/sfx/sequencer.h"
 #include "sci/tools.h"

engines/sci/sfx/songlib.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "sci/tools.h"
-#include "sci/sfx/sfx_engine.h"
+#include "sci/sfx/core.h"
 #include "sci/sci_memory.h"
 
 namespace Sci {

engines/sci/sfx/songlib.h

@@ -30,7 +30,7 @@
 
 #include "common/scummsys.h"
 
-#include "sci/sfx/sfx_iterator.h"
+#include "sci/sfx/iterator.h"
 
 namespace Sci {
 

engines/sci/sfx/test-iterator.cpp

@@ -23,8 +23,8 @@
  *
  */
 
-#include <sfx_iterator.h>
-#include "sfx_iterator_internal.h"
+#include "iterator.h"
+#include "iterator_internal.h"
 #include <stdarg.h>
 #include <stdio.h>