From 9199982c4afece3a041bc5d8d962b7b3c91399e9 Mon Sep 17 00:00:00 2001 From: Angel Ortega Date: Tue, 1 Feb 2011 16:32:10 +0100 Subject: [PATCH] More reformatting. --- main.c | 48 ++++++++++++++++++++++++++++++++---------------- midiin.c | 3 ++- ss_eff.c | 3 ++- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/main.c b/main.c index 35b32c7..a6868de 100644 --- a/main.c +++ b/main.c @@ -139,7 +139,8 @@ static int main_ss(char *script) if (compile_ahs_string(tmp)) return 4; } - else if (compile_ahs(script)) + else + if (compile_ahs(script)) return 3; ss_song_render(skip_secs, driver, devfile); @@ -183,47 +184,58 @@ static int ahxm_main(int argc, char *argv[]) /* set output device or file */ devfile = argv[n++]; } - else if (strcmp(opt, "-d") == 0) { + else + if (strcmp(opt, "-d") == 0) { /* set driver */ driver = argv[n++]; } - else if (strcmp(opt, "-L") == 0) { + else + if (strcmp(opt, "-L") == 0) { /* add path to library */ libpath_add(argv[n++], 0); } - else if (strcmp(opt, "-r") == 0) { + else + if (strcmp(opt, "-r") == 0) { /* set sampling rate */ ss_frequency = atoi(argv[n++]); } - else if (strcmp(opt, "-c") == 0) { + else + if (strcmp(opt, "-c") == 0) { /* set number of channels */ ss_nchannels = atoi(argv[n++]); } - else if (strcmp(opt, "-v") == 0) { + else + if (strcmp(opt, "-v") == 0) { /* set master volume */ ss_master_volume = (double) atof(argv[n++]); } - else if (strcmp(opt, "-i") == 0) { + else + if (strcmp(opt, "-i") == 0) { /* set interpolation type */ ss_interpolation = atoi(argv[n++]); } - else if (strcmp(opt, "-s") == 0) { + else + if (strcmp(opt, "-s") == 0) { /* seconds to skip */ skip_secs = atoi(argv[n++]); } - else if (strcmp(opt, "-I") == 0) { + else + if (strcmp(opt, "-I") == 0) { /* activate interactive mode */ interactive = 1; } - else if (strcmp(opt, "-M") == 0) { + else + if (strcmp(opt, "-M") == 0) { /* activate MIDI mode */ midi = 1; } - else if (strcmp(opt, "-z") == 0) { + else + if (strcmp(opt, "-z") == 0) { /* set solo track */ solo_track = atoi(argv[n++]); } - else if (strcmp(opt, "-b") == 0) { + else + if (strcmp(opt, "-b") == 0) { /* set page size */ ss_page_size = atoi(argv[n++]); @@ -231,15 +243,18 @@ static int ahxm_main(int argc, char *argv[]) if (ss_page_size < 0) ss_page_size = INT_MAX; } - else if (strcmp(opt, "-D") == 0) { + else + if (strcmp(opt, "-D") == 0) { /* debug information */ verbose = atoi(argv[n++]); } - else if (strcmp(opt, "-C") == 0) { + else + if (strcmp(opt, "-C") == 0) { /* set cue file name */ ss_cue_file_name = argv[n++]; } - else if (strcmp(opt, "-T") == 0) + else + if (strcmp(opt, "-T") == 0) trace = 1; else return main_usage(); @@ -252,7 +267,8 @@ static int ahxm_main(int argc, char *argv[]) if (interactive) ret = main_interactive(script); - else if (midi) + else + if (midi) ret = main_midi(script); else ret = main_ss(script); diff --git a/midiin.c b/midiin.c index cad5054..9cd5c94 100644 --- a/midiin.c +++ b/midiin.c @@ -98,7 +98,8 @@ void process_MIDI(void) if (midimsg[0] == MIDI_NOTE_OFF) ss_ins_note_off(&ss_song_ins[0], midimsg[1]); - else if (midimsg[0] == MIDI_NOTE_ON) { + else + if (midimsg[0] == MIDI_NOTE_ON) { ss_ins_note_on(&ss_song_ins[0], midimsg[1], ((sample_t) midimsg[2]) / 127.0, midimsg[1]); diff --git a/ss_eff.c b/ss_eff.c index 83e4ab0..df5da03 100644 --- a/ss_eff.c +++ b/ss_eff.c @@ -489,7 +489,8 @@ static sample_t func_foldback(struct ss_eff *e, sample_t input) /* http://www.musicdsp.org/archive.php?classid=4#203 */ if (input > e->gain) s = e->gain - (input - e->gain); - else if (input < -e->gain) + else + if (input < -e->gain) s = -e->gain + (-e->gain - input); return s; -- 2.11.4.GIT