mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Whitespace cleanup: Remove all multiple newlines

Browse source 
This patch removes all occurrences of double and triple
newlines.

Command used for this:
find .  -type d \( -name ffmpeg \) -prune -o \
        -regex '\(.*\.[hc]\|.*\.cc\)' \
        -a -not -name 'adrian-aec.*' -a -not \
        -name reserve.c -a -not -name 'rtkit.*' \
        -exec sed -i -e '/^$/{N;s/^\n$//}' {} \;

Two passes were needed to remove triple newlines.
The excluded files are mirrored files from external sources.
This commit is contained in:
poljar (Damir Jelić) 2013-06-18 22:17:48 +02:00 • committed by Tanu Kaskinen
parent e95d054e40
commit 97da92d894
69 changed files with 0 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -275,7 +275,6 @@ struct pa_alsa_mixer_pdata {
snd_mixer_t *mixer;
};
struct pa_alsa_mixer_pdata *pa_alsa_mixer_pdata_new(void) {
struct pa_alsa_mixer_pdata *pd;
@ -383,8 +382,6 @@ int pa_alsa_set_mixer_rtpoll(struct pa_alsa_mixer_pdata *pd, snd_mixer_t *mixer,
return 0;
}
static const snd_mixer_selem_channel_id_t alsa_channel_ids[PA_CHANNEL_POSITION_MAX] = {
[PA_CHANNEL_POSITION_MONO] = SND_MIXER_SCHN_MONO, /* The ALSA name is just an alias! */
@ -1768,7 +1765,6 @@ finish:
return j;
}
static pa_alsa_option* option_get(pa_alsa_path *p, const char *section) {
char *en;
const char *on;
@ -3022,7 +3018,6 @@ void pa_alsa_path_set_dump(pa_alsa_path_set *ps) {
pa_alsa_path_dump(p);
}
static pa_bool_t options_have_option(pa_alsa_option *options, const char *alsa_name) {
pa_alsa_option *o;
@ -3785,7 +3780,6 @@ static void mapping_paths_probe(pa_alsa_mapping *m, pa_alsa_profile *profile,
return;
}
PA_HASHMAP_FOREACH(p, ps->paths, state) {
if (pa_alsa_path_probe(p, mixer_handle, hctl_handle, m->profile_set->ignore_dB) < 0) {
pa_hashmap_remove(ps->paths, p);

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

@ -580,7 +580,6 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle
break;
}
if (++j > 10) {
#ifdef DEBUG_TIMING
pa_log_debug("Not filling up, because already too many iterations.");
@ -722,7 +721,6 @@ static int unix_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle
n_bytes = (size_t) n * u->frame_size;
#ifdef DEBUG_TIMING
pa_log_debug("avail: %lu", (unsigned long) n_bytes);
#endif

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

@ -539,7 +539,6 @@ static int mmap_read(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polled
break;
}
if (++j > 10) {
#ifdef DEBUG_TIMING
pa_log_debug("Not filling up, because already too many iterations.");

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

@ -1474,7 +1474,6 @@ snd_hctl_elem_t* pa_alsa_find_eld_ctl(snd_hctl_t *hctl, int device) {
return snd_hctl_find_elem(hctl, id);
}
static int prepare_mixer(snd_mixer_t *mixer, const char *dev, snd_hctl_t **hctl) {
int err;

1
src/modules/bluetooth/module-bluetooth-proximity.c
View file

@ -346,7 +346,6 @@ static int update_matches(struct userdata *u, bool add) {
} else
dbus_bus_remove_match(pa_dbus_connection_get(u->dbus_connection), filter1, NULL);
if (add) {
dbus_bus_add_match(pa_dbus_connection_get(u->dbus_connection), filter2, &e);

2
src/modules/echo-cancel/module-echo-cancel.c
View file

@ -462,7 +462,6 @@ static int sink_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t of
return pa_sink_process_msg(o, code, data, offset, chunk);
}
/* Called from main context */
static int source_set_state_cb(pa_source *s, pa_source_state_t state) {
struct userdata *u;
@ -1301,7 +1300,6 @@ static void sink_input_attach_cb(pa_sink_input *i) {
pa_sink_attach_within_thread(u->sink);
}
/* Called from source I/O thread context. */
static void source_output_detach_cb(pa_source_output *o) {
struct userdata *u;

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

@ -146,7 +146,6 @@ fail:
return FALSE;
}
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,

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

@ -91,7 +91,6 @@ pa_bool_t pa_webrtc_ec_init(pa_core *c, pa_echo_canceller *ec,
goto fail;
}
hpf = DEFAULT_HIGH_PASS_FILTER;
if (pa_modargs_get_value_boolean(ma, "high_pass_filter", &hpf) < 0) {
pa_log("Failed to parse high_pass_filter value");

3
src/modules/jack/module-jackdbus-detect.c
View file

@ -76,7 +76,6 @@ static const char* const modnames[JACK_SS_COUNT] = {
"module-jack-source"
};
struct userdata {
pa_module *module;
pa_core *core;
@ -89,7 +88,6 @@ struct userdata {
int jack_module_index[JACK_SS_COUNT];
};
static void ensure_ports_stopped(struct userdata* u) {
int i;
pa_assert(u);
@ -127,7 +125,6 @@ static void ensure_ports_started(struct userdata* u) {
}
}
static pa_bool_t check_service_started(struct userdata* u) {
DBusError error;
DBusMessage *m = NULL, *reply = NULL;

1
src/modules/module-combine.c
View file

@ -56,7 +56,6 @@ int pa__init(pa_module*m) {
return module ? 0 : -1;
}
void pa__done(pa_module*m) {
struct userdata *u;

1
src/modules/module-console-kit.c
View file

@ -337,7 +337,6 @@ fail:
return -1;
}
void pa__done(pa_module *m) {
struct userdata *u;

7
src/modules/module-device-manager.c
View file

@ -149,14 +149,12 @@ enum {
SUBCOMMAND_EVENT
};
/* Forward declarations */
#ifdef DUMP_DATABASE
static void dump_database(struct userdata *);
#endif
static void notify_subscribers(struct userdata *);
static void save_time_callback(pa_mainloop_api*a, pa_time_event* e, const struct timeval *t, void *userdata) {
struct userdata *u = userdata;
@ -631,7 +629,6 @@ static void update_highest_priority_device_indexes(struct userdata *u, const cha
}
}
static void route_sink_input(struct userdata *u, pa_sink_input *si) {
const char *role;
uint32_t role_index, device_index;
@ -1003,7 +1000,6 @@ static pa_hook_result_t source_output_new_hook_callback(pa_core *c, pa_source_ou
return PA_HOOK_OK;
}
static pa_hook_result_t sink_put_hook_callback(pa_core *c, PA_GCC_UNUSED pa_sink *sink, struct userdata *u) {
pa_assert(c);
pa_assert(u);
@ -1058,7 +1054,6 @@ static pa_hook_result_t source_unlink_hook_callback(pa_core *c, pa_source *sourc
return route_source_outputs(u, source);
}
static void apply_entry(struct userdata *u, const char *name, struct entry *e) {
uint32_t idx;
char *n;
@ -1101,7 +1096,6 @@ static void apply_entry(struct userdata *u, const char *name, struct entry *e) {
}
}
#define EXT_VERSION 1
static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connection *c, uint32_t tag, pa_tagstruct *t) {
@ -1600,7 +1594,6 @@ int pa__init(pa_module*m) {
for (uint32_t j = 0; j < i; ++j)
subscribe_callback(m->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_NEW, p_i[j].index, u);
/* We cycle over all the available sources so that they are added to our database if they are not in it yet */
i = 0;
PA_IDXSET_FOREACH(source, m->core->sources, idx) {

4
src/modules/module-device-restore.c
View file

@ -111,7 +111,6 @@ enum {
SUBCOMMAND_SAVE_FORMATS
};
#define ENTRY_VERSION 1
struct entry {
@ -173,7 +172,6 @@ static void trigger_save(struct userdata *u, pa_device_type_t type, uint32_t sin
u->save_time_event = pa_core_rttime_new(u->core, pa_rtclock_now() + SAVE_INTERVAL, save_time_callback, u);
}
#ifdef ENABLE_LEGACY_DATABASE_ENTRY_FORMAT
/* Some forward declarations */
static pa_bool_t legacy_entry_read(struct userdata *u, pa_datum *data, struct entry **entry, struct perportentry **perportentry);
@ -685,7 +683,6 @@ static void subscribe_callback(pa_core *c, pa_subscription_event_type_t t, uint3
}
}
pa_assert(e);
if (olde) {
@ -706,7 +703,6 @@ static void subscribe_callback(pa_core *c, pa_subscription_event_type_t t, uint3
entry_free(e);
}
pa_assert(ppe);
if (oldppe) {

2
src/modules/module-equalizer-sink.c
View file

@ -274,7 +274,6 @@ static int sink_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t of
return pa_sink_process_msg(o, code, data, offset, chunk);
}
/* Called from main context */
static int sink_set_state_cb(pa_sink *s, pa_sink_state_t state) {
struct userdata *u;
@ -1856,7 +1855,6 @@ void equalizer_handle_seed_filter(DBusConnection *conn, DBusMessage *msg, void *
pa_aupdate_write_end(u->a_H[r_channel]);
pa_xfree(ys);
pa_dbus_send_empty_reply(conn, msg);
pa_assert_se((message = dbus_message_new_signal(u->dbus_path, EQUALIZER_IFACE, equalizer_signals[EQUALIZER_SIGNAL_FILTER_CHANGED].name)));

1
src/modules/module-filter-heuristics.c
View file

@ -166,7 +166,6 @@ fail:
return -1;
}
void pa__done(pa_module *m) {

2
src/modules/module-ladspa-sink.c
View file

@ -944,7 +944,6 @@ static int write_control_parameters(struct userdata *u, double *control_values,
return 0;
}
int pa__init(pa_module*m) {
struct userdata *u;
pa_sample_spec ss;
@ -1145,7 +1144,6 @@ int pa__init(pa_module*m) {
}
}
u->block_size = pa_frame_align(pa_mempool_block_size_max(m->core->mempool), &ss);
/* Create buffers */

1
src/modules/module-remap-source.c
View file

@ -4,7 +4,6 @@
Copyright 2013 bct electronic GmbH
Contributor: Stefan Huber <s.huber@bct-electronic.com>
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2.1 of the License,

1
src/modules/module-role-cork.c
View file

@ -278,7 +278,6 @@ fail:
return -1;
}
void pa__done(pa_module *m) {

1
src/modules/module-rygel-media-server.c
View file

@ -160,7 +160,6 @@ PA_MODULE_USAGE("display_name=<UPnP Media Server name>");
" </interface>" \
"</node>"
static const char* const valid_modargs[] = {
"display_name",
NULL

1
src/modules/module-stream-restore.c
View file

@ -144,7 +144,6 @@ enum {
SUBCOMMAND_EVENT
};
static struct entry* entry_new(void);
static void entry_free(struct entry *e);
static struct entry *entry_read(struct userdata *u, const char *name);

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

@ -286,7 +286,6 @@ static pa_hook_result_t source_new_hook_callback(pa_core *c, pa_source_new_data
return PA_HOOK_OK;
}
int pa__init(pa_module*m) {
struct userdata *u;

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

@ -517,13 +517,11 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
return 0;
case SINK_MESSAGE_REMOTE_SUSPEND:
stream_suspend_within_thread(u, !!PA_PTR_TO_UINT(data));
return 0;
case SINK_MESSAGE_UPDATE_LATENCY: {
pa_usec_t y;
@ -1029,7 +1027,6 @@ static int read_ports(struct userdata *u, pa_tagstruct *t) {
return 0;
}
static int read_formats(struct userdata *u, pa_tagstruct *t) {
uint8_t n_formats;
pa_format_info *format;

3
src/modules/module-virtual-source.c
View file

@ -153,7 +153,6 @@ static void sink_update_requested_latency_cb(pa_sink *s) {
}
/* Called from I/O thread context */
static void sink_request_rewind_cb(pa_sink *s) {
struct userdata *u;
@ -349,7 +348,6 @@ static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk)
pa_source_post(u->source, chunk);
}
}
/* Called from input thread context */
@ -467,7 +465,6 @@ static void source_output_moving_cb(pa_source_output *o, pa_source *dest) {
}
}
int pa__init(pa_module*m) {
struct userdata *u;
pa_sample_spec ss;

1
src/modules/oss/module-oss.c
View file

@ -175,7 +175,6 @@ static int trigger(struct userdata *u, pa_bool_t quick) {
pa_log_debug("trigger: %i", enable_bits);
if (u->use_mmap) {
if (!quick)

7
src/modules/raop/raop_client.c
View file

@ -70,7 +70,6 @@
#define RAOP_PORT 5000
struct pa_raop_client {
pa_core *core;
char *host;
@ -392,7 +391,6 @@ pa_raop_client* pa_raop_client_new(pa_core *core, const char* host) {
return c;
}
void pa_raop_client_free(pa_raop_client* c) {
pa_assert(c);
@ -404,7 +402,6 @@ void pa_raop_client_free(pa_raop_client* c) {
pa_xfree(c);
}
int pa_raop_connect(pa_raop_client* c) {
char *sci;
struct {
@ -438,7 +435,6 @@ int pa_raop_connect(pa_raop_client* c) {
return pa_rtsp_connect(c->rtsp);
}
int pa_raop_flush(pa_raop_client* c) {
pa_assert(c);
@ -446,7 +442,6 @@ int pa_raop_flush(pa_raop_client* c) {
return 0;
}
int pa_raop_client_set_volume(pa_raop_client* c, pa_volume_t volume) {
int rv;
double db;
@ -468,7 +463,6 @@ int pa_raop_client_set_volume(pa_raop_client* c, pa_volume_t volume) {
return rv;
}
int pa_raop_client_encode_sample(pa_raop_client* c, pa_memchunk* raw, pa_memchunk* encoded) {
uint16_t len;
size_t bufmax;
@ -550,7 +544,6 @@ int pa_raop_client_encode_sample(pa_raop_client* c, pa_memchunk* raw, pa_memchun
return 0;
}
void pa_raop_client_set_callback(pa_raop_client* c, pa_raop_client_cb_t callback, void *userdata) {
pa_assert(c);

11
src/modules/rtp/rtsp_client.c
View file

@ -96,7 +96,6 @@ pa_rtsp_client* pa_rtsp_client_new(pa_mainloop_api *mainloop, const char* hostna
return c;
}
void pa_rtsp_client_free(pa_rtsp_client* c) {
pa_assert(c);
@ -120,7 +119,6 @@ void pa_rtsp_client_free(pa_rtsp_client* c) {
pa_xfree(c);
}
static void headers_read(pa_rtsp_client *c) {
char* token;
char delimiters[] = ";";
@ -171,7 +169,6 @@ static void headers_read(pa_rtsp_client *c) {
c->callback(c, c->state, c->response_headers, c->userdata);
}
static void line_callback(pa_ioline *line, const char *s, void *userdata) {
char *delimpos;
char *s2, *s2p;
@ -278,7 +275,6 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) {
pa_xfree(s2);
}
static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata) {
pa_rtsp_client *c = userdata;
union {
@ -359,7 +355,6 @@ void pa_rtsp_disconnect(pa_rtsp_client *c) {
c->ioline = NULL;
}
const char* pa_rtsp_localip(pa_rtsp_client* c) {
pa_assert(c);
@ -448,7 +443,6 @@ static int rtsp_exec(pa_rtsp_client* c, const char* cmd,
return 0;
}
int pa_rtsp_announce(pa_rtsp_client *c, const char* sdp) {
pa_assert(c);
if (!sdp)
@ -458,7 +452,6 @@ int pa_rtsp_announce(pa_rtsp_client *c, const char* sdp) {
return rtsp_exec(c, "ANNOUNCE", "application/sdp", sdp, 1, NULL);
}
int pa_rtsp_setup(pa_rtsp_client* c) {
pa_headerlist* headers;
int rv;
@ -474,7 +467,6 @@ int pa_rtsp_setup(pa_rtsp_client* c) {
return rv;
}
int pa_rtsp_record(pa_rtsp_client* c, uint16_t* seq, uint32_t* rtptime) {
pa_headerlist* headers;
int rv;
@ -501,7 +493,6 @@ int pa_rtsp_record(pa_rtsp_client* c, uint16_t* seq, uint32_t* rtptime) {
return rv;
}
int pa_rtsp_teardown(pa_rtsp_client *c) {
pa_assert(c);
@ -509,7 +500,6 @@ int pa_rtsp_teardown(pa_rtsp_client *c) {
return rtsp_exec(c, "TEARDOWN", NULL, NULL, 0, NULL);
}
int pa_rtsp_setparameter(pa_rtsp_client *c, const char* param) {
pa_assert(c);
if (!param)
@ -519,7 +509,6 @@ int pa_rtsp_setparameter(pa_rtsp_client *c, const char* param) {
return rtsp_exec(c, "SET_PARAMETER", "text/parameters", param, 1, NULL);
}
int pa_rtsp_flush(pa_rtsp_client *c, uint16_t seq, uint32_t rtptime) {
pa_headerlist* headers;
int rv;

1
src/modules/udev-util.h
View file

@ -22,7 +22,6 @@
USA.
***/
#include <pulse/proplist.h>
int pa_udev_get_info(int card_idx, pa_proplist *p);

5
src/modules/xen/module-xenpv-sink.c
View file

@ -278,11 +278,9 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
static int process_render(struct userdata *u) {
pa_assert(u);
if (u->memchunk.length <= 0)
pa_sink_render(u->sink, ioring->usable_buffer_space, &u->memchunk);
pa_assert(u->memchunk.length > 0);
xc_evtchn_notify(xce, xen_evtchn_port);
@ -583,7 +581,6 @@ void pa__done(pa_module*m) {
}
static int alloc_gref(struct ioctl_gntalloc_alloc_gref *gref_, void **addr) {
int alloc_fd, dev_fd, rv;
@ -701,7 +698,6 @@ static char* read_param(const char *paramname) {
return xs_read(xsh, 0, keybuf, &len);
}
static int publish_spec(pa_sample_spec *sample_spec) {
/* Publish spec and set state to XenbusStateInitWait*/
int ret;
@ -713,7 +709,6 @@ static int publish_spec(pa_sample_spec *sample_spec) {
return ret;
}
static int read_backend_default_spec(pa_sample_spec *sample_spec) {
/* Read spec from backend */
char *out;