diff options
Diffstat (limited to 'engines/sci')
19 files changed, 26 insertions, 23 deletions
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h index 0d18812e03..51f07aa7eb 100644 --- a/engines/sci/engine/state.h +++ b/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 { diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 5d45acb294..a5834620a2 100644 --- a/engines/sci/engine/vm.cpp +++ b/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 { diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp index 4f532b0e61..f9d19f7176 100644 --- a/engines/sci/sfx/core.cpp +++ b/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" diff --git a/engines/sci/sfx/sfx_engine.h b/engines/sci/sfx/core.h index 02db4152b8..569f006968 100644 --- a/engines/sci/sfx/sfx_engine.h +++ b/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 */ diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp index cd9c0869f2..b67f8c90dd 100644 --- a/engines/sci/sfx/iterator.cpp +++ b/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" diff --git a/engines/sci/sfx/sfx_iterator.h b/engines/sci/sfx/iterator.h index 6fe6a36118..6fe6a36118 100644 --- a/engines/sci/sfx/sfx_iterator.h +++ b/engines/sci/sfx/iterator.h diff --git a/engines/sci/sfx/sfx_iterator_internal.h b/engines/sci/sfx/iterator_internal.h index b8b534b03d..d89c97b12e 100644 --- a/engines/sci/sfx/sfx_iterator_internal.h +++ b/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 { diff --git a/engines/sci/sfx/pcm-iterator.cpp b/engines/sci/sfx/pcm-iterator.cpp index 193f00045f..ff9f051a89 100644 --- a/engines/sci/sfx/pcm-iterator.cpp +++ b/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" diff --git a/engines/sci/sfx/sfx_player.h b/engines/sci/sfx/player.h index 8aee0d0979..1d4ed9cd4f 100644 --- a/engines/sci/sfx/sfx_player.h +++ b/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" diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp index 5519482b89..e0496008c9 100644 --- a/engines/sci/sfx/player/polled.cpp +++ b/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" diff --git a/engines/sci/sfx/player/realtime.cpp b/engines/sci/sfx/player/realtime.cpp index bbdebbd305..69a8759b80 100644 --- a/engines/sci/sfx/player/realtime.cpp +++ b/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" diff --git a/engines/sci/sfx/seq/instrument-map.cpp b/engines/sci/sfx/seq/instrument-map.cpp index 35b2f9ff05..51afc01a1c 100644 --- a/engines/sci/sfx/seq/instrument-map.cpp +++ b/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 { diff --git a/engines/sci/sfx/sequencer.h b/engines/sci/sfx/sequencer.h index a2f5fb789c..a5c5473b32 100644 --- a/engines/sci/sfx/sequencer.h +++ b/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 { diff --git a/engines/sci/sfx/sfx_core.h b/engines/sci/sfx/sfx.h index 36fb1c24c1..36fb1c24c1 100644 --- a/engines/sci/sfx/sfx_core.h +++ b/engines/sci/sfx/sfx.h diff --git a/engines/sci/sfx/sfx_pcm.h b/engines/sci/sfx/sfx_pcm.h index 0459afd2ee..b834704a62 100644 --- a/engines/sci/sfx/sfx_pcm.h +++ b/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 { diff --git a/engines/sci/sfx/softseq.h b/engines/sci/sfx/softseq.h index 2b0c04ac70..4070f9e4e5 100644 --- a/engines/sci/sfx/softseq.h +++ b/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" diff --git a/engines/sci/sfx/songlib.cpp b/engines/sci/sfx/songlib.cpp index 61b564004f..93dabdffe5 100644 --- a/engines/sci/sfx/songlib.cpp +++ b/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 { diff --git a/engines/sci/sfx/sfx_songlib.h b/engines/sci/sfx/songlib.h index 4d88be623a..3011283a72 100644 --- a/engines/sci/sfx/sfx_songlib.h +++ b/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 { diff --git a/engines/sci/sfx/test-iterator.cpp b/engines/sci/sfx/test-iterator.cpp index 9c71e2f883..641d05b62f 100644 --- a/engines/sci/sfx/test-iterator.cpp +++ b/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> |