aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sfx
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sci/sfx')
-rw-r--r--engines/sci/sfx/adlib.c2
-rw-r--r--engines/sci/sfx/adlib.h2
-rw-r--r--engines/sci/sfx/core.c10
-rw-r--r--engines/sci/sfx/device/devices.c2
-rw-r--r--engines/sci/sfx/iterator.c8
-rw-r--r--engines/sci/sfx/mixer.h2
-rw-r--r--engines/sci/sfx/mixer/mixers.c2
-rw-r--r--engines/sci/sfx/mixer/soft.c2
-rw-r--r--engines/sci/sfx/pcm-iterator.c6
-rw-r--r--engines/sci/sfx/pcm_device/pcm_devices.c4
-rw-r--r--engines/sci/sfx/pcm_device/scummvm.cpp4
-rw-r--r--engines/sci/sfx/player/players.c2
-rw-r--r--engines/sci/sfx/player/polled.c6
-rw-r--r--engines/sci/sfx/player/realtime.c4
-rw-r--r--engines/sci/sfx/sequencer.h6
-rw-r--r--engines/sci/sfx/softseq.h8
-rw-r--r--engines/sci/sfx/softseq/SN76496.c4
-rw-r--r--engines/sci/sfx/softseq/amiga.c6
-rw-r--r--engines/sci/sfx/softseq/fmopl.h2
-rw-r--r--engines/sci/sfx/softseq/pcspeaker.c4
-rw-r--r--engines/sci/sfx/songlib.c4
-rw-r--r--engines/sci/sfx/time.c4
-rw-r--r--engines/sci/sfx/timer/scummvm.cpp4
-rw-r--r--engines/sci/sfx/timer/timers.c4
24 files changed, 51 insertions, 51 deletions
diff --git a/engines/sci/sfx/adlib.c b/engines/sci/sfx/adlib.c
index dab3902770..c84a087820 100644
--- a/engines/sci/sfx/adlib.c
+++ b/engines/sci/sfx/adlib.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "adlib.h"
+#include "sci/sfx/adlib.h"
adlib_instr adlib_sbi[96];
diff --git a/engines/sci/sfx/adlib.h b/engines/sci/sfx/adlib.h
index 214b7100b7..67572581b5 100644
--- a/engines/sci/sfx/adlib.h
+++ b/engines/sci/sfx/adlib.h
@@ -23,7 +23,7 @@
#ifndef _SFX_ADLIB_H_
#define _SFX_ADLIB_H_
-#include <resource.h>
+#include "sci/include/resource.h"
#define ADLIB_VOICES 12
diff --git a/engines/sci/sfx/core.c b/engines/sci/sfx/core.c
index 9d55ad6bbf..786f80ab45 100644
--- a/engines/sci/sfx/core.c
+++ b/engines/sci/sfx/core.c
@@ -27,11 +27,11 @@
/* Sound subsystem core: Event handler, sound player dispatching */
#include <stdio.h>
-#include <sfx_timer.h>
-#include <sfx_iterator_internal.h>
-#include <sfx_player.h>
-#include "mixer.h"
-#include <sci_midi.h>
+#include "sci/include/sfx_timer.h"
+#include "sci/include/sfx_iterator_internal.h"
+#include "sci/include/sfx_player.h"
+#include "sci/sfx/mixer.h"
+#include "sci/include/sci_midi.h"
/*#define DEBUG_SONG_API*/
diff --git a/engines/sci/sfx/device/devices.c b/engines/sci/sfx/device/devices.c
index 78d8c4279c..2e54b1df4f 100644
--- a/engines/sci/sfx/device/devices.c
+++ b/engines/sci/sfx/device/devices.c
@@ -44,7 +44,7 @@ extern struct _midi_device sfx_device_midi_camd;
#endif
#endif // SCUMMVM
-#include <resource.h>
+#include "sci/include/resource.h"
static struct _midi_device *devices_midi[] = {
#ifndef SCUMMVM
diff --git a/engines/sci/sfx/iterator.c b/engines/sci/sfx/iterator.c
index f6c123a082..2d9008a842 100644
--- a/engines/sci/sfx/iterator.c
+++ b/engines/sci/sfx/iterator.c
@@ -27,10 +27,10 @@
/* Song iterators */
#include <stdio.h>
-#include <sfx_iterator_internal.h>
-#include <sfx_player.h>
-#include <resource.h>
-#include <sci_memory.h>
+#include "sci/include/sfx_iterator_internal.h"
+#include "sci/include/sfx_player.h"
+#include "sci/include/resource.h"
+#include "sci/include/sci_memory.h"
static const int MIDI_cmdlen[16] = {0, 0, 0, 0, 0, 0, 0, 0,
2, 2, 2, 2, 1, 1, 2, 0};
diff --git a/engines/sci/sfx/mixer.h b/engines/sci/sfx/mixer.h
index 7cf2aae397..2b7aa6fbfb 100644
--- a/engines/sci/sfx/mixer.h
+++ b/engines/sci/sfx/mixer.h
@@ -28,7 +28,7 @@
#ifndef _SFX_MIXER_H_
#define _SFX_MIXER_H_
-#include <sfx_pcm.h>
+#include "sci/include/sfx_pcm.h"
#define SFX_PCM_FEED_MODE_ALIVE 0
diff --git a/engines/sci/sfx/mixer/mixers.c b/engines/sci/sfx/mixer/mixers.c
index 1c7e27ab17..997525f173 100644
--- a/engines/sci/sfx/mixer/mixers.c
+++ b/engines/sci/sfx/mixer/mixers.c
@@ -26,7 +26,7 @@
***************************************************************************/
#include "../mixer.h"
-#include <resource.h>
+#include "sci/include/resource.h"
extern sfx_pcm_mixer_t sfx_pcm_mixer_soft_linear;
diff --git a/engines/sci/sfx/mixer/soft.c b/engines/sci/sfx/mixer/soft.c
index 9f833017df..d71567a209 100644
--- a/engines/sci/sfx/mixer/soft.c
+++ b/engines/sci/sfx/mixer/soft.c
@@ -26,7 +26,7 @@
***************************************************************************/
#include "../mixer.h"
-#include <sci_memory.h>
+#include "sci/include/sci_memory.h"
/* Max. number of microseconds in difference allowed between independent audio streams */
#define TIMESTAMP_MAX_ALLOWED_DELTA 2000
diff --git a/engines/sci/sfx/pcm-iterator.c b/engines/sci/sfx/pcm-iterator.c
index 8d9b86ed0d..cad4bd50f9 100644
--- a/engines/sci/sfx/pcm-iterator.c
+++ b/engines/sci/sfx/pcm-iterator.c
@@ -27,9 +27,9 @@
***************************************************************************/
-#include <sfx_iterator.h>
-#include <resource.h> /* for BREAKPOINT */
-#include <sci_memory.h>
+#include "sci/include/sfx_iterator.h"
+#include "sci/include/resource.h" /* for BREAKPOINT */
+#include "sci/include/sci_memory.h"
#define D ((pcm_data_internal_t *)self->internal)
diff --git a/engines/sci/sfx/pcm_device/pcm_devices.c b/engines/sci/sfx/pcm_device/pcm_devices.c
index 913b59fb08..a29de8896f 100644
--- a/engines/sci/sfx/pcm_device/pcm_devices.c
+++ b/engines/sci/sfx/pcm_device/pcm_devices.c
@@ -17,8 +17,8 @@
***************************************************************************/
-#include <sfx_pcm.h>
-#include <resource.h>
+#include "sci/include/sfx_pcm.h"
+#include "sci/include/resource.h"
#ifndef NO_PCMOUT
#ifdef SCUMMVM
diff --git a/engines/sci/sfx/pcm_device/scummvm.cpp b/engines/sci/sfx/pcm_device/scummvm.cpp
index 1b64dd40d3..c66aa0706e 100644
--- a/engines/sci/sfx/pcm_device/scummvm.cpp
+++ b/engines/sci/sfx/pcm_device/scummvm.cpp
@@ -1,5 +1,5 @@
-#include "sfx_time.h"
-#include "sfx_pcm.h"
+#include "sci/include/sfx_time.h"
+#include "sci/include/sfx_pcm.h"
#include "engines/engine.h"
#include "sound/audiostream.h"
#include "sound/mixer.h"
diff --git a/engines/sci/sfx/player/players.c b/engines/sci/sfx/player/players.c
index d6d7cbaf17..eafff46bc3 100644
--- a/engines/sci/sfx/player/players.c
+++ b/engines/sci/sfx/player/players.c
@@ -25,7 +25,7 @@
***************************************************************************/
-#include <sfx_player.h>
+#include "sci/include/sfx_player.h"
extern sfx_player_t sfx_player_realtime;
extern sfx_player_t sfx_player_polled;
diff --git a/engines/sci/sfx/player/polled.c b/engines/sci/sfx/player/polled.c
index 59eeceaac2..2a4c23fa97 100644
--- a/engines/sci/sfx/player/polled.c
+++ b/engines/sci/sfx/player/polled.c
@@ -26,9 +26,9 @@
***************************************************************************/
/* Polled player, mostly for PCM-based thingies (which _can_ poll, after all) */
-#include <sfx_player.h>
-#include "../softseq.h"
-#include "../mixer.h"
+#include "sci/include/sfx_player.h"
+#include "sci/sfx/softseq.h"
+#include "sci/sfx/mixer.h"
static song_iterator_t *play_it;
static int play_paused = 0;
diff --git a/engines/sci/sfx/player/realtime.c b/engines/sci/sfx/player/realtime.c
index 752b0b816b..d3fbae5800 100644
--- a/engines/sci/sfx/player/realtime.c
+++ b/engines/sci/sfx/player/realtime.c
@@ -28,8 +28,8 @@
** prays for some reasonable amount of soft real-time, but it's close
** enough, I guess. */
-#include <sfx_player.h>
-#include "../sequencer.h"
+#include "sci/include/sfx_player.h"
+#include "sci/sfx/sequencer.h"
static sfx_sequencer_t *seq;
diff --git a/engines/sci/sfx/sequencer.h b/engines/sci/sfx/sequencer.h
index 586e4b3e51..bafb6716aa 100644
--- a/engines/sci/sfx/sequencer.h
+++ b/engines/sci/sfx/sequencer.h
@@ -26,10 +26,10 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <sfx_core.h>
+#include "sci/include/sfx_core.h"
#include <stdio.h>
-#include "device.h"
-#include <scitypes.h>
+#include "sci/sfx/device.h"
+#include "sci/include/scitypes.h"
#define SFX_SEQ_PATCHFILE_NONE -1
diff --git a/engines/sci/sfx/softseq.h b/engines/sci/sfx/softseq.h
index 38efac6d59..6284aef8ec 100644
--- a/engines/sci/sfx/softseq.h
+++ b/engines/sci/sfx/softseq.h
@@ -30,10 +30,10 @@
#ifndef SFX_SOFTSEQ_H_
#define SFX_SOFTSEQ_H_
-#include <sfx_core.h>
-#include <sfx_pcm.h>
-#include "sequencer.h"
-#include <resource.h>
+#include "sci/include/sfx_core.h"
+#include "sci/include/sfx_pcm.h"
+#include "sci/sfx/sequencer.h"
+#include "sci/include/resource.h"
/* Software sequencer */
diff --git a/engines/sci/sfx/softseq/SN76496.c b/engines/sci/sfx/softseq/SN76496.c
index cb32b89f0c..6ecd72bf9e 100644
--- a/engines/sci/sfx/softseq/SN76496.c
+++ b/engines/sci/sfx/softseq/SN76496.c
@@ -28,8 +28,8 @@
***************************************************************************/
/* Tandy/PCJr sequencer for FreeSCI */
-#include "../softseq.h"
-#include <sci_midi.h>
+#include "sci/sfx/softseq.h"
+#include "sci/include/sci_midi.h"
#define FREQUENCY 44100
#define CHANNELS_NR 3
diff --git a/engines/sci/sfx/softseq/amiga.c b/engines/sci/sfx/softseq/amiga.c
index 12240897d7..8595899718 100644
--- a/engines/sci/sfx/softseq/amiga.c
+++ b/engines/sci/sfx/softseq/amiga.c
@@ -27,9 +27,9 @@
***************************************************************************/
-#include "resource.h"
-#include "sci_memory.h"
-#include "../softseq.h"
+#include "sci/include/resource.h"
+#include "sci/include/sci_memory.h"
+#include "sci/sfx/softseq.h"
#define FREQUENCY 44100
#define CHANNELS_NR 10
diff --git a/engines/sci/sfx/softseq/fmopl.h b/engines/sci/sfx/softseq/fmopl.h
index 5bb1cd80d7..0250c23a5a 100644
--- a/engines/sci/sfx/softseq/fmopl.h
+++ b/engines/sci/sfx/softseq/fmopl.h
@@ -26,7 +26,7 @@
#ifndef FMOPL_H_
#define FMOPL_H_
-#include <scitypes.h>
+#include "sci/include/scitypes.h"
#define TWELVE_VOICE 1
#ifdef TWELVE_VOICE
diff --git a/engines/sci/sfx/softseq/pcspeaker.c b/engines/sci/sfx/softseq/pcspeaker.c
index 771c8f0da5..727b1f9e5a 100644
--- a/engines/sci/sfx/softseq/pcspeaker.c
+++ b/engines/sci/sfx/softseq/pcspeaker.c
@@ -28,8 +28,8 @@
***************************************************************************/
/* PC speaker software sequencer for FreeSCI */
-#include "../softseq.h"
-#include <sci_midi.h>
+#include "sci/sfx/softseq.h"
+#include "sci/include/sci_midi.h"
#define FREQUENCY 94020
diff --git a/engines/sci/sfx/songlib.c b/engines/sci/sfx/songlib.c
index 36287845f0..57475e82db 100644
--- a/engines/sci/sfx/songlib.c
+++ b/engines/sci/sfx/songlib.c
@@ -25,8 +25,8 @@
***************************************************************************/
#include <stdio.h>
-#include <sfx_engine.h>
-#include <sci_memory.h>
+#include "sci/include/sfx_engine.h"
+#include "sci/include/sci_memory.h"
#define debug_stream stderr
diff --git a/engines/sci/sfx/time.c b/engines/sci/sfx/time.c
index 553eb406f8..0063b8ef65 100644
--- a/engines/sci/sfx/time.c
+++ b/engines/sci/sfx/time.c
@@ -27,8 +27,8 @@
***************************************************************************/
-#include <sfx_time.h>
-#include <resource.h>
+#include "sci/include/sfx_time.h"
+#include "sci/include/resource.h"
sfx_timestamp_t
sfx_new_timestamp(long secs, long usecs, int frame_rate)
diff --git a/engines/sci/sfx/timer/scummvm.cpp b/engines/sci/sfx/timer/scummvm.cpp
index f4e08d441a..c7d225e80c 100644
--- a/engines/sci/sfx/timer/scummvm.cpp
+++ b/engines/sci/sfx/timer/scummvm.cpp
@@ -1,6 +1,6 @@
#include "common/timer.h"
#include "engines/engine.h"
-#include "sfx_timer.h"
+#include "sci/include/sfx_timer.h"
#define FREQ 60
@@ -32,7 +32,7 @@ int scummvm_timer_start(void (*func)(void *), void *data) {
scummvm_timer_callback = func;
scummvm_timer_callback_data = data;
- ::g_engine->_timer->installTimerProc(&scummvm_timer_update_internal, DELAY, NULL);
+ ::g_engine->getTimerManager()->installTimerProc(&scummvm_timer_update_internal, DELAY, NULL);
return SFX_OK;
}
diff --git a/engines/sci/sfx/timer/timers.c b/engines/sci/sfx/timer/timers.c
index b2a51d6062..353ae11ca7 100644
--- a/engines/sci/sfx/timer/timers.c
+++ b/engines/sci/sfx/timer/timers.c
@@ -25,8 +25,8 @@
***************************************************************************/
-#include <sfx_timer.h>
-#include <resource.h>
+#include "sci/include/sfx_timer.h"
+#include "sci/include/resource.h"
#ifdef SCUMMVM
extern sfx_timer_t sfx_timer_scummvm;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-01 05:33:42 +0000