From 3dad5f2940516023a6459f22028c55a9a5742949 Mon Sep 17 00:00:00 2001 From: 8tab <8tab@wp.pl> Date: Sat, 25 Jan 2014 21:27:28 +0100 Subject: [PATCH] fixed code formatting --- plugins/ladspa_effect/tap/tap_rotspeak.c | 204 +++++++++++------------ plugins/ladspa_effect/tap/tap_vibrato.c | 8 +- src/core/audio/AudioFileOgg.cpp | 4 +- 3 files changed, 108 insertions(+), 108 deletions(-) diff --git a/plugins/ladspa_effect/tap/tap_rotspeak.c b/plugins/ladspa_effect/tap/tap_rotspeak.c index 5b60b1b42..7aa09d648 100644 --- a/plugins/ladspa_effect/tap/tap_rotspeak.c +++ b/plugins/ladspa_effect/tap/tap_rotspeak.c @@ -125,120 +125,120 @@ instantiate_RotSpkr(const LADSPA_Descriptor * Descriptor, LADSPA_Handle * ptr; if ((ptr = malloc(sizeof(RotSpkr))) != NULL) { - RotSpkr* rotSpeak = (RotSpkr*)ptr; + RotSpkr* rotSpeak = (RotSpkr*)ptr; rotSpeak->sample_rate = sample_rate; rotSpeak->run_adding_gain = 1.0; - if ((rotSpeak->ringbuffer_h_L = - calloc(2 * PM_DEPTH, sizeof(LADSPA_Data))) == NULL) - { - free(ptr); - return NULL; - } - if ((((RotSpkr *)ptr)->ringbuffer_h_R = - calloc(2 * PM_DEPTH, sizeof(LADSPA_Data))) == NULL) - { - free(rotSpeak->ringbuffer_h_L); - free(ptr); - return NULL; - } - rotSpeak->buflen_h_L = ceil(0.3f * sample_rate / M_PI); - rotSpeak->buflen_h_R = ceil(0.3f * sample_rate / M_PI); - rotSpeak->pos_h_L = 0; - rotSpeak->pos_h_R = 0; + if ((rotSpeak->ringbuffer_h_L = + calloc(2 * PM_DEPTH, sizeof(LADSPA_Data))) == NULL) + { + free(ptr); + return NULL; + } + if ((((RotSpkr *)ptr)->ringbuffer_h_R = + calloc(2 * PM_DEPTH, sizeof(LADSPA_Data))) == NULL) + { + free(rotSpeak->ringbuffer_h_L); + free(ptr); + return NULL; + } + rotSpeak->buflen_h_L = ceil(0.3f * sample_rate / M_PI); + rotSpeak->buflen_h_R = ceil(0.3f * sample_rate / M_PI); + rotSpeak->pos_h_L = 0; + rotSpeak->pos_h_R = 0; - if ((rotSpeak->ringbuffer_b_L = - calloc(2 * PM_DEPTH, sizeof(LADSPA_Data))) == NULL) - { - free(rotSpeak->ringbuffer_h_L); - free(rotSpeak->ringbuffer_h_R); - free(ptr); - return NULL; - } - if ((rotSpeak->ringbuffer_b_R = - calloc(2 * PM_DEPTH, sizeof(LADSPA_Data))) == NULL) - { - free(rotSpeak->ringbuffer_h_L); - free(rotSpeak->ringbuffer_h_R); - free(rotSpeak->ringbuffer_b_L); - free(ptr); - return NULL; - } - rotSpeak->buflen_b_L = ceil(0.3f * sample_rate / M_PI); - rotSpeak->buflen_b_R = ceil(0.3f * sample_rate / M_PI); - rotSpeak->pos_b_L = 0; - rotSpeak->pos_b_R = 0; + if ((rotSpeak->ringbuffer_b_L = + calloc(2 * PM_DEPTH, sizeof(LADSPA_Data))) == NULL) + { + free(rotSpeak->ringbuffer_h_L); + free(rotSpeak->ringbuffer_h_R); + free(ptr); + return NULL; + } + if ((rotSpeak->ringbuffer_b_R = + calloc(2 * PM_DEPTH, sizeof(LADSPA_Data))) == NULL) + { + free(rotSpeak->ringbuffer_h_L); + free(rotSpeak->ringbuffer_h_R); + free(rotSpeak->ringbuffer_b_L); + free(ptr); + return NULL; + } + rotSpeak->buflen_b_L = ceil(0.3f * sample_rate / M_PI); + rotSpeak->buflen_b_R = ceil(0.3f * sample_rate / M_PI); + rotSpeak->pos_b_L = 0; + rotSpeak->pos_b_R = 0; if ((rotSpeak->eq_filter_L = calloc(1, sizeof(biquad))) == NULL) - { - free(rotSpeak->ringbuffer_h_L); - free(rotSpeak->ringbuffer_h_R); - free(rotSpeak->ringbuffer_b_L); - free(rotSpeak->ringbuffer_b_R); - free(ptr); - return NULL; - } + { + free(rotSpeak->ringbuffer_h_L); + free(rotSpeak->ringbuffer_h_R); + free(rotSpeak->ringbuffer_b_L); + free(rotSpeak->ringbuffer_b_R); + free(ptr); + return NULL; + } if ((rotSpeak->lp_filter_L = calloc(1, sizeof(biquad))) == NULL) - { - free(rotSpeak->ringbuffer_h_L); - free(rotSpeak->ringbuffer_h_R); - free(rotSpeak->ringbuffer_b_L); - free(rotSpeak->ringbuffer_b_R); - free(rotSpeak->eq_filter_L); - free(ptr); - return NULL; - } + { + free(rotSpeak->ringbuffer_h_L); + free(rotSpeak->ringbuffer_h_R); + free(rotSpeak->ringbuffer_b_L); + free(rotSpeak->ringbuffer_b_R); + free(rotSpeak->eq_filter_L); + free(ptr); + return NULL; + } if ((rotSpeak->hp_filter_L = calloc(1, sizeof(biquad))) == NULL) - { - free(rotSpeak->ringbuffer_h_L); - free(rotSpeak->ringbuffer_h_R); - free(rotSpeak->ringbuffer_b_L); - free(rotSpeak->ringbuffer_b_R); - free(rotSpeak->eq_filter_L); - free(rotSpeak->lp_filter_L); - free(ptr); - return NULL; - } + { + free(rotSpeak->ringbuffer_h_L); + free(rotSpeak->ringbuffer_h_R); + free(rotSpeak->ringbuffer_b_L); + free(rotSpeak->ringbuffer_b_R); + free(rotSpeak->eq_filter_L); + free(rotSpeak->lp_filter_L); + free(ptr); + return NULL; + } if ((rotSpeak->eq_filter_R = calloc(1, sizeof(biquad))) == NULL) - { - free(rotSpeak->ringbuffer_h_L); - free(rotSpeak->ringbuffer_h_R); - free(rotSpeak->ringbuffer_b_L); - free(rotSpeak->ringbuffer_b_R); - free(rotSpeak->eq_filter_L); - free(rotSpeak->lp_filter_L); - free(rotSpeak->hp_filter_L); - free(ptr); - return NULL; - } + { + free(rotSpeak->ringbuffer_h_L); + free(rotSpeak->ringbuffer_h_R); + free(rotSpeak->ringbuffer_b_L); + free(rotSpeak->ringbuffer_b_R); + free(rotSpeak->eq_filter_L); + free(rotSpeak->lp_filter_L); + free(rotSpeak->hp_filter_L); + free(ptr); + return NULL; + } if ((rotSpeak->lp_filter_R = calloc(1, sizeof(biquad))) == NULL) - { - free(rotSpeak->ringbuffer_h_L); - free(rotSpeak->ringbuffer_h_R); - free(rotSpeak->ringbuffer_b_L); - free(rotSpeak->ringbuffer_b_R); - free(rotSpeak->eq_filter_L); - free(rotSpeak->lp_filter_L); - free(rotSpeak->hp_filter_L); - free(rotSpeak->eq_filter_R); - free(ptr); - return NULL; - } + { + free(rotSpeak->ringbuffer_h_L); + free(rotSpeak->ringbuffer_h_R); + free(rotSpeak->ringbuffer_b_L); + free(rotSpeak->ringbuffer_b_R); + free(rotSpeak->eq_filter_L); + free(rotSpeak->lp_filter_L); + free(rotSpeak->hp_filter_L); + free(rotSpeak->eq_filter_R); + free(ptr); + return NULL; + } if ((rotSpeak->hp_filter_R = calloc(1, sizeof(biquad))) == NULL) - { - free(rotSpeak->ringbuffer_h_L); - free(rotSpeak->ringbuffer_h_R); - free(rotSpeak->ringbuffer_b_L); - free(rotSpeak->ringbuffer_b_R); - free(rotSpeak->eq_filter_L); - free(rotSpeak->lp_filter_L); - free(rotSpeak->hp_filter_L); - free(rotSpeak->eq_filter_R); - free(rotSpeak->lp_filter_R); - free(ptr); - return NULL; - } + { + free(rotSpeak->ringbuffer_h_L); + free(rotSpeak->ringbuffer_h_R); + free(rotSpeak->ringbuffer_b_L); + free(rotSpeak->ringbuffer_b_R); + free(rotSpeak->eq_filter_L); + free(rotSpeak->lp_filter_L); + free(rotSpeak->hp_filter_L); + free(rotSpeak->eq_filter_R); + free(rotSpeak->lp_filter_R); + free(ptr); + return NULL; +} return ptr; } diff --git a/plugins/ladspa_effect/tap/tap_vibrato.c b/plugins/ladspa_effect/tap/tap_vibrato.c index 6b9cc21ff..b7780b46a 100644 --- a/plugins/ladspa_effect/tap/tap_vibrato.c +++ b/plugins/ladspa_effect/tap/tap_vibrato.c @@ -89,7 +89,7 @@ LADSPA_Handle instantiate_Vibrato(const LADSPA_Descriptor * Descriptor, unsigned long sample_rate) { - LADSPA_Handle * ptr; + LADSPA_Handle * ptr; if ((ptr = malloc(sizeof(Vibrato))) != NULL) { ((Vibrato *)ptr)->sample_rate = sample_rate; @@ -97,10 +97,10 @@ instantiate_Vibrato(const LADSPA_Descriptor * Descriptor, if ((((Vibrato *)ptr)->ringbuffer = calloc(2 * PM_DEPTH, sizeof(LADSPA_Data))) == NULL) - { - free(ptr); + { + free(ptr); return NULL; - } + } ((Vibrato *)ptr)->buflen = ceil(0.2f * sample_rate / M_PI); ((Vibrato *)ptr)->pos = 0; diff --git a/src/core/audio/AudioFileOgg.cpp b/src/core/audio/AudioFileOgg.cpp index 8e09d0a9d..dbf52c5e3 100644 --- a/src/core/audio/AudioFileOgg.cpp +++ b/src/core/audio/AudioFileOgg.cpp @@ -171,12 +171,12 @@ bool AudioFileOgg::startEncoding() { // clean up finishEncoding(); - delete[] user_comments; + delete[] user_comments; return false; } } - delete[] user_comments; + delete[] user_comments; return true; }