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

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;

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;

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;

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

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;

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;

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;

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;

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;

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;

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

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;

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;