aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/sci/engine/kernel.cpp4
-rw-r--r--engines/sci/scicore/vocab.cpp4
-rw-r--r--engines/sci/sfx/core.cpp64
-rw-r--r--engines/sci/sfx/mixer/soft.cpp22
-rw-r--r--engines/sci/sfx/player/polled.cpp4
5 files changed, 49 insertions, 49 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 23ec76067b..4faf506efe 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -567,7 +567,7 @@ reg_t kGetTime(EngineState *s, int funct_nr, int argc, reg_t *argv) {
break;
}
default: {
- warning("Attempt to use unknown GetTime mode %d\n", mode);
+ warning("Attempt to use unknown GetTime mode %d", mode);
break;
}
}
@@ -659,7 +659,7 @@ reg_t kMemory(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t kstub(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int i;
- warning("Unimplemented syscall: %s[%x](", s->kernel_names[funct_nr], funct_nr);
+ sciprintf("Unimplemented syscall: %s[%x](", s->kernel_names[funct_nr], funct_nr);
for (i = 0; i < argc; i++) {
sciprintf(PREG, PRINT_REG(argv[i]));
diff --git a/engines/sci/scicore/vocab.cpp b/engines/sci/scicore/vocab.cpp
index 08c4325efa..83ab4a4a2d 100644
--- a/engines/sci/scicore/vocab.cpp
+++ b/engines/sci/scicore/vocab.cpp
@@ -84,7 +84,7 @@ vocab_get_words(ResourceManager *resmgr, int *word_counter) {
vocab_version = 0;
if (!resource) {
- warning("SCI0: Could not find a main vocabulary, trying SCI01.\n");
+ warning("SCI0: Could not find a main vocabulary, trying SCI01");
resource = scir_find_resource(resmgr, sci_vocab,
VOCAB_RESOURCE_SCI1_MAIN_VOCAB, 0);
vocab_version = 1;
@@ -124,7 +124,7 @@ vocab_get_words(ResourceManager *resmgr, int *word_counter) {
currentword[currentwordpos++] = c;
}
if (seeker == resource->size) {
- warning("SCI1: Vocabulary not usable, disabling.\n");
+ warning("SCI1: Vocabulary not usable, disabling");
vocab_free_words(words, counter);
return NULL;
}
diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp
index 7452305dc7..7418c3be17 100644
--- a/engines/sci/sfx/core.cpp
+++ b/engines/sci/sfx/core.cpp
@@ -130,22 +130,22 @@ static void
_dump_playing_list(sfx_state_t *self, char *msg) {
song_t *song = self->song;
- warning("[] Song list : [ ");
+ sciprintf("[] Song list : [ ");
song = *(self->songlib.lib);
while (song) {
- warning("%08lx:%d ", song->handle, song->status);
+ sciprintf("%08lx:%d ", song->handle, song->status);
song = song->next_playing;
}
- warning("]\n");
+ sciprintf("]\n");
- warning("[] Play list (%s) : [ " , msg);
+ sciprintf("[] Play list (%s) : [ " , msg);
while (song) {
- warning("%08lx ", song->handle);
+ sciprintf("%08lx ", song->handle);
song = song->next_playing;
}
- warning("]\n");
+ sciprintf("]\n");
}
#endif
@@ -154,17 +154,17 @@ _dump_songs(sfx_state_t *self) {
#if 0
song_t *song = self->song;
- warning("Cue iterators:\n");
+ sciprintf("Cue iterators:\n");
song = *(self->songlib.lib);
while (song) {
- warning(" **\tHandle %08x (p%d): status %d\n",
+ sciprintf(" **\tHandle %08x (p%d): status %d\n",
song->handle, song->priority, song->status);
SIMSG_SEND(song->it, SIMSG_PRINT(1));
song = song->next;
}
if (player) {
- warning("Audio iterator:\n");
+ sciprintf("Audio iterator:\n");
player->iterator_message(songit_make_message(0, SIMSG_PRINT(1)));
}
#endif
@@ -400,7 +400,7 @@ static int _sfx_timer_active = 0; /* Timer toggle */
int
sfx_play_iterator_pcm(song_iterator_t *it, song_handle_t handle) {
#ifdef DEBUG_SONG_API
- warning("[sfx-core] Playing PCM: %08lx\n", handle);
+ warning("[sfx-core] Playing PCM: %08lx", handle);
#endif
if (mixer) {
sfx_pcm_feed_t *newfeed = it->get_pcm_feed(it);
@@ -452,7 +452,7 @@ sfx_init(sfx_state_t *self, ResourceManager *resmgr, int flags) {
#ifdef DEBUG_SONG_API
- warning("[sfx-core] Initialising: flags=%x\n", flags);
+ warning("[sfx-core] Initialising: flags=%x", flags);
#endif
/*------------------*/
@@ -463,8 +463,8 @@ sfx_init(sfx_state_t *self, ResourceManager *resmgr, int flags) {
timer = &sfx_timer_scummvm;
if (!timer) {
- warning("[SFX] " __FILE__": Could not find timing mechanism\n");
- warning("[SFX] Disabled sound support\n");
+ warning("[SFX] " __FILE__": Could not find timing mechanism");
+ warning("[SFX] Disabled sound support");
pcm_device = NULL;
player = NULL;
mixer = NULL;
@@ -472,8 +472,8 @@ sfx_init(sfx_state_t *self, ResourceManager *resmgr, int flags) {
}
if (timer->init(_sfx_timer_callback, NULL)) {
- warning("[SFX] " __FILE__": Timer failed to initialize\n");
- warning("[SFX] Disabled sound support\n");
+ warning("[SFX] " __FILE__": Timer failed to initialize");
+ warning("[SFX] Disabled sound support");
timer = NULL;
pcm_device = NULL;
player = NULL;
@@ -528,7 +528,7 @@ sfx_exit(sfx_state_t *self) {
callbackMutex->lock();
_sfx_timer_active = 0;
#ifdef DEBUG_SONG_API
- warning("[sfx-core] Uninitialising\n");
+ warning("[sfx-core] Uninitialising");
#endif
song_lib_free(self->songlib);
@@ -536,7 +536,7 @@ sfx_exit(sfx_state_t *self) {
pcm_device = NULL;
if (timer && timer->exit())
- warning("[SFX] Timer reported error on exit\n");
+ warning("[SFX] Timer reported error on exit");
/* WARNING: The mixer may hold feeds from the
** player, so we must stop the mixer BEFORE
@@ -563,7 +563,7 @@ time_le(GTimeVal a, GTimeVal b) {
void
sfx_suspend(sfx_state_t *self, int suspend) {
#ifdef DEBUG_SONG_API
- warning("[sfx-core] Suspending? = %d\n", suspend);
+ warning("[sfx-core] Suspending? = %d", suspend);
#endif
if (suspend && (!self->suspended)) {
/* suspend */
@@ -600,7 +600,7 @@ sfx_poll(sfx_state_t *self, song_handle_t *handle, int *cue)
*handle = self->song->handle;
#ifdef DEBUG_SONG_API
- warning("[sfx-core] Polling any (%08lx)\n", *handle);
+ warning("[sfx-core] Polling any (%08lx)", *handle);
#endif
return sfx_poll_specific(self, *handle, cue);
}
@@ -678,10 +678,10 @@ sfx_add_song(sfx_state_t *self, song_iterator_t *it, int priority, song_handle_t
song_t *song = song_lib_find(self->songlib, handle);
#ifdef DEBUG_SONG_API
- warning("[sfx-core] Adding song: %08lx at %d, it=%p\n", handle, priority, it);
+ warning("[sfx-core] Adding song: %08lx at %d, it=%p", handle, priority, it);
#endif
if (!it) {
- warning("[SFX] Attempt to add empty song with handle %08lx\n", handle);
+ warning("[SFX] Attempt to add empty song with handle %08lx", handle);
return -1;
}
@@ -697,10 +697,10 @@ sfx_add_song(sfx_state_t *self, song_iterator_t *it, int priority, song_handle_t
if (song) {
_sfx_set_song_status(self, song, SOUND_STATUS_STOPPED);
- warning("Overwriting old song (%08lx) ...\n", handle);
+ warning("Overwriting old song (%08lx) ...", handle);
if (song->status == SOUND_STATUS_PLAYING
|| song->status == SOUND_STATUS_SUSPENDED) {
- warning("Unexpected (error): Song %ld still playing/suspended (%d)\n",
+ warning("Unexpected (error): Song %ld still playing/suspended (%d)",
handle, song->status);
songit_free(it);
return -1;
@@ -725,7 +725,7 @@ sfx_add_song(sfx_state_t *self, song_iterator_t *it, int priority, song_handle_t
void
sfx_remove_song(sfx_state_t *self, song_handle_t handle) {
#ifdef DEBUG_SONG_API
- warning("[sfx-core] Removing song: %08lx\n", handle);
+ warning("[sfx-core] Removing song: %08lx", handle);
#endif
if (self->song && self->song->handle == handle)
self->song = NULL;
@@ -740,7 +740,7 @@ sfx_remove_song(sfx_state_t *self, song_handle_t handle) {
/* Song modifications */
/**********************/
-#define ASSERT_SONG(s) if (!(s)) { warning("Looking up song handle %08lx failed in %s, L%d\n", handle, __FILE__, __LINE__); return; }
+#define ASSERT_SONG(s) if (!(s)) { warning("Looking up song handle %08lx failed in %s, L%d", handle, __FILE__, __LINE__); return; }
void
sfx_song_set_status(sfx_state_t *self, song_handle_t handle, int status) {
@@ -768,7 +768,7 @@ sfx_song_set_fade(sfx_state_t *self, song_handle_t handle,
#ifdef DEBUG_SONG_API
warning("[sfx-core] Setting fade params of %08lx to "
- "final volume %d in steps of %d per %d ticks. %s.\n",
+ "final volume %d in steps of %d per %d ticks. %s.",
handle, fade->final_volume, fade->step_size, fade->ticks_per_step,
stopmsg[fade->action]);
#endif
@@ -783,7 +783,7 @@ sfx_song_renice(sfx_state_t *self, song_handle_t handle, int priority) {
song_t *song = song_lib_find(self->songlib, handle);
ASSERT_SONG(song);
#ifdef DEBUG_SONG_API
- warning("[sfx-core] Renicing song %08lx to %d\n",
+ warning("[sfx-core] Renicing song %08lx to %d",
handle, priority);
#endif
@@ -800,7 +800,7 @@ sfx_song_set_loops(sfx_state_t *self, song_handle_t handle, int loops) {
ASSERT_SONG(song);
#ifdef DEBUG_SONG_API
- warning("[sfx-core] Setting loops on %08lx to %d\n",
+ warning("[sfx-core] Setting loops on %08lx to %d",
handle, loops);
#endif
songit_handle_message(&(song->it), msg);
@@ -820,7 +820,7 @@ sfx_song_set_hold(sfx_state_t *self, song_handle_t handle, int hold) {
song->hold = hold;
#ifdef DEBUG_SONG_API
- warning("[sfx-core] Setting hold on %08lx to %d\n",
+ warning("[sfx-core] Setting hold on %08lx to %d",
handle, loops);
#endif
songit_handle_message(&(song->it), msg);
@@ -886,19 +886,19 @@ sfx_send_midi(sfx_state_t *self, song_handle_t handle, int channel,
int
sfx_get_volume(sfx_state_t *self) {
- warning("FIXME: Implement volume\n");
+ warning("FIXME: Implement volume");
return 0;
}
void
sfx_set_volume(sfx_state_t *self, int volume) {
- warning("FIXME: Implement volume\n");
+ warning("FIXME: Implement volume");
}
void
sfx_all_stop(sfx_state_t *self) {
#ifdef DEBUG_SONG_API
- warning("[sfx-core] All stop\n");
+ warning("[sfx-core] All stop");
#endif
song_lib_free(self->songlib);
diff --git a/engines/sci/sfx/mixer/soft.cpp b/engines/sci/sfx/mixer/soft.cpp
index 01f132393d..4f28275bec 100644
--- a/engines/sci/sfx/mixer/soft.cpp
+++ b/engines/sci/sfx/mixer/soft.cpp
@@ -51,9 +51,9 @@ static volatile int mixer_lock = 0;
/*#define DEBUG_LOCKS*/
#ifdef DEBUG_LOCKS
-# define DEBUG_ACQUIRE error("[ -LOCK -] ACKQ %d: %d\n", __LINE__, mixer_lock)
-# define DEBUG_WAIT error("[ -LOCK -] WAIT %d: %d\n", __LINE__, mixer_lock);
-# define DEBUG_RELEASE ; error("[ -LOCK -] REL %d: %d\n", __LINE__, mixer_lock);
+# define DEBUG_ACQUIRE warning("[ -LOCK -] ACKQ %d: %d", __LINE__, mixer_lock)
+# define DEBUG_WAIT warning("[ -LOCK -] WAIT %d: %d", __LINE__, mixer_lock);
+# define DEBUG_RELEASE ; warning("[ -LOCK -] REL %d: %d", __LINE__, mixer_lock);
#else
# define DEBUG_ACQUIRE
# define DEBUG_WAIT
@@ -167,7 +167,7 @@ mix_subscribe(sfx_pcm_mixer_t *self, sfx_pcm_feed_t *feed) {
fs->buf_size = 2 + /* Additional safety */
(self->dev->buf_size *
(1 + (feed->conf.rate / self->dev->conf.rate)));
- warning(" ---> %d/%d/%d/%d = %d\n",
+ warning(" ---> %d/%d/%d/%d = %d",
self->dev->buf_size,
feed->conf.rate,
self->dev->conf.rate,
@@ -175,7 +175,7 @@ mix_subscribe(sfx_pcm_mixer_t *self, sfx_pcm_feed_t *feed) {
fs->buf_size);
fs->buf = (byte*)sci_malloc(fs->buf_size * feed->frame_size);
- warning(" ---> --> %d for %p at %p\n", fs->buf_size * feed->frame_size, (void *)fs, (void *)fs->buf);
+ warning(" ---> --> %d for %p at %p", fs->buf_size * feed->frame_size, (void *)fs, (void *)fs->buf);
{
int i;
for (i = 0; i < fs->buf_size * feed->frame_size; i++)
@@ -235,7 +235,7 @@ _mix_unsubscribe(sfx_pcm_mixer_t *self, sfx_pcm_feed_t *feed) {
}
for (i = 0; i < self->feeds_nr; i++)
- warning(" Feed #%d: %s-%x\n",
+ warning(" Feed #%d: %s-%x",
i, self->feeds[i].feed->debug_name,
self->feeds[i].feed->debug_nr);
@@ -243,7 +243,7 @@ _mix_unsubscribe(sfx_pcm_mixer_t *self, sfx_pcm_feed_t *feed) {
}
}
- error("[sfx-mixer] Assertion failed: Deleting invalid feed %p out of %d\n",
+ error("[sfx-mixer] Assertion failed: Deleting invalid feed %p out of %d",
(void *)feed, self->feeds_nr);
BREAKPOINT();
@@ -428,7 +428,7 @@ mix_compute_buf_len(sfx_pcm_mixer_t *self, int *skip_frames)
played_frames = frame_pos - P->played_this_second
+ ((secs - P->lsec) * self->dev->conf.rate);
/*
- error("%d:%d - %d:%d => %d\n", secs, frame_pos,
+ error("%d:%d - %d:%d => %d", secs, frame_pos,
P->lsec, P->played_this_second, played_frames);
*/
@@ -436,7 +436,7 @@ mix_compute_buf_len(sfx_pcm_mixer_t *self, int *skip_frames)
played_frames = self->dev->buf_size;
/*
- error("Between %d:? offset=%d and %d:%d offset=%d: Played %d at %d\n", P->lsec, P->played_this_second,
+ error("Between %d:? offset=%d and %d:%d offset=%d: Played %d at %d", P->lsec, P->played_this_second,
secs, usecs, frame_pos, played_frames, self->dev->conf.rate);
*/
@@ -492,7 +492,7 @@ mix_compute_buf_len(sfx_pcm_mixer_t *self, int *skip_frames)
}
if (result_frames > self->dev->buf_size) {
- error("[soft-mixer] Internal assertion failed: frames-to-write %d > %d\n",
+ error("[soft-mixer] Internal assertion failed: frames-to-write %d > %d",
result_frames, self->dev->buf_size);
}
return result_frames;
@@ -638,7 +638,7 @@ mix_compute_input_linear(sfx_pcm_mixer_t *self, int add_result,
return;
default:
- error("[soft-mixer] Fatal: Invalid mode returned by PCM feed %s-%d's get_timestamp(): %d\n",
+ error("[soft-mixer] Fatal: Invalid mode returned by PCM feed %s-%d's get_timestamp(): %d",
f->debug_name, f->debug_nr, newmode);
exit(1);
}
diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp
index 9d307940cb..c514fa1caf 100644
--- a/engines/sci/sfx/player/polled.cpp
+++ b/engines/sci/sfx/player/polled.cpp
@@ -240,7 +240,7 @@ pp_add_iterator(song_iterator_t *it, GTimeVal start_time) {
static int
pp_fade_out(void) {
- warning(__FILE__": Attempt to fade out- not implemented yet\n");
+ warning(__FILE__": Attempt to fade out- not implemented yet");
return SFX_ERROR;
}
@@ -249,7 +249,7 @@ pp_stop(void) {
song_iterator_t *it = play_it;
play_it = NULL;
- warning("[play] Now stopping it %p\n", (void *)it);
+ warning("[play] Now stopping it %p", (void *)it);
if (it)
songit_free(it);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 07:18:15 +0000