aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sfx/seq/gm.cpp
diff options
context:
space:
mode:
authorMax Horn2009-02-15 22:34:41 +0000
committerMax Horn2009-02-15 22:34:41 +0000
commit29611bc7ead4d3d5fc9df63c04dd9e2577805557 (patch)
tree42d26aab7ab2e7e97fe5b4763281d8071d878eed /engines/sci/sfx/seq/gm.cpp
parent921e6ff5cf3944c1a62a3ad9a91c29bb21aa9942 (diff)
downloadscummvm-rg350-29611bc7ead4d3d5fc9df63c04dd9e2577805557.tar.gz
scummvm-rg350-29611bc7ead4d3d5fc9df63c04dd9e2577805557.tar.bz2
scummvm-rg350-29611bc7ead4d3d5fc9df63c04dd9e2577805557.zip
SCI: Run astyle to make the code be more compliant with our Code Formatting Guidelines: sfx dir
svn-id: r38322
Diffstat (limited to 'engines/sci/sfx/seq/gm.cpp')
-rw-r--r--engines/sci/sfx/seq/gm.cpp42
1 files changed, 18 insertions, 24 deletions
diff --git a/engines/sci/sfx/seq/gm.cpp b/engines/sci/sfx/seq/gm.cpp
index 4889e76ea8..ecd459236d 100644
--- a/engines/sci/sfx/seq/gm.cpp
+++ b/engines/sci/sfx/seq/gm.cpp
@@ -40,8 +40,7 @@
static midi_writer_t *writer = NULL;
static int
-midi_gm_open(int patch_len, byte *data, int patch2_len, byte *data2, void *device)
-{
+midi_gm_open(int patch_len, byte *data, int patch2_len, byte *data2, void *device) {
sfx_instrument_map_t *instrument_map = sfx_instrument_map_load_sci(data, patch_len);
if (!instrument_map) {
@@ -61,17 +60,15 @@ midi_gm_open(int patch_len, byte *data, int patch2_len, byte *data2, void *devic
}
static int
-midi_gm_close(void)
-{
+midi_gm_close(void) {
return SFX_OK;
}
static int
-midi_gm_event(byte command, int argc, byte *argv)
-{
+midi_gm_event(byte command, int argc, byte *argv) {
byte data[4];
- assert (argc < 4);
+ assert(argc < 4);
data[0] = command;
memcpy(data + 1, argv, argc);
@@ -81,16 +78,14 @@ midi_gm_event(byte command, int argc, byte *argv)
}
static int
-midi_gm_delay(int ticks)
-{
+midi_gm_delay(int ticks) {
writer->delay(writer, ticks);
return SFX_OK;
}
static int
-midi_gm_reset_timer(GTimeVal ts)
-{
+midi_gm_reset_timer(GTimeVal ts) {
writer->reset_timer(writer);
return SFX_OK;
@@ -99,8 +94,7 @@ midi_gm_reset_timer(GTimeVal ts)
#define MIDI_MASTER_VOLUME_LEN 8
static int
-midi_gm_volume(guint8 volume)
-{
+midi_gm_volume(guint8 volume) {
byte data[MIDI_MASTER_VOLUME_LEN] = {
0xf0,
0x7f,
@@ -109,7 +103,8 @@ midi_gm_volume(guint8 volume)
0x01,
volume,
volume,
- 0xf7};
+ 0xf7
+ };
writer->write(writer, data, MIDI_MASTER_VOLUME_LEN);
if (writer->flush)
@@ -119,11 +114,11 @@ midi_gm_volume(guint8 volume)
}
static int
-midi_gm_allstop(void)
-{
+midi_gm_allstop(void) {
byte data[3] = { 0xb0,
- 0x78, /* all sound off */
- 0 };
+ 0x78, /* all sound off */
+ 0
+ };
int i;
/* All sound off on all channels */
@@ -138,11 +133,11 @@ midi_gm_allstop(void)
}
static int
-midi_gm_reverb(int reverb)
-{
+midi_gm_reverb(int reverb) {
byte data[3] = { 0xb0,
- 91, /* set reverb */
- reverb };
+ 91, /* set reverb */
+ reverb
+ };
int i;
/* Set reverb on all channels */
@@ -158,8 +153,7 @@ midi_gm_reverb(int reverb)
}
static int
-midi_gm_set_option(char *x, char *y)
-{
+midi_gm_set_option(char *x, char *y) {
return SFX_ERROR;
}