mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Style fix: Remove new lines from opening brackets

Browse source 
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.
This commit is contained in:
poljar (Damir Jelić) 2013-06-18 22:24:24 +02:00 • committed by Tanu Kaskinen
parent cbd274676d
commit e95d054e40
25 changed files with 40 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/alsa/alsa-sink.c
View file

@ -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;

6
src/modules/alsa/alsa-source.c
View file

@ -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;

3
src/modules/alsa/alsa-ucm.c
View file

@ -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;

3
src/modules/alsa/alsa-util.c
View file

@ -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);

6
src/modules/alsa/module-alsa-card.c
View file

@ -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;

6
src/modules/bluetooth/module-bluetooth-device.c
View file

@ -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;

6
src/modules/echo-cancel/adrian.c
View file

@ -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;

6
src/modules/echo-cancel/speex.c
View file

@ -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;

3
src/modules/echo-cancel/webrtc.cc
View file

@ -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;

3
src/modules/macosx/module-coreaudio-detect.c
View file

@ -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;

12
src/modules/macosx/module-coreaudio-device.c
View file

@ -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) {

3
src/modules/module-switch-on-port-available.c
View file

@ -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;

3
src/modules/module-tunnel.c
View file

@ -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;

9
src/pulse/format.c
View file

@ -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:

3
src/pulse/stream.c
View file

@ -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;
}

3
src/pulse/subscribe.h
View file

@ -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! ...

3
src/pulsecore/cli-text.c
View file

@ -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;

3
src/pulsecore/core-util.h
View file

@ -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);

3
src/pulsecore/cpu-orc.c
View file

@ -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;

3
src/pulsecore/device-port.c
View file

@ -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);

3
src/pulsecore/protocol-native.c
View file

@ -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))

9
src/pulsecore/sink.c
View file

@ -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;

9
src/pulsecore/source.c
View file

@ -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;

3
src/pulsecore/svolume_orc.c
View file

@ -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));

3
src/utils/pactl.c
View file

@ -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";