diff options
author | Eugene Sandulenko | 2009-02-27 12:59:02 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2009-02-27 12:59:02 +0000 |
commit | d53c75fc8f816a150db1e160b29f25b8ba6df25c (patch) | |
tree | c044a65cc7bb2beb2b3ba278ebd202dfa5335b7d /engines/sci/sfx/mixer | |
parent | 4042eb8259cbd06f9516b2460508e230ec46dd8c (diff) | |
download | scummvm-rg350-d53c75fc8f816a150db1e160b29f25b8ba6df25c.tar.gz scummvm-rg350-d53c75fc8f816a150db1e160b29f25b8ba6df25c.tar.bz2 scummvm-rg350-d53c75fc8f816a150db1e160b29f25b8ba6df25c.zip |
Fix code formatting
svn-id: r38930
Diffstat (limited to 'engines/sci/sfx/mixer')
-rw-r--r-- | engines/sci/sfx/mixer/soft.cpp | 5 | ||||
-rw-r--r-- | engines/sci/sfx/mixer/test.cpp | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/engines/sci/sfx/mixer/soft.cpp b/engines/sci/sfx/mixer/soft.cpp index 05812e7aaf..53e4d94399 100644 --- a/engines/sci/sfx/mixer/soft.cpp +++ b/engines/sci/sfx/mixer/soft.cpp @@ -352,12 +352,11 @@ static inline void mix_swap_buffers(sfx_pcm_mixer_t *self) { /* Swap buffers */ P->writebuf = tmp; } -static inline int mix_compute_buf_len(sfx_pcm_mixer_t *self, int *skip_frames) +static inline int mix_compute_buf_len(sfx_pcm_mixer_t *self, int *skip_frames) { /* Computes the number of frames we ought to write. It tries to minimise the number, ** in order to reduce latency. */ /* It sets 'skip_frames' to the number of frames to assume lost by latency, effectively ** skipping them. */ -{ int free_frames; int played_frames = 0; /* since the last call */ uint32 msecs; @@ -922,6 +921,6 @@ sfx_pcm_mixer_t sfx_pcm_mixer_soft_linear = { NULL }; -sfx_pcm_mixer_t* getMixer() { return &sfx_pcm_mixer_soft_linear; } +sfx_pcm_mixer_t *getMixer() { return &sfx_pcm_mixer_soft_linear; } } // End of namespace Sci diff --git a/engines/sci/sfx/mixer/test.cpp b/engines/sci/sfx/mixer/test.cpp index 52102ba81b..8d7f31e059 100644 --- a/engines/sci/sfx/mixer/test.cpp +++ b/engines/sci/sfx/mixer/test.cpp @@ -230,15 +230,13 @@ sample_feed_t sample_feeds[FEEDS_NR] = { #endif }; -void -feed_destroy(sfx_pcm_feed_t *self) { +void feed_destroy(sfx_pcm_feed_t *self) { int_struct *s = (int_struct *) self->internal; s->i = 0; /* reset */ } -int -feed_poll(sfx_pcm_feed_t *self, byte *dest, int size) { +int feed_poll(sfx_pcm_feed_t *self, byte *dest, int size) { int_struct *s = (int_struct *) self->internal; int sample_size = self->sample_size; sample_feed_t *data = &(sample_feeds[self->debug_nr]); @@ -292,8 +290,7 @@ extern FILE *con_file; #define DELAY usleep((rand() / (RAND_MAX / 250L))) -int -main(int argc, char **argv) { +int main(int argc, char **argv) { int dev_nr; mix = sfx_pcm_find_mixer(NULL); |