[Scummvm-cvs-logs] SF.net SVN: scummvm:[38706] scummvm/trunk/engines/sci/sfx
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Sat Feb 21 17:20:53 CET 2009
Revision: 38706
http://scummvm.svn.sourceforge.net/scummvm/?rev=38706&view=rev
Author: aquadran
Date: 2009-02-21 16:20:53 +0000 (Sat, 21 Feb 2009)
Log Message:
-----------
formating
Modified Paths:
--------------
scummvm/trunk/engines/sci/sfx/adlib.cpp
scummvm/trunk/engines/sci/sfx/core.cpp
scummvm/trunk/engines/sci/sfx/device/devices.cpp
scummvm/trunk/engines/sci/sfx/device.h
scummvm/trunk/engines/sci/sfx/iterator.cpp
scummvm/trunk/engines/sci/sfx/mixer.h
scummvm/trunk/engines/sci/sfx/pcm-iterator.cpp
scummvm/trunk/engines/sci/sfx/sequencer.h
scummvm/trunk/engines/sci/sfx/softseq.h
scummvm/trunk/engines/sci/sfx/songlib.cpp
scummvm/trunk/engines/sci/sfx/time.cpp
Modified: scummvm/trunk/engines/sci/sfx/adlib.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/adlib.cpp 2009-02-21 16:08:04 UTC (rev 38705)
+++ scummvm/trunk/engines/sci/sfx/adlib.cpp 2009-02-21 16:20:53 UTC (rev 38706)
@@ -29,8 +29,7 @@
adlib_instr adlib_sbi[96];
-void
-make_sbi(adlib_def *one, guint8 *buffer) {
+void make_sbi(adlib_def *one, guint8 *buffer) {
memset(buffer, 0, sizeof(adlib_instr));
#if 0
Modified: scummvm/trunk/engines/sci/sfx/core.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/core.cpp 2009-02-21 16:08:04 UTC (rev 38705)
+++ scummvm/trunk/engines/sci/sfx/core.cpp 2009-02-21 16:20:53 UTC (rev 38706)
@@ -53,41 +53,34 @@
#define MILLION 1000000
-int
-sfx_pcm_available() {
+int sfx_pcm_available() {
return (pcm_device != NULL);
}
-void
-sfx_reset_player(void) {
+void sfx_reset_player(void) {
if (player)
player->stop();
}
-tell_synth_func *
-sfx_get_player_tell_func(void) {
+tell_synth_func *sfx_get_player_tell_func(void) {
if (player)
return player->tell_synth;
else
return NULL;
}
-int
-sfx_get_player_polyphony(void) {
+int sfx_get_player_polyphony(void) {
if (player)
return player->polyphony;
else
return 0;
}
-static long
-time_minus(GTimeVal t1, GTimeVal t2) {
- return (t1.tv_sec - t2.tv_sec) * MILLION
- + (t1.tv_usec - t2.tv_usec);
+static long time_minus(GTimeVal t1, GTimeVal t2) {
+ return (t1.tv_sec - t2.tv_sec) * MILLION + (t1.tv_usec - t2.tv_usec);
}
-static GTimeVal
-time_plus(GTimeVal t1, long delta) {
+static GTimeVal time_plus(GTimeVal t1, long delta) {
if (delta > 0)
t1.tv_usec += delta % MILLION;
else
@@ -104,8 +97,7 @@
}
-static void
-_freeze_time(sfx_state_t *self) {
+static void _freeze_time(sfx_state_t *self) {
/* Freezes the top song delay time */
GTimeVal ctime;
long delta;
@@ -126,8 +118,7 @@
#if 0
// Unreferenced - removed
-static void
-_dump_playing_list(sfx_state_t *self, char *msg) {
+static void _dump_playing_list(sfx_state_t *self, char *msg) {
song_t *song = self->song;
fprintf(stderr, "[] Song list : [ ");
@@ -149,8 +140,7 @@
}
#endif
-static void
-_dump_songs(sfx_state_t *self) {
+static void _dump_songs(sfx_state_t *self) {
#if 0
song_t *song = self->song;
@@ -170,9 +160,7 @@
#endif
}
-
-static void
-_thaw_time(sfx_state_t *self) {
+static void _thaw_time(sfx_state_t *self) {
/* inverse of _freeze_time() */
GTimeVal ctime;
song_t *song = self->song;
@@ -186,8 +174,7 @@
}
}
-static int
-is_playing(sfx_state_t *self, song_t *song) {
+static int is_playing(sfx_state_t *self, song_t *song) {
song_t *playing_song = self->song;
/* _dump_playing_list(self, "is-playing");*/
@@ -248,8 +235,7 @@
}
/* Update internal state iff only one song may be played */
-static void
-_update_single_song(sfx_state_t *self) {
+static void _update_single_song(sfx_state_t *self) {
song_t *newsong = song_lib_find_active(self->songlib);
if (newsong != self->song) {
@@ -307,8 +293,7 @@
}
-static void
-_update_multi_song(sfx_state_t *self) {
+static void _update_multi_song(sfx_state_t *self) {
song_t *oldfirst = self->song;
song_t *oldseeker;
song_t *newsong = song_lib_find_active(self->songlib);
@@ -386,8 +371,7 @@
}
/* Update internal state */
-static void
-_update(sfx_state_t *self) {
+static void _update(sfx_state_t *self) {
if (self->flags & SFX_STATE_FLAG_MULTIPLAY)
_update_multi_song(self);
else
@@ -397,8 +381,7 @@
static int _sfx_timer_active = 0; /* Timer toggle */
-int
-sfx_play_iterator_pcm(song_iterator_t *it, song_handle_t handle) {
+int sfx_play_iterator_pcm(song_iterator_t *it, song_handle_t handle) {
#ifdef DEBUG_SONG_API
fprintf(stderr, "[sfx-core] Playing PCM: %08lx\n", handle);
#endif
@@ -413,8 +396,7 @@
return 0;
}
-static void
-_sfx_timer_callback(void *data) {
+static void _sfx_timer_callback(void *data) {
if (_sfx_timer_active) {
Common::StackLock lock(*callbackMutex);
/* First run the player, to give it a chance to fill
@@ -430,8 +412,7 @@
}
}
-void
-sfx_init(sfx_state_t *self, ResourceManager *resmgr, int flags) {
+void sfx_init(sfx_state_t *self, ResourceManager *resmgr, int flags) {
callbackMutex = new Common::Mutex();
song_lib_init(&self->songlib);
self->song = NULL;
@@ -523,8 +504,7 @@
_sfx_timer_active = 1;
}
-void
-sfx_exit(sfx_state_t *self) {
+void sfx_exit(sfx_state_t *self) {
callbackMutex->lock();
_sfx_timer_active = 0;
#ifdef DEBUG_SONG_API
@@ -555,13 +535,11 @@
callbackMutex = 0;
}
-static inline int
-time_le(GTimeVal a, GTimeVal b) {
+static inline int time_le(GTimeVal a, GTimeVal b) {
return time_minus(a, b) <= 0;
}
-void
-sfx_suspend(sfx_state_t *self, int suspend) {
+void sfx_suspend(sfx_state_t *self, int suspend) {
#ifdef DEBUG_SONG_API
fprintf(stderr, "[sfx-core] Suspending? = %d\n", suspend);
#endif
@@ -586,14 +564,12 @@
self->suspended = suspend;
}
-int
-sfx_poll(sfx_state_t *self, song_handle_t *handle, int *cue)
+int sfx_poll(sfx_state_t *self, song_handle_t *handle, int *cue) {
/* Polls the sound server for cues etc.
** Returns : (int) 0 if the cue queue is empty, SI_LOOP, SI_CUE, or SI_FINISHED otherwise
** (song_handle_t) *handle: The affected handle
** (int) *cue: The sound cue number (if SI_CUE)
*/
-{
if (!self->song)
return 0; /* No milk today */
@@ -605,8 +581,7 @@
return sfx_poll_specific(self, *handle, cue);
}
-int
-sfx_poll_specific(sfx_state_t *self, song_handle_t handle, int *cue) {
+int sfx_poll_specific(sfx_state_t *self, song_handle_t handle, int *cue) {
GTimeVal ctime;
song_t *song = self->song;
@@ -676,8 +651,7 @@
/* Song basics */
/*****************/
-int
-sfx_add_song(sfx_state_t *self, song_iterator_t *it, int priority, song_handle_t handle, int number) {
+int sfx_add_song(sfx_state_t *self, song_iterator_t *it, int priority, song_handle_t handle, int number) {
song_t *song = song_lib_find(self->songlib, handle);
#ifdef DEBUG_SONG_API
@@ -724,9 +698,7 @@
return 0;
}
-
-void
-sfx_remove_song(sfx_state_t *self, song_handle_t handle) {
+void sfx_remove_song(sfx_state_t *self, song_handle_t handle) {
#ifdef DEBUG_SONG_API
fprintf(stderr, "[sfx-core] Removing song: %08lx\n", handle);
#endif
@@ -745,8 +717,7 @@
#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) {
+void sfx_song_set_status(sfx_state_t *self, song_handle_t handle, int status) {
song_t *song = song_lib_find(self->songlib, handle);
ASSERT_SONG(song);
#ifdef DEBUG_SONG_API
@@ -759,8 +730,7 @@
_update(self);
}
-void
-sfx_song_set_fade(sfx_state_t *self, song_handle_t handle,
+void sfx_song_set_fade(sfx_state_t *self, song_handle_t handle,
fade_params_t *params) {
#ifdef DEBUG_SONG_API
static const char *stopmsg[] = {"??? Should not happen", "Do not stop afterwards", "Stop afterwards"};
@@ -781,8 +751,7 @@
_update(self);
}
-void
-sfx_song_renice(sfx_state_t *self, song_handle_t handle, int priority) {
+void 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
@@ -795,8 +764,7 @@
_update(self);
}
-void
-sfx_song_set_loops(sfx_state_t *self, song_handle_t handle, int loops) {
+void sfx_song_set_loops(sfx_state_t *self, song_handle_t handle, int loops) {
song_t *song = song_lib_find(self->songlib, handle);
song_iterator_message_t msg
= songit_make_message(handle, SIMSG_SET_LOOPS(loops));
@@ -814,8 +782,7 @@
player->iterator_message(msg);
}
-void
-sfx_song_set_hold(sfx_state_t *self, song_handle_t handle, int hold) {
+void sfx_song_set_hold(sfx_state_t *self, song_handle_t handle, int hold) {
song_t *song = song_lib_find(self->songlib, handle);
song_iterator_message_t msg
= songit_make_message(handle, SIMSG_SET_HOLD(hold));
@@ -840,8 +807,7 @@
static const song_handle_t midi_send_base = 0xffff0000;
-int
-sfx_send_midi(sfx_state_t *self, song_handle_t handle, int channel,
+int sfx_send_midi(sfx_state_t *self, song_handle_t handle, int channel,
int command, int arg1, int arg2) {
byte buffer[5];
tell_synth_func *tell = sfx_get_player_tell_func();
@@ -887,19 +853,16 @@
return SFX_OK;
}
-int
-sfx_get_volume(sfx_state_t *self) {
+int sfx_get_volume(sfx_state_t *self) {
warning("FIXME: Implement volume");
return 0;
}
-void
-sfx_set_volume(sfx_state_t *self, int volume) {
+void sfx_set_volume(sfx_state_t *self, int volume) {
warning("FIXME: Implement volume");
}
-void
-sfx_all_stop(sfx_state_t *self) {
+void sfx_all_stop(sfx_state_t *self) {
#ifdef DEBUG_SONG_API
fprintf(stderr, "[sfx-core] All stop\n");
#endif
Modified: scummvm/trunk/engines/sci/sfx/device/devices.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/device/devices.cpp 2009-02-21 16:08:04 UTC (rev 38705)
+++ scummvm/trunk/engines/sci/sfx/device/devices.cpp 2009-02-21 16:20:53 UTC (rev 38706)
@@ -50,9 +50,7 @@
devices_opl2,
};
-
-static struct _midi_device *
- find_dev(int type, char *name) {
+static struct _midi_device *find_dev(int type, char *name) {
int i = 0;
if (!type)
@@ -67,15 +65,12 @@
return devices[type][i];
}
-
-void *
-sfx_find_device(int type, char *name) {
+void *sfx_find_device(int type, char *name) {
struct _midi_device *dev = find_dev(type, name);
if (dev) {
if (dev->init(dev)) {
- fprintf(stderr, "[SFX] Opening device '%s' failed\n",
- dev->name);
+ fprintf(stderr, "[SFX] Opening device '%s' failed\n", dev->name);
return NULL;
}
Modified: scummvm/trunk/engines/sci/sfx/device.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/device.h 2009-02-21 16:08:04 UTC (rev 38705)
+++ scummvm/trunk/engines/sci/sfx/device.h 2009-02-21 16:20:53 UTC (rev 38706)
@@ -109,8 +109,7 @@
} midi_writer_t;
-void *
-sfx_find_device(int type, char *name);
+void *sfx_find_device(int type, char *name);
/* Looks up a device by name
** Parameters: (int) type: Device type to look up
** (char *) name: Comma-separated list of devices to choose from
Modified: scummvm/trunk/engines/sci/sfx/iterator.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator.cpp 2009-02-21 16:08:04 UTC (rev 38705)
+++ scummvm/trunk/engines/sci/sfx/iterator.cpp 2009-02-21 16:20:53 UTC (rev 38706)
@@ -41,8 +41,7 @@
/*#define DEBUG_DECODING*/
/*#define DEBUG_VERBOSE*/
-void
-print_tabs_id(int nr, songit_id_t id) {
+void print_tabs_id(int nr, songit_id_t id) {
while (nr-- > 0)
fprintf(stderr, "\t");
@@ -66,8 +65,7 @@
}
#endif
-static void
-_common_init(base_song_iterator_t *self) {
+static void _common_init(base_song_iterator_t *self) {
self->fade.action = FADE_ACTION_NONE;
self->resetflag = 0;
self->loops = 0;
@@ -100,8 +98,7 @@
}
-static inline int
-_parse_ticks(byte *data, int *offset_p, int size) {
+static inline int _parse_ticks(byte *data, int *offset_p, int size) {
int ticks = 0;
int tempticks;
int offset = 0;
@@ -120,13 +117,11 @@
}
-static int
-_sci0_read_next_command(sci0_song_iterator_t *self,
+static int _sci0_read_next_command(sci0_song_iterator_t *self,
unsigned char *buf, int *result);
-static int
-_sci0_get_pcm_data(sci0_song_iterator_t *self,
+static int _sci0_get_pcm_data(sci0_song_iterator_t *self,
sfx_pcm_config_t *format,
int *xoffset,
unsigned int *xsize);
@@ -135,8 +130,7 @@
#define PARSE_FLAG_PARAMETRIC_CUE (1 << 1) /* Assume that cues take an additional "cue value" argument */
/* This implements a difference between SCI0 and SCI1 cues. */
-void
-_reset_synth_channels(base_song_iterator_t *self, song_iterator_channel_t *channel) {
+void _reset_synth_channels(base_song_iterator_t *self, song_iterator_channel_t *channel) {
int i;
byte buf[5];
tell_synth_func *tell = sfx_get_player_tell_func();
@@ -153,8 +147,7 @@
}
}
-static int
-_parse_sci_midi_command(base_song_iterator_t *self, unsigned char *buf, int *result,
+static int _parse_sci_midi_command(base_song_iterator_t *self, unsigned char *buf, int *result,
song_iterator_channel_t *channel,
int flags) {
unsigned char cmd;
@@ -363,9 +356,7 @@
}
}
-
-static int
-_sci_midi_process_state(base_song_iterator_t *self, unsigned char *buf, int *result,
+static int _sci_midi_process_state(base_song_iterator_t *self, unsigned char *buf, int *result,
song_iterator_channel_t *channel,
int flags) {
CHECK_FOR_END(0);
@@ -460,26 +451,20 @@
}
}
-static inline int
-_sci_midi_process(base_song_iterator_t *self, unsigned char *buf, int *result,
- song_iterator_channel_t *channel,
- int flags) {
+static inline int _sci_midi_process(base_song_iterator_t *self, unsigned char *buf, int *result,
+ song_iterator_channel_t *channel, int flags) {
return _sci_midi_process_state(self, buf, result,
channel,
flags);
}
-static int
-_sci0_read_next_command(sci0_song_iterator_t *self, unsigned char *buf,
- int *result) {
+static int _sci0_read_next_command(sci0_song_iterator_t *self, unsigned char *buf, int *result) {
return _sci_midi_process((base_song_iterator_t *) self, buf, result,
&(self->channel),
PARSE_FLAG_PARAMETRIC_CUE);
}
-
-static inline int
-_sci0_header_magic_p(unsigned char *data, int offset, int size) {
+static inline int _sci0_header_magic_p(unsigned char *data, int offset, int size) {
if (offset + 0x10 > size)
return 0;
return
@@ -490,8 +475,7 @@
}
-static int
-_sci0_get_pcm_data(sci0_song_iterator_t *self,
+static int _sci0_get_pcm_data(sci0_song_iterator_t *self,
sfx_pcm_config_t *format,
int *xoffset,
unsigned int *xsize) {
@@ -560,8 +544,7 @@
return 0;
}
-static sfx_pcm_feed_t *
-_sci0_check_pcm(sci0_song_iterator_t *self) {
+static sfx_pcm_feed_t *_sci0_check_pcm(sci0_song_iterator_t *self) {
sfx_pcm_config_t format;
int offset;
unsigned int size;
@@ -577,8 +560,7 @@
format);
}
-static song_iterator_t *
-_sci0_handle_message(sci0_song_iterator_t *self, song_iterator_message_t msg) {
+static song_iterator_t *_sci0_handle_message(sci0_song_iterator_t *self, song_iterator_message_t msg) {
if (msg.recipient == _SIMSG_BASE) {
switch (msg.type) {
@@ -650,13 +632,11 @@
return NULL;
}
-static int
-_sci0_get_timepos(sci0_song_iterator_t *self) {
+static int _sci0_get_timepos(sci0_song_iterator_t *self) {
return self->channel.total_timepos;
}
-static void
-_base_init_channel(song_iterator_channel_t *channel, int id, int offset,
+static void _base_init_channel(song_iterator_channel_t *channel, int id, int offset,
int end) {
channel->playmask = PLAYMASK_NONE; /* Disable all channels */
channel->id = id;
@@ -676,8 +656,7 @@
channel->saw_notes = 0;
}
-static void
-_sci0_init(sci0_song_iterator_t *self) {
+static void _sci0_init(sci0_song_iterator_t *self) {
_common_init((base_song_iterator_t *) self);
self->ccc = 0; /* Reset cumulative cue counter */
@@ -692,8 +671,7 @@
}
-static void
-_sci0_cleanup(sci0_song_iterator_t *self) {
+static void _sci0_cleanup(sci0_song_iterator_t *self) {
#ifdef DEBUG_VERBOSE
fprintf(stderr, "** FREEING it %p: data at %p\n", self, self->data);
#endif
@@ -723,8 +701,7 @@
#define SONGDATA(x) self->data[offset + (x)]
#define SCI1_CHANDATA(off) self->data[channel->offset + (off)]
-static int
-_sci1_sample_init(sci1_song_iterator_t *self, int offset) {
+static int _sci1_sample_init(sci1_song_iterator_t *self, int offset) {
sci1_sample_t *sample, **seekerp;
int rate;
int length;
@@ -771,9 +748,7 @@
return 0; /* Everything's fine */
}
-
-static int
-_sci1_song_init(sci1_song_iterator_t *self) {
+static int _sci1_song_init(sci1_song_iterator_t *self) {
sci1_sample_t *seeker;
int last_time;
unsigned int offset = 0;
@@ -882,8 +857,7 @@
#undef SONGDATA
-static inline int
-_sci1_get_smallest_delta(sci1_song_iterator_t *self) {
+static inline int _sci1_get_smallest_delta(sci1_song_iterator_t *self) {
int i, d = -1;
for (i = 0; i < self->channels_nr; i++)
if (self->channels[i].state == SI_STATE_COMMAND
@@ -896,8 +870,7 @@
return d;
}
-static inline void
-_sci1_update_delta(sci1_song_iterator_t *self, int delta) {
+static inline void _sci1_update_delta(sci1_song_iterator_t *self, int delta) {
int i;
if (self->next_sample)
@@ -908,8 +881,7 @@
self->channels[i].delay -= delta;
}
-static inline int
-_sci1_no_delta_time(sci1_song_iterator_t *self) { /* Checks that none of the channels is waiting for its delta to be read */
+static inline int _sci1_no_delta_time(sci1_song_iterator_t *self) { /* Checks that none of the channels is waiting for its delta to be read */
int i;
for (i = 0; i < self->channels_nr; i++)
@@ -921,8 +893,7 @@
#if 0
// Unreferenced - removed
-static void
-_sci1_dump_state(sci1_song_iterator_t *self) {
+static void _sci1_dump_state(sci1_song_iterator_t *self) {
int i;
sciprintf("-- [%p] ------------------------\n", self);
@@ -960,8 +931,8 @@
#define COMMAND_INDEX_NONE -1
#define COMMAND_INDEX_PCM -2
-static inline int /* Determine the channel # of the next active event, or -1 */
-_sci1_command_index(sci1_song_iterator_t *self) {
+static inline int _sci1_command_index(sci1_song_iterator_t *self) {
+ /* Determine the channel # of the next active event, or -1 */
int i;
int base_delay = 0x7ffffff;
int best_chan = COMMAND_INDEX_NONE;
@@ -988,8 +959,7 @@
}
-static sfx_pcm_feed_t *
-_sci1_get_pcm(sci1_song_iterator_t *self) {
+static sfx_pcm_feed_t *_sci1_get_pcm(sci1_song_iterator_t *self) {
if (self->next_sample
&& self->next_sample->delta <= 0) {
sci1_sample_t *sample = self->next_sample;
@@ -1008,9 +978,7 @@
return NULL;
}
-
-static int
-_sci1_process_next_command(sci1_song_iterator_t *self,
+static int _sci1_process_next_command(sci1_song_iterator_t *self,
unsigned char *buf, int *result) {
int retval = -42; /* Shouldn't happen, but gcc doesn't agree */
int chan;
@@ -1240,16 +1208,11 @@
return NULL;
}
-
-static int
-_sci1_read_next_command(sci1_song_iterator_t *self,
- unsigned char *buf, int *result) {
+static int _sci1_read_next_command(sci1_song_iterator_t *self, unsigned char *buf, int *result) {
return _sci1_process_next_command(self, buf, result);
}
-
-static void
-_sci1_init(sci1_song_iterator_t *self) {
+static void _sci1_init(sci1_song_iterator_t *self) {
_common_init((base_song_iterator_t *) self);
self->ccc = 127;
self->device_id = 0x00; /* Default to Sound Blaster/Adlib for purposes
@@ -1264,8 +1227,7 @@
memset(self->importance, 0, sizeof(self->importance));
}
-static void
-_sci1_cleanup(sci1_song_iterator_t *it) {
+static void _sci1_cleanup(sci1_song_iterator_t *it) {
sci1_sample_t *sample_seeker = it->next_sample;
while (sample_seeker) {
sci1_sample_t *old_sample = sample_seeker;
@@ -1276,8 +1238,7 @@
_sci0_cleanup((sci0_song_iterator_t *)it);
}
-static int
-_sci1_get_timepos(sci1_song_iterator_t *self) {
+static int _sci1_get_timepos(sci1_song_iterator_t *self) {
int max = 0;
int i;
@@ -1293,12 +1254,10 @@
/*****************************/
-static void
-_cleanup_iterator_init(song_iterator_t *it) {
+static void _cleanup_iterator_init(song_iterator_t *it) {
}
-static song_iterator_t *
-_cleanup_iterator_handle_message(song_iterator_t *i, song_iterator_message_t msg) {
+static song_iterator_t *_cleanup_iterator_handle_message(song_iterator_t *i, song_iterator_message_t msg) {
if (msg.recipient == _SIMSG_BASEMSG_PRINT
&& msg.type == _SIMSG_BASEMSG_PRINT) {
print_tabs_id(msg.args[0].i, i->ID);
@@ -1308,8 +1267,7 @@
return NULL;
}
-static int
-_cleanup_iterator_next(song_iterator_t *self, unsigned char *buf, int *result) {
+static int _cleanup_iterator_next(song_iterator_t *self, unsigned char *buf, int *result) {
/* Task: Return channel-notes-off for each channel */
if (self->channel_mask) {
int bs = sci_ffs(self->channel_mask) - 1;
@@ -1324,8 +1282,7 @@
return SI_FINISHED;
}
-song_iterator_t *
-new_cleanup_iterator(unsigned int channels) {
+song_iterator_t *new_cleanup_iterator(unsigned int channels) {
song_iterator_t *it = (song_iterator_t*)sci_malloc(sizeof(song_iterator_t));
it->channel_mask = channels;
it->ID = 17;
@@ -1345,8 +1302,7 @@
/*-- Fast-forward song iterator --*/
/**********************************/
-static int
-_ff_read_next_command(fast_forward_song_iterator_t *self,
+static int _ff_read_next_command(fast_forward_song_iterator_t *self,
byte *buf, int *result) {
int rv;
@@ -1370,13 +1326,11 @@
}
}
-static sfx_pcm_feed_t *
-_ff_check_pcm(fast_forward_song_iterator_t *self) {
+static sfx_pcm_feed_t *_ff_check_pcm(fast_forward_song_iterator_t *self) {
return self->delegate->get_pcm_feed(self->delegate);
}
-static song_iterator_t *
-_ff_handle_message(fast_forward_song_iterator_t *self,
+static song_iterator_t *_ff_handle_message(fast_forward_song_iterator_t *self,
song_iterator_message_t msg) {
if (msg.recipient == _SIMSG_PLASTICWRAP)
switch (msg.type) {
@@ -1420,18 +1374,15 @@
}
-static void
-_ff_init(fast_forward_song_iterator_t *self) {
+static void _ff_init(fast_forward_song_iterator_t *self) {
return;
}
-static int
-_ff_get_timepos(fast_forward_song_iterator_t *self) {
+static int _ff_get_timepos(fast_forward_song_iterator_t *self) {
return self->delegate->get_timepos(self->delegate);
}
-song_iterator_t *
-new_fast_forward_iterator(song_iterator_t *capsit, int delta) {
+song_iterator_t *new_fast_forward_iterator(song_iterator_t *capsit, int delta) {
fast_forward_song_iterator_t *it =
(fast_forward_song_iterator_t*)sci_malloc(sizeof(fast_forward_song_iterator_t));
@@ -1468,8 +1419,7 @@
/********************/
-static int
-_tee_read_next_command(tee_song_iterator_t *it, unsigned char *buf,
+static int _tee_read_next_command(tee_song_iterator_t *it, unsigned char *buf,
int *result) {
static int ready_masks[2] = {TEE_LEFT_READY, TEE_RIGHT_READY};
static int active_masks[2] = {TEE_LEFT_ACTIVE, TEE_RIGHT_ACTIVE};
@@ -1600,8 +1550,7 @@
return it->children[retid].retval;
}
-static sfx_pcm_feed_t *
-_tee_check_pcm(tee_song_iterator_t *it) {
+static sfx_pcm_feed_t *_tee_check_pcm(tee_song_iterator_t *it) {
static int pcm_masks[2] = {TEE_LEFT_PCM, TEE_RIGHT_PCM};
int i;
@@ -1616,8 +1565,7 @@
return NULL; /* No iterator */
}
-static song_iterator_t *
-_tee_handle_message(tee_song_iterator_t *self, song_iterator_message_t msg) {
+static song_iterator_t *_tee_handle_message(tee_song_iterator_t *self, song_iterator_message_t msg) {
if (msg.recipient == _SIMSG_BASE) {
switch (msg.type) {
@@ -1686,8 +1634,7 @@
return NULL;
}
-static void
-_tee_init(tee_song_iterator_t *it) {
+static void _tee_init(tee_song_iterator_t *it) {
it->status = TEE_LEFT_ACTIVE | TEE_RIGHT_ACTIVE;
it->children[TEE_LEFT].it->init(it->children[TEE_LEFT].it);
it->children[TEE_RIGHT].it->init(it->children[TEE_RIGHT].it);
@@ -1695,8 +1642,7 @@
#if 0
// Unreferenced - removed
-static void
-_tee_free(tee_song_iterator_t *it) {
+static void _tee_free(tee_song_iterator_t *it) {
int i;
for (i = TEE_LEFT; i <= TEE_RIGHT; i++)
if (it->children[i].it && it->may_destroy)
@@ -1704,8 +1650,7 @@
}
#endif
-static void
-songit_tee_death_notification(tee_song_iterator_t *self,
+static void songit_tee_death_notification(tee_song_iterator_t *self,
song_iterator_t *corpse) {
if (corpse == self->children[TEE_LEFT].it) {
self->status &= ~TEE_LEFT_ACTIVE;
@@ -1719,8 +1664,7 @@
}
-song_iterator_t *
-songit_new_tee(song_iterator_t *left, song_iterator_t *right, int may_destroy) {
+song_iterator_t *songit_new_tee(song_iterator_t *left, song_iterator_t *right, int may_destroy) {
int i;
int firstfree = 1; /* First free channel */
int incomplete_map = 0;
@@ -1813,8 +1757,7 @@
/*-- General purpose functionality --*/
/*************************************/
-int
-songit_next(song_iterator_t **it, unsigned char *buf, int *result, int mask) {
+int songit_next(song_iterator_t **it, unsigned char *buf, int *result, int mask) {
int retval;
if (!*it)
@@ -1865,10 +1808,7 @@
return retval;
}
-
-
-song_iterator_t *
-songit_new(unsigned char *data, unsigned int size, int type, songit_id_t id) {
+song_iterator_t *songit_new(unsigned char *data, unsigned int size, int type, songit_id_t id) {
base_song_iterator_t *it;
int i;
@@ -1939,8 +1879,7 @@
return (song_iterator_t *) it;
}
-void
-songit_free(song_iterator_t *it) {
+void songit_free(song_iterator_t *it) {
if (it) {
int i;
@@ -1954,8 +1893,7 @@
}
}
-song_iterator_message_t
-songit_make_message(songit_id_t id, int recipient, int type, int a1, int a2) {
+song_iterator_message_t songit_make_message(songit_id_t id, int recipient, int type, int a1, int a2) {
song_iterator_message_t rv;
rv.ID = id;
rv.recipient = recipient;
@@ -1966,8 +1904,7 @@
return rv;
}
-song_iterator_message_t
-songit_make_ptr_message(songit_id_t id, int recipient, int type, void * a1, int a2) {
+song_iterator_message_t songit_make_ptr_message(songit_id_t id, int recipient, int type, void * a1, int a2) {
song_iterator_message_t rv;
rv.ID = id;
rv.recipient = recipient;
@@ -1978,9 +1915,7 @@
return rv;
}
-
-int
-songit_handle_message(song_iterator_t **it_reg_p, song_iterator_message_t msg) {
+int songit_handle_message(song_iterator_t **it_reg_p, song_iterator_message_t msg) {
song_iterator_t *it = *it_reg_p;
song_iterator_t *newit;
@@ -1993,16 +1928,14 @@
return 1;
}
-song_iterator_t *
-songit_clone(song_iterator_t *it, int delta) {
+song_iterator_t *songit_clone(song_iterator_t *it, int delta) {
SIMSG_SEND(it, SIMSG_CLONE(delta));
it->death_listeners_nr = 0;
it->flags |= SONGIT_FLAG_CLONE;
return it;
}
-void
-song_iterator_add_death_listener(song_iterator_t *it,
+void song_iterator_add_death_listener(song_iterator_t *it,
void *client,
void (*notify)(void *self, void *notifier)) {
if (it->death_listeners_nr >= SONGIT_MAX_LISTENERS) {
@@ -2018,8 +1951,7 @@
it->death_listeners_nr++;
}
-void
-song_iterator_remove_death_listener(song_iterator_t *it,
+void song_iterator_remove_death_listener(song_iterator_t *it,
void *client) {
int i;
for (i = 0; i < it->death_listeners_nr; i++) {
@@ -2042,8 +1974,7 @@
}
-song_iterator_t *
-sfx_iterator_combine(song_iterator_t *it1, song_iterator_t *it2) {
+song_iterator_t *sfx_iterator_combine(song_iterator_t *it1, song_iterator_t *it2) {
if (it1 == NULL)
return it2;
if (it2 == NULL)
Modified: scummvm/trunk/engines/sci/sfx/mixer.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/mixer.h 2009-02-21 16:08:04 UTC (rev 38705)
+++ scummvm/trunk/engines/sci/sfx/mixer.h 2009-02-21 16:20:53 UTC (rev 38706)
@@ -114,8 +114,7 @@
void *private_bits;
} sfx_pcm_mixer_t;
-sfx_pcm_mixer_t *
-sfx_pcm_find_mixer(char *name);
+sfx_pcm_mixer_t *sfx_pcm_find_mixer(char *name);
/* Looks up a mixer by name, or a default mixer
** Parameters: (char *) name: Name of the mixer to look for, or NULL to
** take a default
Modified: scummvm/trunk/engines/sci/sfx/pcm-iterator.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/pcm-iterator.cpp 2009-02-21 16:08:04 UTC (rev 38705)
+++ scummvm/trunk/engines/sci/sfx/pcm-iterator.cpp 2009-02-21 16:20:53 UTC (rev 38706)
@@ -31,10 +31,8 @@
#define D ((pcm_data_internal_t *)self->internal)
-static int
-pi_poll(sfx_pcm_feed_t *self, byte *dest, int size);
-static void
-pi_destroy(sfx_pcm_feed_t *self);
+static int pi_poll(sfx_pcm_feed_t *self, byte *dest, int size);
+static void pi_destroy(sfx_pcm_feed_t *self);
typedef struct {
byte *base_data;
@@ -55,11 +53,7 @@
};
-sfx_pcm_feed_t *
-sfx_iterator_make_feed(byte *base_data,
- int offset,
- int size,
- sfx_pcm_config_t conf) {
+sfx_pcm_feed_t *sfx_iterator_make_feed(byte *base_data, int offset, int size, sfx_pcm_config_t conf) {
sfx_pcm_feed_t *feed;
pcm_data_internal_t *idat;
byte *data = base_data + offset;
@@ -83,8 +77,7 @@
}
-static int
-pi_poll(sfx_pcm_feed_t *self, byte *dest, int size) {
+static int pi_poll(sfx_pcm_feed_t *self, byte *dest, int size) {
int data_len;
if (size >= D->frames_left)
@@ -104,8 +97,7 @@
return size;
}
-static void
-pi_destroy(sfx_pcm_feed_t *self) {
+static void pi_destroy(sfx_pcm_feed_t *self) {
sci_refcount_decref(D->base_data);
free(D);
free(self);
Modified: scummvm/trunk/engines/sci/sfx/sequencer.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/sequencer.h 2009-02-21 16:08:04 UTC (rev 38705)
+++ scummvm/trunk/engines/sci/sfx/sequencer.h 2009-02-21 16:20:53 UTC (rev 38706)
@@ -45,16 +45,14 @@
int device; /* Type of device the sequencer depends on, may be SFX_DEVICE_NONE. */
- int
- (*set_option)(char *name, char *value);
+ int (*set_option)(char *name, char *value);
/* Sets an option for the sequencing mechanism
** Parameters: (char *) name: The name describing what to set
** (char *) value: The value to set
** Returns : (int) SFX_OK, or SFX_ERROR if the name wasn't understood
*/
- int
- (*open)(int patch_len, byte *patch, int patch2_len, byte *patch2, void *device);
+ int (*open)(int patch_len, byte *patch, int patch2_len, byte *patch2, void *device);
/* Opens the sequencer for writing
** Parameters: (int) patch_len, patch2_len: Length of the patch data
** (byte *) patch, patch2: Bulk patch data
@@ -136,8 +134,7 @@
} sfx_sequencer_t;
-sfx_sequencer_t *
-sfx_find_sequencer(char *name);
+sfx_sequencer_t *sfx_find_sequencer(char *name);
/* Finds a sequencer by name
** Parameters: (char *) name: Name of the sequencer to look up, or NULL for default
** Returns : (sfx_sequencer_t *) The sequencer of matching name, or NULL
Modified: scummvm/trunk/engines/sci/sfx/softseq.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/softseq.h 2009-02-21 16:08:04 UTC (rev 38705)
+++ scummvm/trunk/engines/sci/sfx/softseq.h 2009-02-21 16:20:53 UTC (rev 38706)
@@ -38,8 +38,7 @@
const char *name;
const char *version;
- int
- (*set_option)(struct sfx_softseq *self, const char *name, const char *value);
+ int (*set_option)(struct sfx_softseq *self, const char *name, const char *value);
/* Sets an option for the sequencer
** Parameters: (sfx_softseq_t *) self: Self reference
** (const char *) name: Name of the option to set
@@ -47,8 +46,7 @@
** Returns : (int) GFX_OK on success, or GFX_ERROR if not supported
*/
- int
- (*init)(struct sfx_softseq *self, byte *res_data, int res_size,
+ int (*init)(struct sfx_softseq *self, byte *res_data, int res_size,
byte *res2_data, int res2_size);
/* Initialises the sequencer
** Parameters: (sfx_softseq_t *) self: Self reference
@@ -63,21 +61,18 @@
** /even if/ patch_nr is set.
*/
- void
- (*exit)(struct sfx_softseq *self);
+ void (*exit)(struct sfx_softseq *self);
/* Uninitialises the sequencer and frees all used resources
** Parameters: (sfx_softseq_t *) self: Self reference
*/
- void
- (*set_volume)(struct sfx_softseq *self, int new_volume);
+ void (*set_volume)(struct sfx_softseq *self, int new_volume);
/* Sets the sequencer volume
** Parameters: (sfx_softseq_t *) self: Self reference
** (int) new_volume: A volume, between 0 (quiet) and 127 (max)
*/
- void
- (*handle_command)(struct sfx_softseq *self, byte cmd, int argc, byte *argv);
+ void (*handle_command)(struct sfx_softseq *self, byte cmd, int argc, byte *argv);
/* Handle a MIDI command
** Parameters: (sfx_softseq_t *) self: Self reference
** (byte) cmd: Basic MIDI command, always includes command and channel
@@ -85,16 +80,14 @@
** (byte *) argv: Additional arguments to 'cmd'
*/
- void
- (*poll)(struct sfx_softseq *self, byte *dest, int len);
+ void (*poll)(struct sfx_softseq *self, byte *dest, int len);
/* Asks the software sequencer to fill in parts of a buffer
** Parameters: (sfx_softseq_t *) self: Self reference
** (int) len: Number of _frames_ to write
** Returns : (byte) *dest: 'len' frames must be written to this buffer
*/
- void
- (*allstop)(struct sfx_softseq *self);
+ void (*allstop)(struct sfx_softseq *self);
/* Stops all sound generation
** Parameters: (sfx_softseq_t *) self: Self reference
*/
@@ -121,8 +114,7 @@
} sfx_softseq_t;
-sfx_softseq_t *
-sfx_find_softseq(const char *name);
+sfx_softseq_t *sfx_find_softseq(const char *name);
/* Finds a given or default software sequencer
** Parameters: (const char *) name: Name of the sequencer to look up, or NULL for default
** Returns : (sfx_softseq_t *) The requested sequencer, or NULL if not found
Modified: scummvm/trunk/engines/sci/sfx/songlib.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/songlib.cpp 2009-02-21 16:08:04 UTC (rev 38705)
+++ scummvm/trunk/engines/sci/sfx/songlib.cpp 2009-02-21 16:20:53 UTC (rev 38706)
@@ -31,8 +31,7 @@
#define debug_stream stderr
-GTimeVal
-song_sleep_time(GTimeVal *lastslept, long ticks) {
+GTimeVal song_sleep_time(GTimeVal *lastslept, long ticks) {
GTimeVal tv;
long timetosleep;
long timeslept; /* Time already slept */
@@ -54,8 +53,7 @@
}
-GTimeVal
-song_next_wakeup_time(GTimeVal *lastslept, long ticks) {
+GTimeVal song_next_wakeup_time(GTimeVal *lastslept, long ticks) {
GTimeVal retval;
retval.tv_sec = lastslept->tv_sec + (ticks / 60);
@@ -70,8 +68,7 @@
}
-song_t *
-song_new(song_handle_t handle, song_iterator_t *it, int priority) {
+song_t *song_new(song_handle_t handle, song_iterator_t *it, int priority) {
song_t *retval;
retval = (song_t*) sci_malloc(sizeof(song_t));
@@ -93,9 +90,7 @@
return retval;
}
-
-void
-song_lib_add(songlib_t songlib, song_t *song) {
+void song_lib_add(songlib_t songlib, song_t *song) {
song_t **seeker = NULL;
int pri = song->priority;
@@ -119,8 +114,8 @@
*seeker = song;
}
-static void /* Recursively free a chain of songs */
-_songfree_chain(song_t *song) {
+static void _songfree_chain(song_t *song) {
+ /* Recursively free a chain of songs */
if (song) {
_songfree_chain(song->next);
songit_free(song->it);
@@ -129,22 +124,18 @@
}
}
-
-void
-song_lib_init(songlib_t *songlib) {
+void song_lib_init(songlib_t *songlib) {
songlib->lib = &(songlib->_s);
songlib->_s = NULL;
}
-void
-song_lib_free(songlib_t songlib) {
+void song_lib_free(songlib_t songlib) {
_songfree_chain(*(songlib.lib));
*(songlib.lib) = NULL;
}
-song_t *
-song_lib_find(songlib_t songlib, song_handle_t handle) {
+song_t *song_lib_find(songlib_t songlib, song_handle_t handle) {
song_t *seeker = *(songlib.lib);
while (seeker) {
@@ -156,9 +147,7 @@
return seeker;
}
-
-song_t *
-song_lib_find_next_active(songlib_t songlib, song_t *other) {
+song_t *song_lib_find_next_active(songlib_t songlib, song_t *other) {
song_t *seeker = other ? other->next : *(songlib.lib);
while (seeker) {
@@ -175,13 +164,11 @@
return seeker;
}
-song_t *
-song_lib_find_active(songlib_t songlib) {
+song_t *song_lib_find_active(songlib_t songlib) {
return song_lib_find_next_active(songlib, NULL);
}
-int
-song_lib_remove(songlib_t songlib, song_handle_t handle) {
+int song_lib_remove(songlib_t songlib, song_handle_t handle) {
int retval;
song_t *goner = *(songlib.lib);
@@ -211,8 +198,7 @@
return retval;
}
-void
-song_lib_resort(songlib_t songlib, song_t *song) {
+void song_lib_resort(songlib_t songlib, song_t *song) {
if (*(songlib.lib) == song)
*(songlib.lib) = song->next;
else {
@@ -228,8 +214,7 @@
song_lib_add(songlib, song);
}
-int
-song_lib_count(songlib_t songlib) {
+int song_lib_count(songlib_t songlib) {
song_t *seeker = *(songlib.lib);
int retval = 0;
@@ -241,15 +226,13 @@
return retval;
}
-void
-song_lib_set_restore_behavior(songlib_t songlib, song_handle_t handle, RESTORE_BEHAVIOR action) {
+void song_lib_set_restore_behavior(songlib_t songlib, song_handle_t handle, RESTORE_BEHAVIOR action) {
song_t *seeker = song_lib_find(songlib, handle);
seeker->restore_behavior = action;
}
-void
-song_lib_dump(songlib_t songlib, int line) {
+void song_lib_dump(songlib_t songlib, int line) {
song_t *seeker = *(songlib.lib);
fprintf(debug_stream, "L%d:", line);
Modified: scummvm/trunk/engines/sci/sfx/time.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/time.cpp 2009-02-21 16:08:04 UTC (rev 38705)
+++ scummvm/trunk/engines/sci/sfx/time.cpp 2009-02-21 16:20:53 UTC (rev 38706)
@@ -28,8 +28,7 @@
namespace Sci {
-sfx_timestamp_t
-sfx_new_timestamp(long secs, long usecs, int frame_rate) {
+sfx_timestamp_t sfx_new_timestamp(long secs, long usecs, int frame_rate) {
sfx_timestamp_t r;
r.secs = secs;
r.usecs = usecs;
@@ -39,9 +38,7 @@
return r;
}
-
-sfx_timestamp_t
-sfx_timestamp_add(sfx_timestamp_t timestamp, int frames) {
+sfx_timestamp_t sfx_timestamp_add(sfx_timestamp_t timestamp, int frames) {
timestamp.frame_offset += frames;
if (timestamp.frame_offset < 0) {
@@ -57,8 +54,7 @@
return timestamp;
}
-int
-sfx_timestamp_frame_diff(sfx_timestamp_t a, sfx_timestamp_t b) {
+int sfx_timestamp_frame_diff(sfx_timestamp_t a, sfx_timestamp_t b) {
long usecdelta = 0;
if (a.frame_rate != b.frame_rate) {
@@ -81,8 +77,7 @@
+ a.frame_offset - b.frame_offset;
}
-long
-sfx_timestamp_usecs_diff(sfx_timestamp_t t1, sfx_timestamp_t t2) {
+long sfx_timestamp_usecs_diff(sfx_timestamp_t t1, sfx_timestamp_t t2) {
long secs1, secs2;
long usecs1, usecs2;
@@ -92,8 +87,7 @@
return (usecs1 - usecs2) + ((secs1 - secs2) * 1000000);
}
-sfx_timestamp_t
-sfx_timestamp_renormalise(sfx_timestamp_t timestamp, int new_freq) {
+sfx_timestamp_t sfx_timestamp_renormalise(sfx_timestamp_t timestamp, int new_freq) {
sfx_timestamp_t r;
sfx_timestamp_gettime(×tamp, &r.secs, &r.usecs);
r.frame_rate = new_freq;
@@ -102,8 +96,7 @@
return r;
}
-void
-sfx_timestamp_gettime(sfx_timestamp_t *timestamp, long *secs, long *usecs) {
+void sfx_timestamp_gettime(sfx_timestamp_t *timestamp, long *secs, long *usecs) {
long ust = timestamp->usecs;
/* On 64 bit machines, we can do an accurate computation */
#if (SIZEOF_LONG >= 8)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list