thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Renamed some sfx header files

Browse source 
svn-id: r39006
This commit is contained in:
Max Horn 2009-03-01 06:02:17 +00:00
parent 6454a3dee1
commit 25e7d3a08d
19 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/engine/state.h
View file

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

2
engines/sci/engine/vm.cpp
View file

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

4
engines/sci/sfx/core.cpp
View file

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

9
engines/sci/sfx/sfx_engine.h → engines/sci/sfx/core.h
View file

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

4
engines/sci/sfx/iterator.cpp
View file

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

0
engines/sci/sfx/sfx_iterator.h → engines/sci/sfx/iterator.h
View file

2
engines/sci/sfx/sfx_iterator_internal.h → engines/sci/sfx/iterator_internal.h
View file

@ -26,7 +26,7 @@
#ifndef SCI_SFX_SFX_ITERATOR_INTERNAL #ifndef SCI_SFX_SFX_ITERATOR_INTERNAL
#define 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" #include "sci/sfx/sci_midi.h"
namespace Sci { namespace Sci {

2
engines/sci/sfx/pcm-iterator.cpp
View file

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

4
engines/sci/sfx/sfx_player.h → engines/sci/sfx/player.h
View file

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

2
engines/sci/sfx/player/polled.cpp
View file

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

2
engines/sci/sfx/player/realtime.cpp
View file

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

2
engines/sci/sfx/seq/instrument-map.cpp
View file

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

2
engines/sci/sfx/sequencer.h
View file

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

0
engines/sci/sfx/sfx_core.h → engines/sci/sfx/sfx.h
View file

2
engines/sci/sfx/sfx_pcm.h
View file

@ -26,7 +26,7 @@
#ifndef SCI_SFX_SFX_PCM_H #ifndef SCI_SFX_SFX_PCM_H
#define 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" #include "sci/sfx/sfx_time.h"
namespace Sci { namespace Sci {

2
engines/sci/sfx/softseq.h
View file

@ -26,7 +26,7 @@
#ifndef SCI_SFX_SOFTSEQ_H #ifndef SCI_SFX_SOFTSEQ_H
#define 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/sfx_pcm.h"
#include "sci/sfx/sequencer.h" #include "sci/sfx/sequencer.h"
#include "sci/tools.h" #include "sci/tools.h"

2
engines/sci/sfx/songlib.cpp
View file

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

2
engines/sci/sfx/sfx_songlib.h → engines/sci/sfx/songlib.h
View file

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

4
engines/sci/sfx/test-iterator.cpp
View file

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