From e95d054e40f65bdf84bf80d289d6cbcdc3b076d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?poljar=20=28Damir=20Jeli=C4=87=29?= Date: Tue, 18 Jun 2013 22:24:24 +0200 Subject: [PATCH] Style fix: Remove new lines from opening brackets This patch replaces every occurrence of ')\n{' with ') {'. Command used for this: find . -type d \( -name ffmpeg \) -prune -o \ -regex '\(.*\.[hc]\|.*\.cc\)' \ -a -not -name core-util.c -a -not \ -name adrian-aec.c -a -not -name g711.c \ -exec sed -i -e '/)$/{N;s/)\n{$/) {/}' {} \; The excluded files are mirrored files from external sources. --- src/modules/alsa/alsa-sink.c | 6 ++---- src/modules/alsa/alsa-source.c | 6 ++---- src/modules/alsa/alsa-ucm.c | 3 +-- src/modules/alsa/alsa-util.c | 3 +-- src/modules/alsa/module-alsa-card.c | 6 ++---- src/modules/bluetooth/module-bluetooth-device.c | 6 ++---- src/modules/echo-cancel/adrian.c | 6 ++---- src/modules/echo-cancel/speex.c | 6 ++---- src/modules/echo-cancel/webrtc.cc | 3 +-- src/modules/macosx/module-coreaudio-detect.c | 3 +-- src/modules/macosx/module-coreaudio-device.c | 12 ++++-------- src/modules/module-switch-on-port-available.c | 3 +-- src/modules/module-tunnel.c | 3 +-- src/pulse/format.c | 9 +++------ src/pulse/stream.c | 3 +-- src/pulse/subscribe.h | 3 +-- src/pulsecore/cli-text.c | 3 +-- src/pulsecore/core-util.h | 3 +-- src/pulsecore/cpu-orc.c | 3 +-- src/pulsecore/device-port.c | 3 +-- src/pulsecore/protocol-native.c | 3 +-- src/pulsecore/sink.c | 9 +++------ src/pulsecore/source.c | 9 +++------ src/pulsecore/svolume_orc.c | 3 +-- src/utils/pactl.c | 3 +-- 25 files changed, 40 insertions(+), 80 deletions(-) diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c index 0f82df68b..dc7146f8c 100644 --- a/src/modules/alsa/alsa-sink.c +++ b/src/modules/alsa/alsa-sink.c @@ -1022,8 +1022,7 @@ static int update_sw_params(struct userdata *u) { /* Called from IO Context on unsuspend or from main thread when creating sink */ static void reset_watermark(struct userdata *u, size_t tsched_watermark, pa_sample_spec *ss, - pa_bool_t in_thread) -{ + pa_bool_t in_thread) { u->tsched_watermark = pa_usec_to_bytes_round_up(pa_bytes_to_usec_round_up(tsched_watermark, ss), &u->sink->sample_spec); @@ -1604,8 +1603,7 @@ static pa_bool_t sink_set_formats(pa_sink *s, pa_idxset *formats) { return TRUE; } -static pa_bool_t sink_update_rate_cb(pa_sink *s, uint32_t rate) -{ +static pa_bool_t sink_update_rate_cb(pa_sink *s, uint32_t rate) { struct userdata *u = s->userdata; int i; pa_bool_t supported = FALSE; diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c index 15b6aeb8e..77dbb8651 100644 --- a/src/modules/alsa/alsa-source.c +++ b/src/modules/alsa/alsa-source.c @@ -914,8 +914,7 @@ static int update_sw_params(struct userdata *u) { /* Called from IO Context on unsuspend or from main thread when creating source */ static void reset_watermark(struct userdata *u, size_t tsched_watermark, pa_sample_spec *ss, - pa_bool_t in_thread) -{ + pa_bool_t in_thread) { u->tsched_watermark = pa_usec_to_bytes_round_up(pa_bytes_to_usec_round_up(tsched_watermark, ss), &u->source->sample_spec); @@ -1411,8 +1410,7 @@ static void source_update_requested_latency_cb(pa_source *s) { update_sw_params(u); } -static pa_bool_t source_update_rate_cb(pa_source *s, uint32_t rate) -{ +static pa_bool_t source_update_rate_cb(pa_source *s, uint32_t rate) { struct userdata *u = s->userdata; int i; pa_bool_t supported = FALSE; diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c index 6860b8208..bc2ea9b77 100644 --- a/src/modules/alsa/alsa-ucm.c +++ b/src/modules/alsa/alsa-ucm.c @@ -525,8 +525,7 @@ static void append_lost_relationship(pa_alsa_ucm_device *dev) { } } -int pa_alsa_ucm_query_profiles(pa_alsa_ucm_config *ucm, int card_index) -{ +int pa_alsa_ucm_query_profiles(pa_alsa_ucm_config *ucm, int card_index) { char *card_name; const char **verb_list; int num_verbs, i, err = 0; diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c index b556349ec..8d2286bf8 100644 --- a/src/modules/alsa/alsa-util.c +++ b/src/modules/alsa/alsa-util.c @@ -1450,8 +1450,7 @@ pa_bool_t pa_alsa_may_tsched(pa_bool_t want) { return TRUE; } -snd_hctl_elem_t* pa_alsa_find_jack(snd_hctl_t *hctl, const char* jack_name) -{ +snd_hctl_elem_t* pa_alsa_find_jack(snd_hctl_t *hctl, const char* jack_name) { snd_ctl_elem_id_t *id; snd_ctl_elem_id_alloca(&id); diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c index fe05e3d3e..e5da45491 100644 --- a/src/modules/alsa/module-alsa-card.c +++ b/src/modules/alsa/module-alsa-card.c @@ -309,8 +309,7 @@ static void init_profile(struct userdata *u) { am->source = pa_alsa_source_new(u->module, u->modargs, __FILE__, u->card, am); } -static void report_port_state(pa_device_port *p, struct userdata *u) -{ +static void report_port_state(pa_device_port *p, struct userdata *u) { void *state; pa_alsa_jack *jack; pa_available_t pa = PA_AVAILABLE_UNKNOWN; @@ -347,8 +346,7 @@ static void report_port_state(pa_device_port *p, struct userdata *u) pa_device_port_set_available(p, pa); } -static int report_jack_state(snd_hctl_elem_t *elem, unsigned int mask) -{ +static int report_jack_state(snd_hctl_elem_t *elem, unsigned int mask) { struct userdata *u = snd_hctl_elem_get_callback_private(elem); snd_ctl_elem_value_t *elem_value; pa_bool_t plugged_in; diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c index a517e59d7..ea3db48e4 100644 --- a/src/modules/bluetooth/module-bluetooth-device.c +++ b/src/modules/bluetooth/module-bluetooth-device.c @@ -208,8 +208,7 @@ enum { static int init_profile(struct userdata *u); /* from IO thread */ -static void a2dp_set_bitpool(struct userdata *u, uint8_t bitpool) -{ +static void a2dp_set_bitpool(struct userdata *u, uint8_t bitpool) { struct a2dp_info *a2dp; pa_assert(u); @@ -968,8 +967,7 @@ static int a2dp_process_push(struct userdata *u) { return ret; } -static void a2dp_reduce_bitpool(struct userdata *u) -{ +static void a2dp_reduce_bitpool(struct userdata *u) { struct a2dp_info *a2dp; uint8_t bitpool; diff --git a/src/modules/echo-cancel/adrian.c b/src/modules/echo-cancel/adrian.c index ab828be80..2a795f1c5 100644 --- a/src/modules/echo-cancel/adrian.c +++ b/src/modules/echo-cancel/adrian.c @@ -45,8 +45,7 @@ static const char* const valid_modargs[] = { static void pa_adrian_ec_fixate_spec(pa_sample_spec *rec_ss, pa_channel_map *rec_map, pa_sample_spec *play_ss, pa_channel_map *play_map, - pa_sample_spec *out_ss, pa_channel_map *out_map) -{ + pa_sample_spec *out_ss, pa_channel_map *out_map) { out_ss->format = PA_SAMPLE_S16NE; out_ss->channels = 1; pa_channel_map_init_mono(out_map); @@ -61,8 +60,7 @@ pa_bool_t pa_adrian_ec_init(pa_core *c, pa_echo_canceller *ec, pa_sample_spec *rec_ss, pa_channel_map *rec_map, pa_sample_spec *play_ss, pa_channel_map *play_map, pa_sample_spec *out_ss, pa_channel_map *out_map, - uint32_t *nframes, const char *args) -{ + uint32_t *nframes, const char *args) { int rate, have_vector = 0; uint32_t frame_size_ms; pa_modargs *ma; diff --git a/src/modules/echo-cancel/speex.c b/src/modules/echo-cancel/speex.c index ddb09b546..cef0aad0f 100644 --- a/src/modules/echo-cancel/speex.c +++ b/src/modules/echo-cancel/speex.c @@ -51,8 +51,7 @@ static const char* const valid_modargs[] = { static void pa_speex_ec_fixate_spec(pa_sample_spec *rec_ss, pa_channel_map *rec_map, pa_sample_spec *play_ss, pa_channel_map *play_map, - pa_sample_spec *out_ss, pa_channel_map *out_map) -{ + pa_sample_spec *out_ss, pa_channel_map *out_map) { out_ss->format = PA_SAMPLE_S16NE; *play_ss = *out_ss; @@ -152,8 +151,7 @@ pa_bool_t pa_speex_ec_init(pa_core *c, pa_echo_canceller *ec, pa_sample_spec *rec_ss, pa_channel_map *rec_map, pa_sample_spec *play_ss, pa_channel_map *play_map, pa_sample_spec *out_ss, pa_channel_map *out_map, - uint32_t *nframes, const char *args) -{ + uint32_t *nframes, const char *args) { int rate; uint32_t frame_size_ms, filter_size_ms; pa_modargs *ma; diff --git a/src/modules/echo-cancel/webrtc.cc b/src/modules/echo-cancel/webrtc.cc index 71f6ebb8f..7517d4ad6 100644 --- a/src/modules/echo-cancel/webrtc.cc +++ b/src/modules/echo-cancel/webrtc.cc @@ -80,8 +80,7 @@ pa_bool_t pa_webrtc_ec_init(pa_core *c, pa_echo_canceller *ec, pa_sample_spec *rec_ss, pa_channel_map *rec_map, pa_sample_spec *play_ss, pa_channel_map *play_map, pa_sample_spec *out_ss, pa_channel_map *out_map, - uint32_t *nframes, const char *args) -{ + uint32_t *nframes, const char *args) { webrtc::AudioProcessing *apm = NULL; pa_bool_t hpf, ns, agc, dgc, mobile, cn; int rm = -1; diff --git a/src/modules/macosx/module-coreaudio-detect.c b/src/modules/macosx/module-coreaudio-detect.c index 4652e6fb8..849bc876f 100644 --- a/src/modules/macosx/module-coreaudio-detect.c +++ b/src/modules/macosx/module-coreaudio-detect.c @@ -186,8 +186,7 @@ scan_removed: static OSStatus property_listener_proc(AudioObjectID objectID, UInt32 numberAddresses, const AudioObjectPropertyAddress inAddresses[], - void *clientData) -{ + void *clientData) { struct userdata *u = clientData; char dummy = 1; diff --git a/src/modules/macosx/module-coreaudio-device.c b/src/modules/macosx/module-coreaudio-device.c index b1a5176f4..be5664b31 100644 --- a/src/modules/macosx/module-coreaudio-device.c +++ b/src/modules/macosx/module-coreaudio-device.c @@ -137,8 +137,7 @@ static OSStatus io_render_proc (AudioDeviceID device, const AudioTimeStamp *inputTime, AudioBufferList *outputData, const AudioTimeStamp *outputTime, - void *clientData) -{ + void *clientData) { struct userdata *u = clientData; pa_assert(u); @@ -161,8 +160,7 @@ static OSStatus io_render_proc (AudioDeviceID device, static OSStatus ca_stream_format_changed(AudioObjectID objectID, UInt32 numberAddresses, const AudioObjectPropertyAddress addresses[], - void *clientData) -{ + void *clientData) { struct userdata *u = clientData; UInt32 i; @@ -354,8 +352,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off return pa_source_process_msg(o, code, data, offset, chunk);; } -static int ca_sink_set_state(pa_sink *s, pa_sink_state_t state) -{ +static int ca_sink_set_state(pa_sink *s, pa_sink_state_t state) { coreaudio_sink *sink = s->userdata; switch (state) { @@ -473,8 +470,7 @@ static int ca_device_create_sink(pa_module *m, AudioBuffer *buf, int channel_idx return 0; } -static int ca_source_set_state(pa_source *s, pa_source_state_t state) -{ +static int ca_source_set_state(pa_source *s, pa_source_state_t state) { coreaudio_source *source = s->userdata; switch (state) { diff --git a/src/modules/module-switch-on-port-available.c b/src/modules/module-switch-on-port-available.c index 35cecea85..8c49db85e 100644 --- a/src/modules/module-switch-on-port-available.c +++ b/src/modules/module-switch-on-port-available.c @@ -129,8 +129,7 @@ static int try_to_switch_profile(pa_device_port *port) { return 0; } -static void find_sink_and_source(pa_card *card, pa_device_port *port, pa_sink **si, pa_source **so) -{ +static void find_sink_and_source(pa_card *card, pa_device_port *port, pa_sink **si, pa_source **so) { pa_sink *sink = NULL; pa_source *source = NULL; uint32_t state; diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c index 66b96172b..bc2c0c4ce 100644 --- a/src/modules/module-tunnel.c +++ b/src/modules/module-tunnel.c @@ -995,8 +995,7 @@ fail: pa_module_unload_request(u->module, TRUE); } -static int read_ports(struct userdata *u, pa_tagstruct *t) -{ +static int read_ports(struct userdata *u, pa_tagstruct *t) { if (u->version >= 16) { uint32_t n_ports; const char *s; diff --git a/src/pulse/format.c b/src/pulse/format.c index 05a99a287..a72f78bde 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -422,8 +422,7 @@ out: return ret; } -int pa_format_info_get_prop_int_array(pa_format_info *f, const char *key, int **values, int *n_values) -{ +int pa_format_info_get_prop_int_array(pa_format_info *f, const char *key, int **values, int *n_values) { const char *str; json_object *o, *o1; int i, ret = -PA_ERR_INVALID; @@ -493,8 +492,7 @@ int pa_format_info_get_prop_string(pa_format_info *f, const char *key, char **v) return 0; } -int pa_format_info_get_prop_string_array(pa_format_info *f, const char *key, char ***values, int *n_values) -{ +int pa_format_info_get_prop_string_array(pa_format_info *f, const char *key, char ***values, int *n_values) { const char *str; json_object *o, *o1; int i, ret = -PA_ERR_INVALID; @@ -642,8 +640,7 @@ void pa_format_info_set_prop_string_array(pa_format_info *f, const char *key, co json_object_put(o); } -static pa_bool_t pa_json_is_fixed_type(json_object *o) -{ +static pa_bool_t pa_json_is_fixed_type(json_object *o) { switch(json_object_get_type(o)) { case json_type_object: case json_type_array: diff --git a/src/pulse/stream.c b/src/pulse/stream.c index ca5ea0de4..508bfa11e 100644 --- a/src/pulse/stream.c +++ b/src/pulse/stream.c @@ -851,8 +851,7 @@ finish: pa_context_unref(c); } -int64_t pa_stream_get_underflow_index(pa_stream *p) -{ +int64_t pa_stream_get_underflow_index(pa_stream *p) { pa_assert(p); return p->latest_underrun_at_index; } diff --git a/src/pulse/subscribe.h b/src/pulse/subscribe.h index 667a88740..64f663d70 100644 --- a/src/pulse/subscribe.h +++ b/src/pulse/subscribe.h @@ -53,8 +53,7 @@ * @verbatim void my_subscription_callback(pa_context *c, pa_subscription_event_type_t t, - uint32_t idx, void *userdata) -{ + uint32_t idx, void *userdata) { if ((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_SOURCE) { if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW) { ... a source was added, let's do stuff! ... diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c index 85c97b330..9b31e97d5 100644 --- a/src/pulsecore/cli-text.c +++ b/src/pulsecore/cli-text.c @@ -116,8 +116,7 @@ static const char *available_to_string(pa_available_t a) { } } -static void append_port_list(pa_strbuf *s, pa_hashmap *ports) -{ +static void append_port_list(pa_strbuf *s, pa_hashmap *ports) { pa_device_port *p; void *state; diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h index 7b59fbcd4..2c86ac237 100644 --- a/src/pulsecore/core-util.h +++ b/src/pulsecore/core-util.h @@ -210,8 +210,7 @@ pa_bool_t pa_in_system_mode(void); #define pa_streq(a,b) (!strcmp((a),(b))) /* Like pa_streq, but does not blow up on NULL pointers. */ -static inline bool pa_safe_streq(const char *a, const char *b) -{ +static inline bool pa_safe_streq(const char *a, const char *b) { if (a == NULL || b == NULL) return a == b; return pa_streq(a, b); diff --git a/src/pulsecore/cpu-orc.c b/src/pulsecore/cpu-orc.c index d40c224c5..41ecb10ad 100644 --- a/src/pulsecore/cpu-orc.c +++ b/src/pulsecore/cpu-orc.c @@ -25,8 +25,7 @@ #include "cpu-orc.h" -pa_bool_t pa_cpu_init_orc(pa_cpu_info cpu_info) -{ +pa_bool_t pa_cpu_init_orc(pa_cpu_info cpu_info) { #ifndef DISABLE_ORC /* Update these as we test on more architectures */ pa_cpu_x86_flag_t x86_want_flags = PA_CPU_X86_MMX | PA_CPU_X86_SSE | PA_CPU_X86_SSE2 | PA_CPU_X86_SSE3 | PA_CPU_X86_SSSE3 | PA_CPU_X86_SSE4_1 | PA_CPU_X86_SSE4_2; diff --git a/src/pulsecore/device-port.c b/src/pulsecore/device-port.c index 966070277..7c1b2ecad 100644 --- a/src/pulsecore/device-port.c +++ b/src/pulsecore/device-port.c @@ -67,8 +67,7 @@ void pa_device_port_new_data_done(pa_device_port_new_data *data) { pa_xfree(data->description); } -void pa_device_port_set_available(pa_device_port *p, pa_available_t status) -{ +void pa_device_port_set_available(pa_device_port *p, pa_available_t status) { pa_core *core; pa_assert(p); diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 708878ed1..2f0a99021 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -1590,8 +1590,7 @@ static int sink_input_process_msg(pa_msgobject *o, int code, void *userdata, int } -static bool handle_input_underrun(playback_stream *s, bool force) -{ +static bool handle_input_underrun(playback_stream *s, bool force) { bool send_drain; if (pa_memblockq_is_readable(s->memblockq)) diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index a47355294..a2376690d 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -824,8 +824,7 @@ int pa_sink_update_status(pa_sink*s) { } /* Called from any context - must be threadsafe */ -void pa_sink_set_mixer_dirty(pa_sink *s, pa_bool_t is_dirty) -{ +void pa_sink_set_mixer_dirty(pa_sink *s, pa_bool_t is_dirty) { pa_atomic_store(&s->mixer_dirty, is_dirty ? 1 : 0); } @@ -1378,8 +1377,7 @@ void pa_sink_render_full(pa_sink *s, size_t length, pa_memchunk *result) { } /* Called from main thread */ -pa_bool_t pa_sink_update_rate(pa_sink *s, uint32_t rate, pa_bool_t passthrough) -{ +pa_bool_t pa_sink_update_rate(pa_sink *s, uint32_t rate, pa_bool_t passthrough) { pa_bool_t ret = FALSE; if (s->update_rate) { @@ -3770,8 +3768,7 @@ pa_bool_t pa_sink_set_formats(pa_sink *s, pa_idxset *formats) { /* Called from the main thread */ /* Checks if the sink can accept this format */ -pa_bool_t pa_sink_check_format(pa_sink *s, pa_format_info *f) -{ +pa_bool_t pa_sink_check_format(pa_sink *s, pa_format_info *f) { pa_idxset *formats = NULL; pa_bool_t ret = FALSE; diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c index 911684b98..cba518bb1 100644 --- a/src/pulsecore/source.c +++ b/src/pulsecore/source.c @@ -740,8 +740,7 @@ int pa_source_update_status(pa_source*s) { } /* Called from any context - must be threadsafe */ -void pa_source_set_mixer_dirty(pa_source *s, pa_bool_t is_dirty) -{ +void pa_source_set_mixer_dirty(pa_source *s, pa_bool_t is_dirty) { pa_atomic_store(&s->mixer_dirty, is_dirty ? 1 : 0); } @@ -968,8 +967,7 @@ void pa_source_post_direct(pa_source*s, pa_source_output *o, const pa_memchunk * } /* Called from main thread */ -pa_bool_t pa_source_update_rate(pa_source *s, uint32_t rate, pa_bool_t passthrough) -{ +pa_bool_t pa_source_update_rate(pa_source *s, uint32_t rate, pa_bool_t passthrough) { pa_bool_t ret = FALSE; if (s->update_rate) { @@ -2807,8 +2805,7 @@ pa_idxset* pa_source_get_formats(pa_source *s) { /* Called from the main thread */ /* Checks if the source can accept this format */ -pa_bool_t pa_source_check_format(pa_source *s, pa_format_info *f) -{ +pa_bool_t pa_source_check_format(pa_source *s, pa_format_info *f) { pa_idxset *formats = NULL; pa_bool_t ret = FALSE; diff --git a/src/pulsecore/svolume_orc.c b/src/pulsecore/svolume_orc.c index 37e6bf8f9..f6105669c 100644 --- a/src/pulsecore/svolume_orc.c +++ b/src/pulsecore/svolume_orc.c @@ -34,8 +34,7 @@ pa_do_volume_func_t fallback; static void -pa_volume_s16ne_orc(int16_t *samples, const int32_t *volumes, unsigned channels, unsigned length) -{ +pa_volume_s16ne_orc(int16_t *samples, const int32_t *volumes, unsigned channels, unsigned length) { if (channels == 2) { int64_t v = (int64_t)volumes[1] << 32 | volumes[0]; pa_volume_s16ne_orc_2ch (samples, v, ((length / (sizeof(int16_t))) / 2)); diff --git a/src/utils/pactl.c b/src/utils/pactl.c index 5102e2e0b..f52e37c60 100644 --- a/src/utils/pactl.c +++ b/src/utils/pactl.c @@ -223,8 +223,7 @@ static void get_server_info_callback(pa_context *c, const pa_server_info *i, voi complete_action(); } -static const char* get_available_str_ynonly(int available) -{ +static const char* get_available_str_ynonly(int available) { switch (available) { case PA_PORT_AVAILABLE_YES: return ", available"; case PA_PORT_AVAILABLE_NO: return ", not available";