[pulseaudio-commits] 6 commits - src/daemon src/modules src/pulse src/pulsecore src/tests src/utils
Tanu Kaskinen
tanuk at kemper.freedesktop.org
Mon Jun 24 07:13:27 PDT 2013
src/daemon/ltdl-bind-now.c | 2
src/daemon/ltdl-bind-now.h | 1
src/modules/alsa/alsa-mixer.c | 12 -
src/modules/alsa/alsa-sink.c | 8
src/modules/alsa/alsa-source.c | 7
src/modules/alsa/alsa-ucm.c | 5
src/modules/alsa/alsa-util.c | 4
src/modules/alsa/module-alsa-card.c | 6
src/modules/bluetooth/module-bluetooth-device.c | 6
src/modules/bluetooth/module-bluetooth-proximity.c | 1
src/modules/dbus/iface-card.c | 8
src/modules/dbus/iface-client.c | 4
src/modules/dbus/iface-core.c | 64 ++---
src/modules/dbus/iface-device.c | 20 -
src/modules/dbus/iface-module.c | 4
src/modules/dbus/iface-sample.c | 4
src/modules/dbus/iface-stream.c | 24 +-
src/modules/dbus/module-dbus-protocol.c | 4
src/modules/echo-cancel/adrian.c | 6
src/modules/echo-cancel/module-echo-cancel.c | 2
src/modules/echo-cancel/speex.c | 7
src/modules/echo-cancel/webrtc.cc | 4
src/modules/gconf/module-gconf.c | 2
src/modules/jack/module-jackdbus-detect.c | 27 +-
src/modules/macosx/module-coreaudio-detect.c | 3
src/modules/macosx/module-coreaudio-device.c | 12 -
src/modules/module-combine.c | 1
src/modules/module-console-kit.c | 1
src/modules/module-device-manager.c | 7
src/modules/module-device-restore.c | 4
src/modules/module-equalizer-sink.c | 242 ++++++++++-----------
src/modules/module-filter-heuristics.c | 1
src/modules/module-ladspa-sink.c | 2
src/modules/module-loopback.c | 4
src/modules/module-mmkbd-evdev.c | 2
src/modules/module-remap-source.c | 1
src/modules/module-role-cork.c | 1
src/modules/module-rygel-media-server.c | 1
src/modules/module-stream-restore.c | 1
src/modules/module-switch-on-port-available.c | 4
src/modules/module-tunnel.c | 6
src/modules/module-virtual-source.c | 5
src/modules/oss/module-oss.c | 1
src/modules/oss/oss-util.c | 2
src/modules/raop/raop_client.c | 7
src/modules/rtp/rtsp_client.c | 11
src/modules/udev-util.h | 1
src/modules/x11/module-x11-xsmp.c | 2
src/modules/xen/module-xenpv-sink.c | 49 +---
src/pulse/channelmap.c | 1
src/pulse/context.c | 2
src/pulse/format.c | 9
src/pulse/internal.h | 1
src/pulse/introspect.c | 1
src/pulse/mainloop.c | 1
src/pulse/scache.c | 1
src/pulse/stream.c | 7
src/pulse/subscribe.h | 3
src/pulse/volume.c | 2
src/pulsecore/arpa-inet.h | 2
src/pulsecore/cli-command.c | 1
src/pulsecore/cli-text.c | 6
src/pulsecore/core-util.h | 3
src/pulsecore/cpu-orc.c | 3
src/pulsecore/database-simple.c | 1
src/pulsecore/dbus-shared.c | 2
src/pulsecore/device-port.c | 4
src/pulsecore/esound.h | 3
src/pulsecore/fdsem.h | 1
src/pulsecore/memblockq.h | 1
src/pulsecore/object.h | 1
src/pulsecore/poll.h | 1
src/pulsecore/protocol-dbus.h | 1
src/pulsecore/protocol-http.c | 2
src/pulsecore/protocol-native.c | 6
src/pulsecore/random.c | 2
src/pulsecore/remap.c | 1
src/pulsecore/shmasyncq.c | 1
src/pulsecore/shmasyncq.h | 1
src/pulsecore/sink-input.c | 1
src/pulsecore/sink-input.h | 1
src/pulsecore/sink.c | 10
src/pulsecore/sndfile-util.c | 8
src/pulsecore/socket-client.c | 1
src/pulsecore/socket-util.c | 1
src/pulsecore/source-output.c | 4
src/pulsecore/source.c | 10
src/pulsecore/svolume_orc.c | 3
src/pulsecore/svolume_sse.c | 1
src/pulsecore/time-smoother.c | 1
src/pulsecore/x11prop.c | 1
src/tests/alsa-mixer-path-test.c | 1
src/tests/mix-special-test.c | 1
src/tests/mix-test.c | 1
src/tests/remix-test.c | 1
src/utils/pacmd.c | 1
src/utils/pactl.c | 6
src/utils/pasuspender.c | 1
src/utils/pax11publish.c | 1
99 files changed, 282 insertions(+), 447 deletions(-)
New commits:
commit 97da92d894c2a29bc3ccf60dc904e4099b30f47e
Author: poljar (Damir Jelić) <poljarinho at gmail.com>
Date: Tue Jun 18 22:17:48 2013 +0200
Whitespace cleanup: Remove all multiple newlines
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.
diff --git a/src/daemon/ltdl-bind-now.h b/src/daemon/ltdl-bind-now.h
index 0760070..332aad6 100644
--- a/src/daemon/ltdl-bind-now.h
+++ b/src/daemon/ltdl-bind-now.h
@@ -22,7 +22,6 @@
USA.
***/
-
void pa_ltdl_init(void);
void pa_ltdl_done(void);
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 5775d67..f4410d7 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -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);
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index dc7146f..aa6cf74 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -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
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 77dbb86..6a53c4b 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -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.");
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index 8d2286b..168a678 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -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;
diff --git a/src/modules/bluetooth/module-bluetooth-proximity.c b/src/modules/bluetooth/module-bluetooth-proximity.c
index b55dfdb..c4e6ca6 100644
--- a/src/modules/bluetooth/module-bluetooth-proximity.c
+++ b/src/modules/bluetooth/module-bluetooth-proximity.c
@@ -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);
diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c
index b45a40c..1477d4b 100644
--- a/src/modules/echo-cancel/module-echo-cancel.c
+++ b/src/modules/echo-cancel/module-echo-cancel.c
@@ -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;
diff --git a/src/modules/echo-cancel/speex.c b/src/modules/echo-cancel/speex.c
index cef0aad..37ce122 100644
--- a/src/modules/echo-cancel/speex.c
+++ b/src/modules/echo-cancel/speex.c
@@ -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,
diff --git a/src/modules/echo-cancel/webrtc.cc b/src/modules/echo-cancel/webrtc.cc
index 7517d4a..697e0ba 100644
--- a/src/modules/echo-cancel/webrtc.cc
+++ b/src/modules/echo-cancel/webrtc.cc
@@ -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");
diff --git a/src/modules/jack/module-jackdbus-detect.c b/src/modules/jack/module-jackdbus-detect.c
index d8b218a..cadf4c2 100644
--- a/src/modules/jack/module-jackdbus-detect.c
+++ b/src/modules/jack/module-jackdbus-detect.c
@@ -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;
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 251df49..d344235 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -56,7 +56,6 @@ int pa__init(pa_module*m) {
return module ? 0 : -1;
}
-
void pa__done(pa_module*m) {
struct userdata *u;
diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c
index af1e02b..271af2a 100644
--- a/src/modules/module-console-kit.c
+++ b/src/modules/module-console-kit.c
@@ -337,7 +337,6 @@ fail:
return -1;
}
-
void pa__done(pa_module *m) {
struct userdata *u;
diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c
index 5db5550..47c78d4 100644
--- a/src/modules/module-device-manager.c
+++ b/src/modules/module-device-manager.c
@@ -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) {
diff --git a/src/modules/module-device-restore.c b/src/modules/module-device-restore.c
index 8360a05..1772830 100644
--- a/src/modules/module-device-restore.c
+++ b/src/modules/module-device-restore.c
@@ -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) {
diff --git a/src/modules/module-equalizer-sink.c b/src/modules/module-equalizer-sink.c
index 505e60b..59073ce 100644
--- a/src/modules/module-equalizer-sink.c
+++ b/src/modules/module-equalizer-sink.c
@@ -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)));
diff --git a/src/modules/module-filter-heuristics.c b/src/modules/module-filter-heuristics.c
index e158b95..17e5603 100644
--- a/src/modules/module-filter-heuristics.c
+++ b/src/modules/module-filter-heuristics.c
@@ -166,7 +166,6 @@ fail:
return -1;
-
}
void pa__done(pa_module *m) {
diff --git a/src/modules/module-ladspa-sink.c b/src/modules/module-ladspa-sink.c
index 6a757e4..2ffcd8d 100644
--- a/src/modules/module-ladspa-sink.c
+++ b/src/modules/module-ladspa-sink.c
@@ -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 */
diff --git a/src/modules/module-remap-source.c b/src/modules/module-remap-source.c
index c47d9b0..7c35085 100644
--- a/src/modules/module-remap-source.c
+++ b/src/modules/module-remap-source.c
@@ -4,7 +4,6 @@
Copyright 2013 bct electronic GmbH
Contributor: Stefan Huber <s.huber at 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,
diff --git a/src/modules/module-role-cork.c b/src/modules/module-role-cork.c
index 6e6ea72..ea71ea6 100644
--- a/src/modules/module-role-cork.c
+++ b/src/modules/module-role-cork.c
@@ -278,7 +278,6 @@ fail:
return -1;
-
}
void pa__done(pa_module *m) {
diff --git a/src/modules/module-rygel-media-server.c b/src/modules/module-rygel-media-server.c
index 855d7bb..4ba106a 100644
--- a/src/modules/module-rygel-media-server.c
+++ b/src/modules/module-rygel-media-server.c
@@ -160,7 +160,6 @@ PA_MODULE_USAGE("display_name=<UPnP Media Server name>");
" </interface>" \
"</node>"
-
static const char* const valid_modargs[] = {
"display_name",
NULL
diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
index 23f4780..7b73132 100644
--- a/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@ -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);
diff --git a/src/modules/module-switch-on-port-available.c b/src/modules/module-switch-on-port-available.c
index 8c49db8..df6ce97 100644
--- a/src/modules/module-switch-on-port-available.c
+++ b/src/modules/module-switch-on-port-available.c
@@ -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;
diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index bc2c0c4..7b430fb 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -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;
diff --git a/src/modules/module-virtual-source.c b/src/modules/module-virtual-source.c
index 9049534..6720f8b 100644
--- a/src/modules/module-virtual-source.c
+++ b/src/modules/module-virtual-source.c
@@ -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;
diff --git a/src/modules/oss/module-oss.c b/src/modules/oss/module-oss.c
index fbf0d7c..7083469 100644
--- a/src/modules/oss/module-oss.c
+++ b/src/modules/oss/module-oss.c
@@ -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)
diff --git a/src/modules/raop/raop_client.c b/src/modules/raop/raop_client.c
index b11cafb..2c2aa19 100644
--- a/src/modules/raop/raop_client.c
+++ b/src/modules/raop/raop_client.c
@@ -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);
diff --git a/src/modules/rtp/rtsp_client.c b/src/modules/rtp/rtsp_client.c
index 90521fe..5072439 100644
--- a/src/modules/rtp/rtsp_client.c
+++ b/src/modules/rtp/rtsp_client.c
@@ -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;
diff --git a/src/modules/udev-util.h b/src/modules/udev-util.h
index a978178..251575b 100644
--- a/src/modules/udev-util.h
+++ b/src/modules/udev-util.h
@@ -22,7 +22,6 @@
USA.
***/
-
#include <pulse/proplist.h>
int pa_udev_get_info(int card_idx, pa_proplist *p);
diff --git a/src/modules/xen/module-xenpv-sink.c b/src/modules/xen/module-xenpv-sink.c
index 6663017..2d4879f 100644
--- a/src/modules/xen/module-xenpv-sink.c
+++ b/src/modules/xen/module-xenpv-sink.c
@@ -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;
diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c
index 0d199f3..f635cc1 100644
--- a/src/pulse/channelmap.c
+++ b/src/pulse/channelmap.c
@@ -392,7 +392,6 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p
return NULL;
}
-
default:
pa_assert_not_reached();
}
diff --git a/src/pulse/context.c b/src/pulse/context.c
index 7176412..11dac15 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -1368,7 +1368,6 @@ finish:
pa_context_unref(c);
}
-
void pa_command_client_event(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
pa_context *c = userdata;
pa_proplist *pl = NULL;
@@ -1428,7 +1427,6 @@ void pa_context_rttime_restart(pa_context *c, pa_time_event *e, pa_usec_t usec)
pa_assert(PA_REFCNT_VALUE(c) >= 1);
pa_assert(c->mainloop);
-
if (usec == PA_USEC_INVALID)
c->mainloop->time_restart(e, NULL);
else {
diff --git a/src/pulse/internal.h b/src/pulse/internal.h
index e72e285..dd27f5f 100644
--- a/src/pulse/internal.h
+++ b/src/pulse/internal.h
@@ -275,7 +275,6 @@ pa_tagstruct *pa_tagstruct_command(pa_context *c, uint32_t command, uint32_t *ta
return -pa_context_set_error((context), (error)); \
} while(FALSE)
-
#define PA_CHECK_VALIDITY_RETURN_ANY(context, expression, error, value) \
do { \
if (!(expression)) { \
diff --git a/src/pulse/introspect.c b/src/pulse/introspect.c
index 9ca3fd3..704e96e 100644
--- a/src/pulse/introspect.c
+++ b/src/pulse/introspect.c
@@ -1838,7 +1838,6 @@ static void context_index_callback(pa_pdispatch *pd, uint32_t command, uint32_t
cb(o->context, idx, o->userdata);
}
-
finish:
pa_operation_done(o);
pa_operation_unref(o);
diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index a3d7715..f1ce076 100644
--- a/src/pulse/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -568,7 +568,6 @@ static void cleanup_defer_events(pa_mainloop *m, pa_bool_t force) {
pa_assert(m->defer_events_please_scan == 0);
}
-
void pa_mainloop_free(pa_mainloop *m) {
pa_assert(m);
diff --git a/src/pulse/scache.c b/src/pulse/scache.c
index 3fad82a..8902642 100644
--- a/src/pulse/scache.c
+++ b/src/pulse/scache.c
@@ -167,7 +167,6 @@ finish:
pa_operation_unref(o);
}
-
pa_operation *pa_context_play_sample(pa_context *c, const char *name, const char *dev, pa_volume_t volume, pa_context_success_cb_t cb, void *userdata) {
pa_operation *o;
pa_tagstruct *t;
diff --git a/src/pulse/stream.c b/src/pulse/stream.c
index 508bfa1..811b3c1 100644
--- a/src/pulse/stream.c
+++ b/src/pulse/stream.c
@@ -1215,7 +1215,6 @@ static int create_stream(
PA_STREAM_RELATIVE_VOLUME|
PA_STREAM_PASSTHROUGH)), PA_ERR_INVALID);
-
PA_CHECK_VALIDITY(s->context, s->context->version >= 12 || !(flags & PA_STREAM_VARIABLE_RATE), PA_ERR_NOTSUPPORTED);
PA_CHECK_VALIDITY(s->context, s->context->version >= 13 || !(flags & PA_STREAM_PEAK_DETECT), PA_ERR_NOTSUPPORTED);
PA_CHECK_VALIDITY(s->context, s->context->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
@@ -1816,7 +1815,6 @@ static void stream_get_timing_info_callback(pa_pdispatch *pd, uint32_t command,
goto finish;
}
-
if (!pa_tagstruct_eof(t)) {
pa_context_fail(o->context, PA_ERR_PROTOCOL);
goto finish;
@@ -2632,7 +2630,6 @@ finish:
pa_operation_unref(o);
}
-
pa_operation* pa_stream_set_buffer_attr(pa_stream *s, const pa_buffer_attr *attr, pa_stream_success_cb_t cb, void *userdata) {
pa_operation *o;
pa_tagstruct *t;
@@ -2779,7 +2776,6 @@ finish:
pa_operation_unref(o);
}
-
pa_operation *pa_stream_update_sample_rate(pa_stream *s, uint32_t rate, pa_stream_success_cb_t cb, void *userdata) {
pa_operation *o;
pa_tagstruct *t;
diff --git a/src/pulsecore/arpa-inet.h b/src/pulsecore/arpa-inet.h
index 303c905..d940f70 100644
--- a/src/pulsecore/arpa-inet.h
+++ b/src/pulsecore/arpa-inet.h
@@ -1,7 +1,6 @@
#ifndef fooarpa_inethfoo
#define fooarpa_inethfoo
-
#if defined(HAVE_ARPA_INET_H)
#include <arpa/inet.h>
@@ -19,5 +18,4 @@ int inet_pton(int af, const char *src, void *dst);
#endif
-
#endif
diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c
index e374694..866cd16 100644
--- a/src/pulsecore/cli-command.c
+++ b/src/pulsecore/cli-command.c
@@ -1282,7 +1282,6 @@ static int pa_cli_command_play_file(pa_core *c, pa_tokenizer *t, pa_strbuf *buf,
return -1;
}
-
return pa_play_file(sink, fname, NULL);
}
diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c
index 9b31e97..1cf68d0 100644
--- a/src/pulsecore/cli-text.c
+++ b/src/pulsecore/cli-text.c
@@ -255,7 +255,6 @@ char *pa_sink_list_to_string(pa_core *c) {
cmn = pa_channel_map_to_pretty_name(&sink->channel_map);
-
pa_strbuf_printf(
s,
" %c index: %u\n"
@@ -470,7 +469,6 @@ char *pa_source_list_to_string(pa_core *c) {
return pa_strbuf_tostring_free(s);
}
-
char *pa_source_output_list_to_string(pa_core *c) {
pa_strbuf *s;
pa_source_output *o;
@@ -512,7 +510,6 @@ char *pa_source_output_list_to_string(pa_core *c) {
} else
volume_str = pa_xstrdup("n/a");
-
pa_strbuf_printf(
s,
" index: %u\n"
diff --git a/src/pulsecore/database-simple.c b/src/pulsecore/database-simple.c
index 91c1b45..f0dbcdc 100644
--- a/src/pulsecore/database-simple.c
+++ b/src/pulsecore/database-simple.c
@@ -37,7 +37,6 @@
#include "database.h"
-
typedef struct simple_data {
char *filename;
char *tmp_filename;
diff --git a/src/pulsecore/device-port.c b/src/pulsecore/device-port.c
index 7c1b2ec..57d0293 100644
--- a/src/pulsecore/device-port.c
+++ b/src/pulsecore/device-port.c
@@ -105,7 +105,6 @@ static void device_port_free(pa_object *o) {
pa_xfree(p);
}
-
pa_device_port *pa_device_port_new(pa_core *c, pa_device_port_new_data *data, size_t extra) {
pa_device_port *p;
diff --git a/src/pulsecore/esound.h b/src/pulsecore/esound.h
index 965f4db..5d6ec95 100644
--- a/src/pulsecore/esound.h
+++ b/src/pulsecore/esound.h
@@ -24,7 +24,6 @@
/* Most of the following is blatantly stolen from esound. */
-
/* path and name of the default EsounD domain socket */
#define ESD_UNIX_SOCKET_DIR "/tmp/.esd"
#define ESD_UNIX_SOCKET_NAME "/tmp/.esd/socket"
@@ -51,7 +50,6 @@
#define ESD_VOLUME_BASE (256)
-
/*************************************/
/* what can we do to/with the EsounD */
enum esd_proto {
@@ -205,5 +203,4 @@ typedef int esd_client_state_t;
/* server and the client match; if it's SWAP_ENDIAN_KEY, swap data */
#define ESD_SWAP_ENDIAN_KEY (PA_UINT32_SWAP(ESD_ENDIAN_KEY))
-
#endif
diff --git a/src/pulsecore/fdsem.h b/src/pulsecore/fdsem.h
index 90e8599..a434ac3 100644
--- a/src/pulsecore/fdsem.h
+++ b/src/pulsecore/fdsem.h
@@ -50,5 +50,4 @@ int pa_fdsem_get(pa_fdsem *f);
int pa_fdsem_before_poll(pa_fdsem *f);
int pa_fdsem_after_poll(pa_fdsem *f);
-
#endif
diff --git a/src/pulsecore/memblockq.h b/src/pulsecore/memblockq.h
index 88906ba..a81ab85 100644
--- a/src/pulsecore/memblockq.h
+++ b/src/pulsecore/memblockq.h
@@ -37,7 +37,6 @@
typedef struct pa_memblockq pa_memblockq;
-
/* Parameters:
- name: name for debugging purposes
diff --git a/src/pulsecore/object.h b/src/pulsecore/object.h
index 8be429e..c605771 100644
--- a/src/pulsecore/object.h
+++ b/src/pulsecore/object.h
@@ -116,5 +116,4 @@ static inline pa_object* pa_object_cast(void *o) {
} \
struct __stupid_useless_struct_to_allow_trailing_semicolon
-
#endif
diff --git a/src/pulsecore/poll.h b/src/pulsecore/poll.h
index dc741e5..8905dd2 100644
--- a/src/pulsecore/poll.h
+++ b/src/pulsecore/poll.h
@@ -49,7 +49,6 @@ struct pollfd {
short int revents; /* Types of events that actually occurred. */
};
-
/* Poll the file descriptors described by the NFDS structures starting at
FDS. If TIMEOUT is nonzero and not -1, allow TIMEOUT milliseconds for
an event to occur; if TIMEOUT is -1, block until an event occurs.
diff --git a/src/pulsecore/protocol-dbus.h b/src/pulsecore/protocol-dbus.h
index 8999933..aac7423 100644
--- a/src/pulsecore/protocol-dbus.h
+++ b/src/pulsecore/protocol-dbus.h
@@ -110,7 +110,6 @@ typedef struct pa_dbus_interface_info {
unsigned n_signals;
} pa_dbus_interface_info;
-
/* The following functions may only be called from the main thread. */
/* Registers the given interface to the given object path. It doesn't matter
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 2f0a990..1fa2b38 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -1589,7 +1589,6 @@ static int sink_input_process_msg(pa_msgobject *o, int code, void *userdata, int
return pa_sink_input_process_msg(o, code, userdata, offset, chunk);
}
-
static bool handle_input_underrun(playback_stream *s, bool force) {
bool send_drain;
@@ -1625,7 +1624,6 @@ static bool sink_input_process_underrun_cb(pa_sink_input *i) {
return handle_input_underrun(s, true);
}
-
/* Called from thread context */
static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk) {
playback_stream *s;
@@ -2455,7 +2453,6 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin
}
}
-
if (!pa_tagstruct_eof(t)) {
protocol_error(c);
goto finish;
diff --git a/src/pulsecore/remap.c b/src/pulsecore/remap.c
index 5d0cd62..8585e34 100644
--- a/src/pulsecore/remap.c
+++ b/src/pulsecore/remap.c
@@ -178,7 +178,6 @@ static void init_remap_c(pa_remap_t *m) {
}
}
-
/* default C implementation */
static pa_init_remap_func_t remap_func = init_remap_c;
diff --git a/src/pulsecore/shmasyncq.c b/src/pulsecore/shmasyncq.c
index eac56ad..e6599a9 100644
--- a/src/pulsecore/shmasyncq.c
+++ b/src/pulsecore/shmasyncq.c
@@ -46,7 +46,6 @@
#define _Y do { } while(0)
#endif
-
struct pa_shmasyncq {
pa_fdsem *read_fdsem, *write_fdsem;
pa_shmasyncq_data *data;
diff --git a/src/pulsecore/shmasyncq.h b/src/pulsecore/shmasyncq.h
index 4212055..67ce607 100644
--- a/src/pulsecore/shmasyncq.h
+++ b/src/pulsecore/shmasyncq.h
@@ -28,7 +28,6 @@
/* Similar to pa_asyncq, but stores data in a shared memory segment */
-
struct pa_shmasyncq_data {
unsigned n_elements;
size_t element_size;
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index 8666c60..2cc0738 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -1063,7 +1063,6 @@ bool pa_sink_input_process_underrun(pa_sink_input *i) {
return false;
}
-
/* Called from thread context */
void pa_sink_input_process_rewind(pa_sink_input *i, size_t nbytes /* in sink sample spec */) {
size_t lbq;
diff --git a/src/pulsecore/sink-input.h b/src/pulsecore/sink-input.h
index 47bdaed..fcd1545 100644
--- a/src/pulsecore/sink-input.h
+++ b/src/pulsecore/sink-input.h
@@ -415,7 +415,6 @@ pa_usec_t pa_sink_input_set_requested_latency_within_thread(pa_sink_input *i, pa
pa_bool_t pa_sink_input_safe_to_remove(pa_sink_input *i);
bool pa_sink_input_process_underrun(pa_sink_input *i);
-
pa_memchunk* pa_sink_input_get_silence(pa_sink_input *i, pa_memchunk *ret);
#define pa_sink_input_assert_io_context(s) \
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index a237669..cf3a90e 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -148,7 +148,6 @@ void pa_sink_new_data_done(pa_sink_new_data *data) {
pa_xfree(data->active_port);
}
-
/* Called from main context */
static void reset_callbacks(pa_sink *s) {
pa_assert(s);
diff --git a/src/pulsecore/sndfile-util.c b/src/pulsecore/sndfile-util.c
index 365c9b6..0820ee4 100644
--- a/src/pulsecore/sndfile-util.c
+++ b/src/pulsecore/sndfile-util.c
@@ -144,7 +144,6 @@ int pa_sndfile_write_sample_spec(SF_INFO *sfi, pa_sample_spec *ss) {
break;
}
-
if (!pa_sample_spec_valid(ss))
return -1;
@@ -418,7 +417,6 @@ pa_sndfile_writef_t pa_sndfile_writef_function(const pa_sample_spec *ss) {
int pa_sndfile_format_from_string(const char *name) {
int i, count = 0;
-
if (!name[0])
return -1;
diff --git a/src/pulsecore/socket-client.c b/src/pulsecore/socket-client.c
index 23d5d88..a12757a 100644
--- a/src/pulsecore/socket-client.c
+++ b/src/pulsecore/socket-client.c
@@ -226,7 +226,6 @@ pa_socket_client* pa_socket_client_new_ipv4(pa_mainloop_api *m, uint32_t address
return pa_socket_client_new_sockaddr(m, (struct sockaddr*) &sa, sizeof(sa));
}
-
pa_socket_client* pa_socket_client_new_unix(pa_mainloop_api *m, const char *filename) {
#ifdef HAVE_SYS_UN_H
struct sockaddr_un sa;
diff --git a/src/pulsecore/socket-util.c b/src/pulsecore/socket-util.c
index 2b8d463..68119d1 100644
--- a/src/pulsecore/socket-util.c
+++ b/src/pulsecore/socket-util.c
@@ -280,7 +280,6 @@ int pa_unix_socket_remove_stale(const char *fn) {
#endif /* HAVE_SYS_UN_H */
-
pa_bool_t pa_socket_address_is_local(const struct sockaddr *sa) {
pa_assert(sa);
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index cba518b..98a8bcc 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -2779,7 +2779,6 @@ pa_bool_t pa_source_volume_change_apply(pa_source *s, pa_usec_t *usec_to_next) {
return ret;
}
-
/* Called from the main thread */
/* Gets the list of formats supported by the source. The members and idxset must
* be freed by the caller. */
diff --git a/src/pulsecore/svolume_sse.c b/src/pulsecore/svolume_sse.c
index daa87ca..9979087 100644
--- a/src/pulsecore/svolume_sse.c
+++ b/src/pulsecore/svolume_sse.c
@@ -73,7 +73,6 @@
" por %%xmm4, "#s1" \n\t" /* .. | l h | */ \
" por %%xmm5, "#s2" \n\t"
-
static int channel_overread_table[8] = {8,8,8,12,8,10,12,14};
static void pa_volume_s16ne_sse2(int16_t *samples, const int32_t *volumes, unsigned channels, unsigned length) {
diff --git a/src/pulsecore/time-smoother.c b/src/pulsecore/time-smoother.c
index 7a61a75..9b4a950 100644
--- a/src/pulsecore/time-smoother.c
+++ b/src/pulsecore/time-smoother.c
@@ -134,7 +134,6 @@ void pa_smoother_free(pa_smoother* s) {
x = ((x)+1) % HISTORY_MAX; \
} while(FALSE)
-
static void drop_old(pa_smoother *s, pa_usec_t x) {
/* Drop items from history which are too old, but make sure to
diff --git a/src/pulsecore/x11prop.c b/src/pulsecore/x11prop.c
index baf5b01..0fa30a3 100644
--- a/src/pulsecore/x11prop.c
+++ b/src/pulsecore/x11prop.c
@@ -100,7 +100,6 @@ char* pa_x11_get_prop(xcb_connection_t *xcb, int screen, const char *name, char
pa_assert(name);
pa_assert(p);
-
xs = screen_of_display(xcb, screen);
/*
* Also try and get the settings from the first screen.
diff --git a/src/tests/alsa-mixer-path-test.c b/src/tests/alsa-mixer-path-test.c
index f2bc4cb..ac92d78 100644
--- a/src/tests/alsa-mixer-path-test.c
+++ b/src/tests/alsa-mixer-path-test.c
@@ -53,7 +53,6 @@ static pa_strlist *load_makefile() {
return result;
}
-
START_TEST (mixer_path_test) {
DIR *dir;
struct dirent *ent;
diff --git a/src/tests/mix-special-test.c b/src/tests/mix-special-test.c
index df86ccb..3d36116 100644
--- a/src/tests/mix-special-test.c
+++ b/src/tests/mix-special-test.c
@@ -194,7 +194,6 @@ static void pa_mix_generic_s16ne(pa_mix_info streams[], unsigned nstreams, unsig
}
}
-
#define SAMPLES 1028
#define TIMES 1000
#define TIMES2 100
diff --git a/src/tests/mix-test.c b/src/tests/mix-test.c
index 4980dd0..e2ef490 100644
--- a/src/tests/mix-test.c
+++ b/src/tests/mix-test.c
@@ -35,7 +35,6 @@
#include <pulsecore/sample-util.h>
#include <pulsecore/mix.h>
-
/* PA_SAMPLE_U8 */
static const uint8_t u8_result[3][10] = {
{ 0x00, 0xff, 0x7f, 0x80, 0x9f, 0x3f, 0x01, 0xf0, 0x20, 0x21 },
diff --git a/src/tests/remix-test.c b/src/tests/remix-test.c
index 19f5582..9d169be 100644
--- a/src/tests/remix-test.c
+++ b/src/tests/remix-test.c
@@ -76,7 +76,6 @@ int main(int argc, char *argv[]) {
pa_resampler_free(r);
}
-
pa_mempool_free(pool);
return 0;
diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c
index dc477aa..352a9d8 100644
--- a/src/utils/pacmd.c
+++ b/src/utils/pacmd.c
@@ -168,7 +168,6 @@ int main(int argc, char*argv[]) {
goto quit;
}
-
if (r >= 0)
break;
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index f52e37c..b3dca78 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -715,7 +715,6 @@ static void get_source_output_info_callback(pa_context *c, const pa_source_outpu
printf("\n");
nl = TRUE;
-
pa_snprintf(t, sizeof(t), "%u", i->owner_module);
pa_snprintf(k, sizeof(k), "%u", i->client);
diff --git a/src/utils/pasuspender.c b/src/utils/pasuspender.c
index 0da570e..5ede7f4 100644
--- a/src/utils/pasuspender.c
+++ b/src/utils/pasuspender.c
@@ -59,7 +59,6 @@ static void quit(int ret) {
mainloop_api->quit(mainloop_api, ret);
}
-
static void context_drain_complete(pa_context *c, void *userdata) {
pa_context_disconnect(c);
}
diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
index 16cf866..c5e6cfb 100644
--- a/src/utils/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -40,7 +40,6 @@
#include <pulsecore/native-common.h>
#include <pulsecore/x11prop.h>
-
int main(int argc, char *argv[]) {
const char *dname = NULL, *sink = NULL, *source = NULL, *server = NULL, *cookie_file = PA_NATIVE_COOKIE_FILE;
int c, ret = 1, screen = 0;
commit e95d054e40f65bdf84bf80d289d6cbcdc3b076d5
Author: poljar (Damir Jelić) <poljarinho at gmail.com>
Date: Tue Jun 18 22:24:24 2013 +0200
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.
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 0f82df6..dc7146f 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 15b6aeb..77dbb86 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 6860b82..bc2ea9b 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 b556349..8d2286b 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 fe05e3d..e5da454 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 a517e59..ea3db48 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 ab828be..2a795f1 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 ddb09b5..cef0aad 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 71f6ebb..7517d4a 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 4652e6f..849bc87 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 b1a5176..be5664b 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 35cecea..8c49db8 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 66b9617..bc2c0c4 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 05a99a2..a72f78b 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 ca5ea0d..508bfa1 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 667a887..64f663d 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 85c97b3..9b31e97 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 7b59fbc..2c86ac2 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 d40c224..41ecb10 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 9660702..7c1b2ec 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 708878e..2f0a990 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 a473552..a237669 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 911684b..cba518b 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 37e6bf8..f610566 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 5102e2e..f52e37c 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";
commit cbd274676d510b755e9b670e40228d490707a5b8
Author: poljar (Damir Jelić) <poljarinho at gmail.com>
Date: Tue Jun 18 16:45:30 2013 +0200
Style fix: Add a space between the closing/opening bracket
This patch replaces every occurrence of '){' with ') {'.
The ffmpeg source tree was excluded since it will disappear anyways.
Command used for this:
find . -type d \( -name ffmpeg \) -prune -o \
-regex '\(.*\.[hc]\|.*\.cc\)' \
-exec sed -i -e 's/){/) {/' {} \;
diff --git a/src/daemon/ltdl-bind-now.c b/src/daemon/ltdl-bind-now.c
index 6fd66e9..9c67a7d 100644
--- a/src/daemon/ltdl-bind-now.c
+++ b/src/daemon/ltdl-bind-now.c
@@ -86,7 +86,7 @@ static int bind_now_close(lt_user_data d, lt_module m) {
pa_assert(m);
- if (dlclose(m) != 0){
+ if (dlclose(m) != 0) {
lt_dlseterror(LT_ERROR_CANNOT_CLOSE);
return 1;
}
diff --git a/src/modules/gconf/module-gconf.c b/src/modules/gconf/module-gconf.c
index c60d0f0..d5d3368 100644
--- a/src/modules/gconf/module-gconf.c
+++ b/src/modules/gconf/module-gconf.c
@@ -215,7 +215,7 @@ static int handle_event(struct userdata *u) {
int ret = 0;
do {
- if ((opcode = read_byte(u)) < 0){
+ if ((opcode = read_byte(u)) < 0) {
if (errno == EINTR || errno == EAGAIN)
break;
goto fail;
diff --git a/src/modules/module-equalizer-sink.c b/src/modules/module-equalizer-sink.c
index d3bdda0..505e60b 100644
--- a/src/modules/module-equalizer-sink.c
+++ b/src/modules/module-equalizer-sink.c
@@ -155,19 +155,19 @@ static const char* const valid_modargs[] = {
static void dbus_init(struct userdata *u);
static void dbus_done(struct userdata *u);
-static void hanning_window(float *W, size_t window_size){
+static void hanning_window(float *W, size_t window_size) {
/* h=.5*(1-cos(2*pi*j/(window_size+1)), COLA for R=(M+1)/2 */
for (size_t i = 0; i < window_size; ++i)
W[i] = (float).5 * (1 - cos(2*M_PI*i / (window_size+1)));
}
-static void fix_filter(float *H, size_t fft_size){
+static void fix_filter(float *H, size_t fft_size) {
/* divide out the fft gain */
for (size_t i = 0; i < fft_size / 2 + 1; ++i)
H[i] /= fft_size;
}
-static void interpolate(float *samples, size_t length, uint32_t *xs, float *ys, size_t n_points){
+static void interpolate(float *samples, size_t length, uint32_t *xs, float *ys, size_t n_points) {
/* Note that xs must be monotonically increasing! */
float x_range_lower, x_range_upper, c0;
@@ -211,7 +211,7 @@ static pa_bool_t is_monotonic(const uint32_t *xs, size_t length) {
}
/* ensures memory allocated is a multiple of v_size and aligned */
-static void * alloc(size_t x, size_t s){
+static void * alloc(size_t x, size_t s) {
size_t f;
float *t;
@@ -222,7 +222,7 @@ static void * alloc(size_t x, size_t s){
return t;
}
-static void alloc_input_buffers(struct userdata *u, size_t min_buffer_length){
+static void alloc_input_buffers(struct userdata *u, size_t min_buffer_length) {
if (min_buffer_length <= u->input_buffer_max)
return;
@@ -362,11 +362,11 @@ static void dsp_logic(
const float * restrict H,//The freq. magnitude scalers filter
const float * restrict W,//The windowing function
fftwf_complex * restrict output_window,//The transformed windowed src
- struct userdata *u){
+ struct userdata *u) {
//use a linear-phase sliding STFT and overlap-add method (for each channel)
//window the data
- for(size_t j = 0; j < u->window_size; ++j){
+ for(size_t j = 0; j < u->window_size; ++j) {
dst[j] = X * W[j] * src[j];
}
//zero pad the remaining fft window
@@ -375,7 +375,7 @@ static void dsp_logic(
//do fft
fftwf_execute_dft_r2c(u->forward_plan, dst, output_window);
//perform filtering
- for(size_t j = 0; j < FILTER_SIZE(u); ++j){
+ for(size_t j = 0; j < FILTER_SIZE(u); ++j) {
u->output_window[j][0] *= H[j];
u->output_window[j][1] *= H[j];
}
@@ -384,18 +384,18 @@ static void dsp_logic(
////debug: tests overlapping add
////and negates ALL PREVIOUS processing
////yields a perfect reconstruction if COLA is held
- //for(size_t j = 0; j < u->window_size; ++j){
+ //for(size_t j = 0; j < u->window_size; ++j) {
// u->work_buffer[j] = u->W[j] * u->input[c][j];
//}
//overlap add and preserve overlap component from this window (linear phase)
- for(size_t j = 0; j < u->overlap_size; ++j){
+ for(size_t j = 0; j < u->overlap_size; ++j) {
u->work_buffer[j] += overlap[j];
overlap[j] = dst[u->R + j];
}
////debug: tests if basic buffering works
////shouldn't modify the signal AT ALL (beyond roundoff)
- //for(size_t j = 0; j < u->window_size;++j){
+ //for(size_t j = 0; j < u->window_size;++j) {
// u->work_buffer[j] = u->input[c][j];
//}
@@ -424,14 +424,14 @@ static void dsp_logic(
const float * restrict H,//The freq. magnitude scalers filter
const float * restrict W,//The windowing function
fftwf_complex * restrict output_window,//The transformed windowed src
- struct userdata *u){//Collection of constants
+ struct userdata *u) {//Collection of constants
const size_t overlap_size = PA_ROUND_UP(u->overlap_size, v_size);
float_vector_t x;
x.f[0] = x.f[1] = x.f[2] = x.f[3] = X;
//assert(u->samples_gathered >= u->R);
//use a linear-phase sliding STFT and overlap-add method
- for(size_t j = 0; j < u->window_size; j += v_size){
+ for(size_t j = 0; j < u->window_size; j += v_size) {
//dst[j] = W[j] * src[j];
float_vector_t *d = (float_vector_t*) (dst + j);
float_vector_t *w = (float_vector_t*) (W + j);
@@ -448,7 +448,7 @@ static void dsp_logic(
//do fft
fftwf_execute_dft_r2c(u->forward_plan, dst, output_window);
//perform filtering - purely magnitude based
- for(size_t j = 0; j < FILTER_SIZE; j += v_size / 2){
+ for(size_t j = 0; j < FILTER_SIZE; j += v_size / 2) {
//output_window[j][0]*=H[j];
//output_window[j][1]*=H[j];
float_vector_t *d = (float_vector_t*)( ((float *) output_window) + 2 * j);
@@ -468,12 +468,12 @@ static void dsp_logic(
////debug: tests overlapping add
////and negates ALL PREVIOUS processing
////yields a perfect reconstruction if COLA is held
- //for(size_t j = 0; j < u->window_size; ++j){
+ //for(size_t j = 0; j < u->window_size; ++j) {
// dst[j] = W[j] * src[j];
//}
//overlap add and preserve overlap component from this window (linear phase)
- for(size_t j = 0; j < overlap_size; j += v_size){
+ for(size_t j = 0; j < overlap_size; j += v_size) {
//dst[j]+=overlap[j];
//overlap[j]+=dst[j+R];
float_vector_t *d = (float_vector_t*)(dst + j);
@@ -492,7 +492,7 @@ static void dsp_logic(
////debug: tests if basic buffering works
////shouldn't modify the signal AT ALL (beyond roundoff)
- //for(size_t j = 0; j < u->window_size; ++j){
+ //for(size_t j = 0; j < u->window_size; ++j) {
// dst[j] = src[j];
//}
@@ -503,12 +503,12 @@ static void dsp_logic(
}
#endif
-static void flatten_to_memblockq(struct userdata *u){
+static void flatten_to_memblockq(struct userdata *u) {
size_t mbs = pa_mempool_block_size_max(u->sink->core->mempool);
pa_memchunk tchunk;
char *dst;
size_t i = 0;
- while(i < u->output_buffer_length){
+ while(i < u->output_buffer_length) {
tchunk.index = 0;
tchunk.length = PA_MIN((u->output_buffer_length - i), mbs);
tchunk.memblock = pa_memblock_new(u->sink->core->mempool, tchunk.length);
@@ -522,7 +522,7 @@ static void flatten_to_memblockq(struct userdata *u){
}
}
-static void process_samples(struct userdata *u){
+static void process_samples(struct userdata *u) {
size_t fs = pa_frame_size(&(u->sink->sample_spec));
unsigned a_i;
float *H, X;
@@ -530,14 +530,14 @@ static void process_samples(struct userdata *u){
pa_assert(u->samples_gathered >= u->window_size);
iterations = (u->samples_gathered - u->overlap_size) / u->R;
//make sure there is enough buffer memory allocated
- if (iterations * u->R * fs > u->output_buffer_max_length){
+ if (iterations * u->R * fs > u->output_buffer_max_length) {
u->output_buffer_max_length = iterations * u->R * fs;
pa_xfree(u->output_buffer);
u->output_buffer = pa_xmalloc(u->output_buffer_max_length);
}
u->output_buffer_length = iterations * u->R * fs;
- for(size_t iter = 0; iter < iterations; ++iter){
+ for(size_t iter = 0; iter < iterations; ++iter) {
offset = iter * u->R * fs;
for(size_t c = 0;c < u->channels; c++) {
a_i = pa_aupdate_read_begin(u->a_H[c]);
@@ -554,17 +554,17 @@ static void process_samples(struct userdata *u){
u
);
pa_aupdate_read_end(u->a_H[c]);
- if (u->first_iteration){
+ if (u->first_iteration) {
/* The windowing function will make the audio ramped in, as a cheap fix we can
* undo the windowing (for non-zero window values)
*/
- for(size_t i = 0; i < u->overlap_size; ++i){
+ for(size_t i = 0; i < u->overlap_size; ++i) {
u->work_buffer[i] = u->W[i] <= FLT_EPSILON ? u->work_buffer[i] : u->work_buffer[i] / u->W[i];
}
}
pa_sample_clamp(PA_SAMPLE_FLOAT32NE, (uint8_t *) (((float *)u->output_buffer) + c) + offset, fs, u->work_buffer, sizeof(float), u->R);
}
- if (u->first_iteration){
+ if (u->first_iteration) {
u->first_iteration = FALSE;
}
u->samples_gathered -= u->R;
@@ -572,7 +572,7 @@ static void process_samples(struct userdata *u){
flatten_to_memblockq(u);
}
-static void input_buffer(struct userdata *u, pa_memchunk *in){
+static void input_buffer(struct userdata *u, pa_memchunk *in) {
size_t fs = pa_frame_size(&(u->sink->sample_spec));
size_t samples = in->length/fs;
float *src = pa_memblock_acquire_chunk(in);
@@ -608,7 +608,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
fs = pa_frame_size(&(u->sink->sample_spec));
mbs = pa_mempool_block_size_max(u->sink->core->mempool);
- if (pa_memblockq_get_length(u->output_q) > 0){
+ if (pa_memblockq_get_length(u->output_q) > 0) {
//pa_log_debug("qsize is %ld", pa_memblockq_get_length(u->output_q));
goto END;
}
@@ -619,7 +619,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
//mbs = PA_MAX(mbs, u->R);
//target_samples = PA_MAX(target_samples, mbs);
//pa_log_debug("target samples: %ld", target_samples);
- if (u->first_iteration){
+ if (u->first_iteration) {
//allocate request_size
target_samples = PA_MAX(target_samples, u->window_size);
}else{
@@ -703,7 +703,7 @@ static void sink_input_mute_changed_cb(pa_sink_input *i) {
}
#if 0
-static void reset_filter(struct userdata *u){
+static void reset_filter(struct userdata *u) {
size_t fs = pa_frame_size(&u->sink->sample_spec);
size_t max_request;
@@ -871,18 +871,18 @@ static void sink_input_state_change_cb(pa_sink_input *i, pa_sink_input_state_t s
}
}
-static void pack(char **strs, size_t len, char **packed, size_t *length){
+static void pack(char **strs, size_t len, char **packed, size_t *length) {
size_t t_len = 0;
size_t headers = (1+len) * sizeof(uint16_t);
char *p;
- for(size_t i = 0; i < len; ++i){
+ for(size_t i = 0; i < len; ++i) {
t_len += strlen(strs[i]);
}
*length = headers + t_len;
p = *packed = pa_xmalloc0(*length);
*((uint16_t *) p) = (uint16_t) len;
p += sizeof(uint16_t);
- for(size_t i = 0; i < len; ++i){
+ for(size_t i = 0; i < len; ++i) {
uint16_t l = strlen(strs[i]);
*((uint16_t *) p) = (uint16_t) l;
p += sizeof(uint16_t);
@@ -890,13 +890,13 @@ static void pack(char **strs, size_t len, char **packed, size_t *length){
p += l;
}
}
-static void unpack(char *str, size_t length, char ***strs, size_t *len){
+static void unpack(char *str, size_t length, char ***strs, size_t *len) {
char *p = str;
*len = *((uint16_t *) p);
p += sizeof(uint16_t);
*strs = pa_xnew(char *, *len);
- for(size_t i = 0; i < *len; ++i){
+ for(size_t i = 0; i < *len; ++i) {
size_t l = *((uint16_t *) p);
p += sizeof(uint16_t);
(*strs)[i] = pa_xnew(char, l + 1);
@@ -905,7 +905,7 @@ static void unpack(char *str, size_t length, char ***strs, size_t *len){
p += l;
}
}
-static void save_profile(struct userdata *u, size_t channel, char *name){
+static void save_profile(struct userdata *u, size_t channel, char *name) {
unsigned a_i;
const size_t profile_size = CHANNEL_PROFILE_SIZE(u) * sizeof(float);
float *H_n, *profile;
@@ -916,7 +916,7 @@ static void save_profile(struct userdata *u, size_t channel, char *name){
profile[0] = u->Xs[a_i][channel];
H = u->Hs[channel][a_i];
H_n = profile + 1;
- for(size_t i = 0 ; i < FILTER_SIZE(u); ++i){
+ for(size_t i = 0 ; i < FILTER_SIZE(u); ++i) {
H_n[i] = H[i] * u->fft_size;
//H_n[i] = H[i];
}
@@ -927,13 +927,13 @@ static void save_profile(struct userdata *u, size_t channel, char *name){
data.size = profile_size;
pa_database_set(u->database, &key, &data, TRUE);
pa_database_sync(u->database);
- if (u->base_profiles[channel]){
+ if (u->base_profiles[channel]) {
pa_xfree(u->base_profiles[channel]);
}
u->base_profiles[channel] = pa_xstrdup(name);
}
-static void save_state(struct userdata *u){
+static void save_state(struct userdata *u) {
unsigned a_i;
const size_t filter_state_size = FILTER_STATE_SIZE(u) * sizeof(float);
float *H_n, *state;
@@ -949,7 +949,7 @@ static void save_state(struct userdata *u){
memcpy(state + FILTER_STATE_SIZE(u), packed, packed_length);
pa_xfree(packed);
- for(size_t c = 0; c < u->channels; ++c){
+ for(size_t c = 0; c < u->channels; ++c) {
a_i = pa_aupdate_read_begin(u->a_H[c]);
state[c * CHANNEL_PROFILE_SIZE(u)] = u->Xs[c][a_i];
H = u->Hs[c][a_i];
@@ -973,7 +973,7 @@ static void save_state(struct userdata *u){
pa_xfree(state);
}
-static void remove_profile(pa_core *c, char *name){
+static void remove_profile(pa_core *c, char *name) {
pa_datum key;
pa_database *database;
key.data = name;
@@ -983,14 +983,14 @@ static void remove_profile(pa_core *c, char *name){
pa_database_sync(database);
}
-static const char* load_profile(struct userdata *u, size_t channel, char *name){
+static const char* load_profile(struct userdata *u, size_t channel, char *name) {
unsigned a_i;
pa_datum key, value;
const size_t profile_size = CHANNEL_PROFILE_SIZE(u) * sizeof(float);
key.data = name;
key.size = strlen(key.data);
- if (pa_database_get(u->database, &key, &value) != NULL){
- if (value.size == profile_size){
+ if (pa_database_get(u->database, &key, &value) != NULL) {
+ if (value.size == profile_size) {
float *profile = (float *) value.data;
a_i = pa_aupdate_write_begin(u->a_H[channel]);
u->Xs[channel][a_i] = profile[0];
@@ -1009,7 +1009,7 @@ static const char* load_profile(struct userdata *u, size_t channel, char *name){
return NULL;
}
-static void load_state(struct userdata *u){
+static void load_state(struct userdata *u) {
unsigned a_i;
float *H;
pa_datum key, value;
@@ -1018,7 +1018,7 @@ static void load_state(struct userdata *u){
pa_assert_se(dbname = pa_state_path(EQ_STATE_DB, FALSE));
database = pa_database_open(dbname, FALSE);
pa_xfree(dbname);
- if (!database){
+ if (!database) {
pa_log("No resume state");
return;
}
@@ -1026,12 +1026,12 @@ static void load_state(struct userdata *u){
key.data = u->sink->name;
key.size = strlen(key.data);
- if (pa_database_get(database, &key, &value) != NULL){
- if (value.size > FILTER_STATE_SIZE(u) * sizeof(float) + sizeof(uint16_t)){
+ if (pa_database_get(database, &key, &value) != NULL) {
+ if (value.size > FILTER_STATE_SIZE(u) * sizeof(float) + sizeof(uint16_t)) {
float *state = (float *) value.data;
size_t n_profs;
char **names;
- for(size_t c = 0; c < u->channels; ++c){
+ for(size_t c = 0; c < u->channels; ++c) {
a_i = pa_aupdate_write_begin(u->a_H[c]);
H = state + c * CHANNEL_PROFILE_SIZE(u) + 1;
u->Xs[c][a_i] = state[c * CHANNEL_PROFILE_SIZE(u)];
@@ -1040,7 +1040,7 @@ static void load_state(struct userdata *u){
}
unpack(((char *)value.data) + FILTER_STATE_SIZE(u) * sizeof(float), value.size - FILTER_STATE_SIZE(u) * sizeof(float), &names, &n_profs);
n_profs = PA_MIN(n_profs, u->channels);
- for(size_t c = 0; c < n_profs; ++c){
+ for(size_t c = 0; c < n_profs; ++c) {
pa_xfree(u->base_profiles[c]);
u->base_profiles[c] = names[c];
}
@@ -1579,7 +1579,7 @@ static pa_dbus_interface_info equalizer_info={
.n_signals=EQUALIZER_SIGNAL_MAX
};
-void dbus_init(struct userdata *u){
+void dbus_init(struct userdata *u) {
uint32_t dummy;
DBusMessage *message = NULL;
pa_idxset *sink_list = NULL;
@@ -1589,7 +1589,7 @@ void dbus_init(struct userdata *u){
pa_dbus_protocol_add_interface(u->dbus_protocol, u->dbus_path, &equalizer_info, u);
sink_list = pa_shared_get(u->sink->core, SINKLIST);
u->database = pa_shared_get(u->sink->core, EQDB);
- if (sink_list == NULL){
+ if (sink_list == NULL) {
char *dbname;
sink_list=pa_idxset_new(&pa_idxset_trivial_hash_func, &pa_idxset_trivial_compare_func);
pa_shared_set(u->sink->core, SINKLIST, sink_list);
@@ -1608,7 +1608,7 @@ void dbus_init(struct userdata *u){
dbus_message_unref(message);
}
-void dbus_done(struct userdata *u){
+void dbus_done(struct userdata *u) {
pa_idxset *sink_list;
uint32_t dummy;
@@ -1620,7 +1620,7 @@ void dbus_done(struct userdata *u){
pa_assert_se(sink_list=pa_shared_get(u->sink->core,SINKLIST));
pa_idxset_remove_by_data(sink_list,u,&dummy);
- if (pa_idxset_size(sink_list)==0){
+ if (pa_idxset_size(sink_list)==0) {
pa_dbus_protocol_unregister_extension(u->dbus_protocol, EXTNAME);
pa_dbus_protocol_remove_interface(u->dbus_protocol, MANAGER_PATH, manager_info.name);
pa_shared_remove(u->sink->core, EQDB);
@@ -1645,7 +1645,7 @@ void manager_handle_remove_profile(DBusConnection *conn, DBusMessage *msg, void
dbus_error_init(&error);
if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_STRING, &name,
- DBUS_TYPE_INVALID)){
+ DBUS_TYPE_INVALID)) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
dbus_error_free(&error);
return;
@@ -1660,12 +1660,12 @@ void manager_handle_remove_profile(DBusConnection *conn, DBusMessage *msg, void
dbus_message_unref(message);
}
-void manager_get_revision(DBusConnection *conn, DBusMessage *msg, void *_u){
+void manager_get_revision(DBusConnection *conn, DBusMessage *msg, void *_u) {
uint32_t rev=1;
pa_dbus_send_basic_value_reply(conn, msg, DBUS_TYPE_UINT32, &rev);
}
-static void get_sinks(pa_core *u, char ***names, unsigned *n_sinks){
+static void get_sinks(pa_core *u, char ***names, unsigned *n_sinks) {
void *iter = NULL;
struct userdata *sink_u = NULL;
uint32_t dummy;
@@ -1677,13 +1677,13 @@ static void get_sinks(pa_core *u, char ***names, unsigned *n_sinks){
pa_assert_se(sink_list = pa_shared_get(u, SINKLIST));
*n_sinks = (unsigned) pa_idxset_size(sink_list);
*names = *n_sinks > 0 ? pa_xnew0(char *,*n_sinks) : NULL;
- for(uint32_t i = 0; i < *n_sinks; ++i){
+ for(uint32_t i = 0; i < *n_sinks; ++i) {
sink_u = (struct userdata *) pa_idxset_iterate(sink_list, &iter, &dummy);
(*names)[i] = pa_xstrdup(sink_u->dbus_path);
}
}
-void manager_get_sinks(DBusConnection *conn, DBusMessage *msg, void *_u){
+void manager_get_sinks(DBusConnection *conn, DBusMessage *msg, void *_u) {
unsigned n;
char **names = NULL;
pa_assert(conn);
@@ -1692,13 +1692,13 @@ void manager_get_sinks(DBusConnection *conn, DBusMessage *msg, void *_u){
get_sinks((pa_core *) _u, &names, &n);
pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, names, n);
- for(unsigned i = 0; i < n; ++i){
+ for(unsigned i = 0; i < n; ++i) {
pa_xfree(names[i]);
}
pa_xfree(names);
}
-static void get_profiles(pa_core *c, char ***names, unsigned *n){
+static void get_profiles(pa_core *c, char ***names, unsigned *n) {
char *name;
pa_database *database;
pa_datum key, next_key;
@@ -1711,7 +1711,7 @@ static void get_profiles(pa_core *c, char ***names, unsigned *n){
pa_assert(n);
done = !pa_database_first(database, &key, NULL);
*n = 0;
- while(!done){
+ while(!done) {
done = !pa_database_next(database, &key, &next_key, NULL);
name=pa_xmalloc(key.size + 1);
memcpy(name, key.data, key.size);
@@ -1724,14 +1724,14 @@ static void get_profiles(pa_core *c, char ***names, unsigned *n){
}
(*names) = *n > 0 ? pa_xnew0(char *, *n) : NULL;
iter=head;
- for(unsigned i = 0; i < *n; ++i){
+ for(unsigned i = 0; i < *n; ++i) {
(*names)[*n - 1 - i] = pa_xstrdup(pa_strlist_data(iter));
iter = pa_strlist_next(iter);
}
pa_strlist_free(head);
}
-void manager_get_profiles(DBusConnection *conn, DBusMessage *msg, void *_u){
+void manager_get_profiles(DBusConnection *conn, DBusMessage *msg, void *_u) {
char **names;
unsigned n;
pa_assert(conn);
@@ -1740,13 +1740,13 @@ void manager_get_profiles(DBusConnection *conn, DBusMessage *msg, void *_u){
get_profiles((pa_core *)_u, &names, &n);
pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_STRING, names, n);
- for(unsigned i = 0; i < n; ++i){
+ for(unsigned i = 0; i < n; ++i) {
pa_xfree(names[i]);
}
pa_xfree(names);
}
-void manager_get_all(DBusConnection *conn, DBusMessage *msg, void *_u){
+void manager_get_all(DBusConnection *conn, DBusMessage *msg, void *_u) {
pa_core *c;
char **names = NULL;
unsigned n;
@@ -1766,14 +1766,14 @@ void manager_get_all(DBusConnection *conn, DBusMessage *msg, void *_u){
get_sinks(c, &names, &n);
pa_dbus_append_basic_array_variant_dict_entry(&dict_iter,manager_handlers[MANAGER_HANDLER_EQUALIZED_SINKS].property_name, DBUS_TYPE_OBJECT_PATH, names, n);
- for(unsigned i = 0; i < n; ++i){
+ for(unsigned i = 0; i < n; ++i) {
pa_xfree(names[i]);
}
pa_xfree(names);
get_profiles(c, &names, &n);
pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, manager_handlers[MANAGER_HANDLER_PROFILES].property_name, DBUS_TYPE_STRING, names, n);
- for(unsigned i = 0; i < n; ++i){
+ for(unsigned i = 0; i < n; ++i) {
pa_xfree(names[i]);
}
pa_xfree(names);
@@ -1804,38 +1804,38 @@ void equalizer_handle_seed_filter(DBusConnection *conn, DBusMessage *msg, void *
DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &xs, &x_npoints,
DBUS_TYPE_ARRAY, DBUS_TYPE_DOUBLE, &_ys, &y_npoints,
DBUS_TYPE_DOUBLE, &preamp,
- DBUS_TYPE_INVALID)){
+ DBUS_TYPE_INVALID)) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
dbus_error_free(&error);
return;
}
- if (channel > u->channels){
+ if (channel > u->channels) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
}
- for(size_t i = 0; i < x_npoints; ++i){
- if (xs[i] >= FILTER_SIZE(u)){
+ for(size_t i = 0; i < x_npoints; ++i) {
+ if (xs[i] >= FILTER_SIZE(u)) {
points_good = FALSE;
break;
}
}
- if (!is_monotonic(xs, x_npoints) || !points_good){
+ if (!is_monotonic(xs, x_npoints) || !points_good) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "xs must be monotonic and 0<=x<=%zd", u->fft_size / 2);
dbus_error_free(&error);
return;
- }else if (x_npoints != y_npoints || x_npoints < 2 || x_npoints > FILTER_SIZE(u)){
+ }else if (x_npoints != y_npoints || x_npoints < 2 || x_npoints > FILTER_SIZE(u)) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "xs and ys must be the same length and 2<=l<=%zd!", FILTER_SIZE(u));
dbus_error_free(&error);
return;
- }else if (xs[0] != 0 || xs[x_npoints - 1] != u->fft_size / 2){
+ }else if (xs[0] != 0 || xs[x_npoints - 1] != u->fft_size / 2) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "xs[0] must be 0 and xs[-1]=fft_size/2");
dbus_error_free(&error);
return;
}
ys = pa_xmalloc(x_npoints * sizeof(float));
- for(uint32_t i = 0; i < x_npoints; ++i){
+ for(uint32_t i = 0; i < x_npoints; ++i) {
ys[i] = (float) _ys[i];
}
r_channel = channel == u->channels ? 0 : channel;
@@ -1844,8 +1844,8 @@ void equalizer_handle_seed_filter(DBusConnection *conn, DBusMessage *msg, void *
u->Xs[r_channel][a_i] = preamp;
interpolate(H, FILTER_SIZE(u), xs, ys, x_npoints);
fix_filter(H, u->fft_size);
- if (channel == u->channels){
- for(size_t c = 1; c < u->channels; ++c){
+ if (channel == u->channels) {
+ for(size_t c = 1; c < u->channels; ++c) {
unsigned b_i = pa_aupdate_write_begin(u->a_H[c]);
float *H_p = u->Hs[c][b_i];
u->Xs[c][b_i] = preamp;
@@ -1883,25 +1883,25 @@ void equalizer_handle_get_filter_points(DBusConnection *conn, DBusMessage *msg,
if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_UINT32, &channel,
DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &xs, &x_npoints,
- DBUS_TYPE_INVALID)){
+ DBUS_TYPE_INVALID)) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
dbus_error_free(&error);
return;
}
- if (channel > u->channels){
+ if (channel > u->channels) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
}
- for(size_t i = 0; i < x_npoints; ++i){
- if (xs[i] >= FILTER_SIZE(u)){
+ for(size_t i = 0; i < x_npoints; ++i) {
+ if (xs[i] >= FILTER_SIZE(u)) {
points_good=FALSE;
break;
}
}
- if (x_npoints > FILTER_SIZE(u) || !points_good){
+ if (x_npoints > FILTER_SIZE(u) || !points_good) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "xs indices/length must be <= %zd!", FILTER_SIZE(u));
dbus_error_free(&error);
return;
@@ -1912,7 +1912,7 @@ void equalizer_handle_get_filter_points(DBusConnection *conn, DBusMessage *msg,
a_i = pa_aupdate_read_begin(u->a_H[r_channel]);
H = u->Hs[r_channel][a_i];
preamp = u->Xs[r_channel][a_i];
- for(uint32_t i = 0; i < x_npoints; ++i){
+ for(uint32_t i = 0; i < x_npoints; ++i) {
ys[i] = H[xs[i]] * u->fft_size;
}
pa_aupdate_read_end(u->a_H[r_channel]);
@@ -1928,14 +1928,14 @@ void equalizer_handle_get_filter_points(DBusConnection *conn, DBusMessage *msg,
pa_xfree(ys);
}
-static void get_filter(struct userdata *u, size_t channel, double **H_, double *preamp){
+static void get_filter(struct userdata *u, size_t channel, double **H_, double *preamp) {
float *H;
unsigned a_i;
size_t r_channel = channel == u->channels ? 0 : channel;
*H_ = pa_xnew0(double, FILTER_SIZE(u));
a_i = pa_aupdate_read_begin(u->a_H[r_channel]);
H = u->Hs[r_channel][a_i];
- for(size_t i = 0;i < FILTER_SIZE(u); ++i){
+ for(size_t i = 0;i < FILTER_SIZE(u); ++i) {
(*H_)[i] = H[i] * u->fft_size;
}
*preamp = u->Xs[r_channel][a_i];
@@ -1943,7 +1943,7 @@ static void get_filter(struct userdata *u, size_t channel, double **H_, double *
pa_aupdate_read_end(u->a_H[r_channel]);
}
-void equalizer_handle_get_filter(DBusConnection *conn, DBusMessage *msg, void *_u){
+void equalizer_handle_get_filter(DBusConnection *conn, DBusMessage *msg, void *_u) {
struct userdata *u;
unsigned n_coefs;
uint32_t channel;
@@ -1958,12 +1958,12 @@ void equalizer_handle_get_filter(DBusConnection *conn, DBusMessage *msg, void *_
dbus_error_init(&error);
if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_UINT32, &channel,
- DBUS_TYPE_INVALID)){
+ DBUS_TYPE_INVALID)) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
dbus_error_free(&error);
return;
}
- if (channel > u->channels){
+ if (channel > u->channels) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
@@ -1984,7 +1984,7 @@ void equalizer_handle_get_filter(DBusConnection *conn, DBusMessage *msg, void *_
pa_xfree(H_);
}
-static void set_filter(struct userdata *u, size_t channel, double *H_, double preamp){
+static void set_filter(struct userdata *u, size_t channel, double *H_, double preamp) {
unsigned a_i;
size_t r_channel = channel == u->channels ? 0 : channel;
float *H;
@@ -1992,12 +1992,12 @@ static void set_filter(struct userdata *u, size_t channel, double *H_, double pr
a_i = pa_aupdate_write_begin(u->a_H[r_channel]);
u->Xs[r_channel][a_i] = (float) preamp;
H = u->Hs[r_channel][a_i];
- for(size_t i = 0; i < FILTER_SIZE(u); ++i){
+ for(size_t i = 0; i < FILTER_SIZE(u); ++i) {
H[i] = (float) H_[i];
}
fix_filter(H, u->fft_size);
- if (channel == u->channels){
- for(size_t c = 1; c < u->channels; ++c){
+ if (channel == u->channels) {
+ for(size_t c = 1; c < u->channels; ++c) {
unsigned b_i = pa_aupdate_write_begin(u->a_H[c]);
u->Xs[c][b_i] = u->Xs[r_channel][a_i];
memcpy(u->Hs[c][b_i], u->Hs[r_channel][a_i], FILTER_SIZE(u) * sizeof(float));
@@ -2007,7 +2007,7 @@ static void set_filter(struct userdata *u, size_t channel, double *H_, double pr
pa_aupdate_write_end(u->a_H[r_channel]);
}
-void equalizer_handle_set_filter(DBusConnection *conn, DBusMessage *msg, void *_u){
+void equalizer_handle_set_filter(DBusConnection *conn, DBusMessage *msg, void *_u) {
struct userdata *u;
double *H, preamp;
uint32_t channel;
@@ -2023,17 +2023,17 @@ void equalizer_handle_set_filter(DBusConnection *conn, DBusMessage *msg, void *_
DBUS_TYPE_UINT32, &channel,
DBUS_TYPE_ARRAY, DBUS_TYPE_DOUBLE, &H, &_n_coefs,
DBUS_TYPE_DOUBLE, &preamp,
- DBUS_TYPE_INVALID)){
+ DBUS_TYPE_INVALID)) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
dbus_error_free(&error);
return;
}
- if (channel > u->channels){
+ if (channel > u->channels) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
}
- if (_n_coefs != FILTER_SIZE(u)){
+ if (_n_coefs != FILTER_SIZE(u)) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "This filter takes exactly %zd coefficients, you gave %d", FILTER_SIZE(u), _n_coefs);
return;
}
@@ -2060,12 +2060,12 @@ void equalizer_handle_save_profile(DBusConnection *conn, DBusMessage *msg, void
if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_UINT32, &channel,
DBUS_TYPE_STRING, &name,
- DBUS_TYPE_INVALID)){
+ DBUS_TYPE_INVALID)) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
dbus_error_free(&error);
return;
}
- if (channel > u->channels){
+ if (channel > u->channels) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
@@ -2095,12 +2095,12 @@ void equalizer_handle_load_profile(DBusConnection *conn, DBusMessage *msg, void
if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_UINT32, &channel,
DBUS_TYPE_STRING, &name,
- DBUS_TYPE_INVALID)){
+ DBUS_TYPE_INVALID)) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
dbus_error_free(&error);
return;
}
- if (channel > u->channels){
+ if (channel > u->channels) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
@@ -2108,13 +2108,13 @@ void equalizer_handle_load_profile(DBusConnection *conn, DBusMessage *msg, void
r_channel = channel == u->channels ? 0 : channel;
err_msg = load_profile(u, r_channel, name);
- if (err_msg != NULL){
+ if (err_msg != NULL) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "error loading profile %s: %s", name, err_msg);
dbus_error_free(&error);
return;
}
- if (channel == u->channels){
- for(uint32_t c = 1; c < u->channels; ++c){
+ if (channel == u->channels) {
+ for(uint32_t c = 1; c < u->channels; ++c) {
load_profile(u, c, name);
}
}
@@ -2135,7 +2135,7 @@ void equalizer_handle_save_state(DBusConnection *conn, DBusMessage *msg, void *_
pa_dbus_send_empty_reply(conn, msg);
}
-void equalizer_handle_get_profile_name(DBusConnection *conn, DBusMessage *msg, void *_u){
+void equalizer_handle_get_profile_name(DBusConnection *conn, DBusMessage *msg, void *_u) {
struct userdata *u = (struct userdata *) _u;
DBusError error;
uint32_t channel, r_channel;
@@ -2147,12 +2147,12 @@ void equalizer_handle_get_profile_name(DBusConnection *conn, DBusMessage *msg, v
if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_UINT32, &channel,
- DBUS_TYPE_INVALID)){
+ DBUS_TYPE_INVALID)) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
dbus_error_free(&error);
return;
}
- if (channel > u->channels){
+ if (channel > u->channels) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
@@ -2162,12 +2162,12 @@ void equalizer_handle_get_profile_name(DBusConnection *conn, DBusMessage *msg, v
pa_dbus_send_basic_value_reply(conn,msg, DBUS_TYPE_STRING, &u->base_profiles[r_channel]);
}
-void equalizer_get_revision(DBusConnection *conn, DBusMessage *msg, void *_u){
+void equalizer_get_revision(DBusConnection *conn, DBusMessage *msg, void *_u) {
uint32_t rev=1;
pa_dbus_send_basic_value_reply(conn, msg, DBUS_TYPE_UINT32, &rev);
}
-void equalizer_get_n_channels(DBusConnection *conn, DBusMessage *msg, void *_u){
+void equalizer_get_n_channels(DBusConnection *conn, DBusMessage *msg, void *_u) {
struct userdata *u;
uint32_t channels;
pa_assert_se(u = (struct userdata *) _u);
@@ -2178,7 +2178,7 @@ void equalizer_get_n_channels(DBusConnection *conn, DBusMessage *msg, void *_u){
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &channels);
}
-void equalizer_get_n_coefs(DBusConnection *conn, DBusMessage *msg, void *_u){
+void equalizer_get_n_coefs(DBusConnection *conn, DBusMessage *msg, void *_u) {
struct userdata *u;
uint32_t n_coefs;
pa_assert_se(u = (struct userdata *) _u);
@@ -2189,7 +2189,7 @@ void equalizer_get_n_coefs(DBusConnection *conn, DBusMessage *msg, void *_u){
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &n_coefs);
}
-void equalizer_get_sample_rate(DBusConnection *conn, DBusMessage *msg, void *_u){
+void equalizer_get_sample_rate(DBusConnection *conn, DBusMessage *msg, void *_u) {
struct userdata *u;
uint32_t rate;
pa_assert_se(u = (struct userdata *) _u);
@@ -2200,7 +2200,7 @@ void equalizer_get_sample_rate(DBusConnection *conn, DBusMessage *msg, void *_u)
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &rate);
}
-void equalizer_get_filter_rate(DBusConnection *conn, DBusMessage *msg, void *_u){
+void equalizer_get_filter_rate(DBusConnection *conn, DBusMessage *msg, void *_u) {
struct userdata *u;
uint32_t fft_size;
pa_assert_se(u = (struct userdata *) _u);
@@ -2211,7 +2211,7 @@ void equalizer_get_filter_rate(DBusConnection *conn, DBusMessage *msg, void *_u)
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &fft_size);
}
-void equalizer_get_all(DBusConnection *conn, DBusMessage *msg, void *_u){
+void equalizer_get_all(DBusConnection *conn, DBusMessage *msg, void *_u) {
struct userdata *u;
DBusMessage *reply = NULL;
DBusMessageIter msg_iter, dict_iter;
diff --git a/src/modules/x11/module-x11-xsmp.c b/src/modules/x11/module-x11-xsmp.c
index 765eff0..5cce47d 100644
--- a/src/modules/x11/module-x11-xsmp.c
+++ b/src/modules/x11/module-x11-xsmp.c
@@ -61,7 +61,7 @@ struct userdata {
pa_x11_wrapper *x11;
};
-static void die_cb(SmcConn connection, SmPointer client_data){
+static void die_cb(SmcConn connection, SmPointer client_data) {
struct userdata *u = client_data;
pa_assert(u);
diff --git a/src/modules/xen/module-xenpv-sink.c b/src/modules/xen/module-xenpv-sink.c
index aba1f75..6663017 100644
--- a/src/modules/xen/module-xenpv-sink.c
+++ b/src/modules/xen/module-xenpv-sink.c
@@ -332,7 +332,7 @@ static void thread_func(void *userdata) {
pa_thread_mq_install(&u->thread_mq);
- for(;;){
+ for(;;) {
struct pollfd *pollfd;
int ret;
diff --git a/src/pulse/volume.c b/src/pulse/volume.c
index cf0a226..0e765ed 100644
--- a/src/pulse/volume.c
+++ b/src/pulse/volume.c
@@ -904,7 +904,7 @@ pa_cvolume* pa_cvolume_inc_clamp(pa_cvolume *v, pa_volume_t inc, pa_volume_t lim
return pa_cvolume_scale(v, m);
}
-pa_cvolume* pa_cvolume_inc(pa_cvolume *v, pa_volume_t inc){
+pa_cvolume* pa_cvolume_inc(pa_cvolume *v, pa_volume_t inc) {
return pa_cvolume_inc_clamp(v, inc, PA_VOLUME_MAX);
}
diff --git a/src/pulsecore/dbus-shared.c b/src/pulsecore/dbus-shared.c
index 3477407..963c09f 100644
--- a/src/pulsecore/dbus-shared.c
+++ b/src/pulsecore/dbus-shared.c
@@ -73,7 +73,7 @@ pa_dbus_connection* pa_dbus_bus_get(pa_core *c, DBusBusType type, DBusError *err
return dbus_connection_new(c, conn, prop_name[type]);
}
-DBusConnection* pa_dbus_connection_get(pa_dbus_connection *c){
+DBusConnection* pa_dbus_connection_get(pa_dbus_connection *c) {
pa_assert(c);
pa_assert(PA_REFCNT_VALUE(c) > 0);
pa_assert(c->connection);
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index 6e56bd3..f60b614 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -353,7 +353,7 @@ int pa_source_output_new(
pa_assert(pa_channel_map_valid(&data->channel_map));
if (!(data->flags & PA_SOURCE_OUTPUT_VARIABLE_RATE) &&
- !pa_sample_spec_equal(&data->sample_spec, &data->source->sample_spec)){
+ !pa_sample_spec_equal(&data->sample_spec, &data->source->sample_spec)) {
/* try to change source rate. This is done before the FIXATE hook since
module-suspend-on-idle can resume a source */
@@ -1435,7 +1435,7 @@ int pa_source_output_finish_move(pa_source_output *o, pa_source *dest, pa_bool_t
}
if (!(o->flags & PA_SOURCE_OUTPUT_VARIABLE_RATE) &&
- !pa_sample_spec_equal(&o->sample_spec, &dest->sample_spec)){
+ !pa_sample_spec_equal(&o->sample_spec, &dest->sample_spec)) {
/* try to change dest sink rate if possible without glitches.
module-suspend-on-idle resumes destination source with
SOURCE_OUTPUT_MOVE_FINISH hook */
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index 8e6ec76..5102e2e 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -1605,7 +1605,7 @@ int main(int argc, char *argv[]) {
else if (pa_streq(argv[optind], "list")) {
action = LIST;
- for (int i = optind+1; i < argc; i++){
+ for (int i = optind+1; i < argc; i++) {
if (pa_streq(argv[i], "modules") || pa_streq(argv[i], "clients") ||
pa_streq(argv[i], "sinks") || pa_streq(argv[i], "sink-inputs") ||
pa_streq(argv[i], "sources") || pa_streq(argv[i], "source-outputs") ||
commit faf991ce220dcb7be3eeb9d8ad36af76becc7188
Author: poljar (Damir Jelić) <poljarinho at gmail.com>
Date: Tue Jun 18 16:45:20 2013 +0200
Style fix: Add a space betwen the if statement and the opening bracket
This patch replaces every occurrence of 'if(' with 'if ('.
The ffmpeg source tree was excluded since it will disappear anyways.
Command used for this:
find . -type d \( -name ffmpeg \) -prune -o \
-regex '\(.*\.[hc]\|.*\.cc\)' \
-exec sed -i -e 's/ if(/ if (/' {} \;
diff --git a/src/modules/module-equalizer-sink.c b/src/modules/module-equalizer-sink.c
index da4dd77..d3bdda0 100644
--- a/src/modules/module-equalizer-sink.c
+++ b/src/modules/module-equalizer-sink.c
@@ -530,7 +530,7 @@ static void process_samples(struct userdata *u){
pa_assert(u->samples_gathered >= u->window_size);
iterations = (u->samples_gathered - u->overlap_size) / u->R;
//make sure there is enough buffer memory allocated
- if(iterations * u->R * fs > u->output_buffer_max_length){
+ if (iterations * u->R * fs > u->output_buffer_max_length){
u->output_buffer_max_length = iterations * u->R * fs;
pa_xfree(u->output_buffer);
u->output_buffer = pa_xmalloc(u->output_buffer_max_length);
@@ -554,7 +554,7 @@ static void process_samples(struct userdata *u){
u
);
pa_aupdate_read_end(u->a_H[c]);
- if(u->first_iteration){
+ if (u->first_iteration){
/* The windowing function will make the audio ramped in, as a cheap fix we can
* undo the windowing (for non-zero window values)
*/
@@ -564,7 +564,7 @@ static void process_samples(struct userdata *u){
}
pa_sample_clamp(PA_SAMPLE_FLOAT32NE, (uint8_t *) (((float *)u->output_buffer) + c) + offset, fs, u->work_buffer, sizeof(float), u->R);
}
- if(u->first_iteration){
+ if (u->first_iteration){
u->first_iteration = FALSE;
}
u->samples_gathered -= u->R;
@@ -608,7 +608,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
fs = pa_frame_size(&(u->sink->sample_spec));
mbs = pa_mempool_block_size_max(u->sink->core->mempool);
- if(pa_memblockq_get_length(u->output_q) > 0){
+ if (pa_memblockq_get_length(u->output_q) > 0){
//pa_log_debug("qsize is %ld", pa_memblockq_get_length(u->output_q));
goto END;
}
@@ -619,7 +619,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
//mbs = PA_MAX(mbs, u->R);
//target_samples = PA_MAX(target_samples, mbs);
//pa_log_debug("target samples: %ld", target_samples);
- if(u->first_iteration){
+ if (u->first_iteration){
//allocate request_size
target_samples = PA_MAX(target_samples, u->window_size);
}else{
@@ -927,7 +927,7 @@ static void save_profile(struct userdata *u, size_t channel, char *name){
data.size = profile_size;
pa_database_set(u->database, &key, &data, TRUE);
pa_database_sync(u->database);
- if(u->base_profiles[channel]){
+ if (u->base_profiles[channel]){
pa_xfree(u->base_profiles[channel]);
}
u->base_profiles[channel] = pa_xstrdup(name);
@@ -989,8 +989,8 @@ static const char* load_profile(struct userdata *u, size_t channel, char *name){
const size_t profile_size = CHANNEL_PROFILE_SIZE(u) * sizeof(float);
key.data = name;
key.size = strlen(key.data);
- if(pa_database_get(u->database, &key, &value) != NULL){
- if(value.size == profile_size){
+ if (pa_database_get(u->database, &key, &value) != NULL){
+ if (value.size == profile_size){
float *profile = (float *) value.data;
a_i = pa_aupdate_write_begin(u->a_H[channel]);
u->Xs[channel][a_i] = profile[0];
@@ -1018,7 +1018,7 @@ static void load_state(struct userdata *u){
pa_assert_se(dbname = pa_state_path(EQ_STATE_DB, FALSE));
database = pa_database_open(dbname, FALSE);
pa_xfree(dbname);
- if(!database){
+ if (!database){
pa_log("No resume state");
return;
}
@@ -1026,8 +1026,8 @@ static void load_state(struct userdata *u){
key.data = u->sink->name;
key.size = strlen(key.data);
- if(pa_database_get(database, &key, &value) != NULL){
- if(value.size > FILTER_STATE_SIZE(u) * sizeof(float) + sizeof(uint16_t)){
+ if (pa_database_get(database, &key, &value) != NULL){
+ if (value.size > FILTER_STATE_SIZE(u) * sizeof(float) + sizeof(uint16_t)){
float *state = (float *) value.data;
size_t n_profs;
char **names;
@@ -1589,7 +1589,7 @@ void dbus_init(struct userdata *u){
pa_dbus_protocol_add_interface(u->dbus_protocol, u->dbus_path, &equalizer_info, u);
sink_list = pa_shared_get(u->sink->core, SINKLIST);
u->database = pa_shared_get(u->sink->core, EQDB);
- if(sink_list == NULL){
+ if (sink_list == NULL){
char *dbname;
sink_list=pa_idxset_new(&pa_idxset_trivial_hash_func, &pa_idxset_trivial_compare_func);
pa_shared_set(u->sink->core, SINKLIST, sink_list);
@@ -1620,7 +1620,7 @@ void dbus_done(struct userdata *u){
pa_assert_se(sink_list=pa_shared_get(u->sink->core,SINKLIST));
pa_idxset_remove_by_data(sink_list,u,&dummy);
- if(pa_idxset_size(sink_list)==0){
+ if (pa_idxset_size(sink_list)==0){
pa_dbus_protocol_unregister_extension(u->dbus_protocol, EXTNAME);
pa_dbus_protocol_remove_interface(u->dbus_protocol, MANAGER_PATH, manager_info.name);
pa_shared_remove(u->sink->core, EQDB);
@@ -1643,7 +1643,7 @@ void manager_handle_remove_profile(DBusConnection *conn, DBusMessage *msg, void
pa_assert(msg);
pa_assert(c);
dbus_error_init(&error);
- if(!dbus_message_get_args(msg, &error,
+ if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_INVALID)){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
@@ -1799,7 +1799,7 @@ void equalizer_handle_seed_filter(DBusConnection *conn, DBusMessage *msg, void *
dbus_error_init(&error);
- if(!dbus_message_get_args(msg, &error,
+ if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_UINT32, &channel,
DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &xs, &x_npoints,
DBUS_TYPE_ARRAY, DBUS_TYPE_DOUBLE, &_ys, &y_npoints,
@@ -1809,26 +1809,26 @@ void equalizer_handle_seed_filter(DBusConnection *conn, DBusMessage *msg, void *
dbus_error_free(&error);
return;
}
- if(channel > u->channels){
+ if (channel > u->channels){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
}
for(size_t i = 0; i < x_npoints; ++i){
- if(xs[i] >= FILTER_SIZE(u)){
+ if (xs[i] >= FILTER_SIZE(u)){
points_good = FALSE;
break;
}
}
- if(!is_monotonic(xs, x_npoints) || !points_good){
+ if (!is_monotonic(xs, x_npoints) || !points_good){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "xs must be monotonic and 0<=x<=%zd", u->fft_size / 2);
dbus_error_free(&error);
return;
- }else if(x_npoints != y_npoints || x_npoints < 2 || x_npoints > FILTER_SIZE(u)){
+ }else if (x_npoints != y_npoints || x_npoints < 2 || x_npoints > FILTER_SIZE(u)){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "xs and ys must be the same length and 2<=l<=%zd!", FILTER_SIZE(u));
dbus_error_free(&error);
return;
- }else if(xs[0] != 0 || xs[x_npoints - 1] != u->fft_size / 2){
+ }else if (xs[0] != 0 || xs[x_npoints - 1] != u->fft_size / 2){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "xs[0] must be 0 and xs[-1]=fft_size/2");
dbus_error_free(&error);
return;
@@ -1844,7 +1844,7 @@ void equalizer_handle_seed_filter(DBusConnection *conn, DBusMessage *msg, void *
u->Xs[r_channel][a_i] = preamp;
interpolate(H, FILTER_SIZE(u), xs, ys, x_npoints);
fix_filter(H, u->fft_size);
- if(channel == u->channels){
+ if (channel == u->channels){
for(size_t c = 1; c < u->channels; ++c){
unsigned b_i = pa_aupdate_write_begin(u->a_H[c]);
float *H_p = u->Hs[c][b_i];
@@ -1880,7 +1880,7 @@ void equalizer_handle_get_filter_points(DBusConnection *conn, DBusMessage *msg,
pa_assert(u);
dbus_error_init(&error);
- if(!dbus_message_get_args(msg, &error,
+ if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_UINT32, &channel,
DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &xs, &x_npoints,
DBUS_TYPE_INVALID)){
@@ -1888,20 +1888,20 @@ void equalizer_handle_get_filter_points(DBusConnection *conn, DBusMessage *msg,
dbus_error_free(&error);
return;
}
- if(channel > u->channels){
+ if (channel > u->channels){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
}
for(size_t i = 0; i < x_npoints; ++i){
- if(xs[i] >= FILTER_SIZE(u)){
+ if (xs[i] >= FILTER_SIZE(u)){
points_good=FALSE;
break;
}
}
- if(x_npoints > FILTER_SIZE(u) || !points_good){
+ if (x_npoints > FILTER_SIZE(u) || !points_good){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "xs indices/length must be <= %zd!", FILTER_SIZE(u));
dbus_error_free(&error);
return;
@@ -1956,14 +1956,14 @@ void equalizer_handle_get_filter(DBusConnection *conn, DBusMessage *msg, void *_
pa_assert(msg);
dbus_error_init(&error);
- if(!dbus_message_get_args(msg, &error,
+ if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_UINT32, &channel,
DBUS_TYPE_INVALID)){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
dbus_error_free(&error);
return;
}
- if(channel > u->channels){
+ if (channel > u->channels){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
@@ -1996,7 +1996,7 @@ static void set_filter(struct userdata *u, size_t channel, double *H_, double pr
H[i] = (float) H_[i];
}
fix_filter(H, u->fft_size);
- if(channel == u->channels){
+ if (channel == u->channels){
for(size_t c = 1; c < u->channels; ++c){
unsigned b_i = pa_aupdate_write_begin(u->a_H[c]);
u->Xs[c][b_i] = u->Xs[r_channel][a_i];
@@ -2019,7 +2019,7 @@ void equalizer_handle_set_filter(DBusConnection *conn, DBusMessage *msg, void *_
pa_assert(msg);
dbus_error_init(&error);
- if(!dbus_message_get_args(msg, &error,
+ if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_UINT32, &channel,
DBUS_TYPE_ARRAY, DBUS_TYPE_DOUBLE, &H, &_n_coefs,
DBUS_TYPE_DOUBLE, &preamp,
@@ -2028,12 +2028,12 @@ void equalizer_handle_set_filter(DBusConnection *conn, DBusMessage *msg, void *_
dbus_error_free(&error);
return;
}
- if(channel > u->channels){
+ if (channel > u->channels){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
}
- if(_n_coefs != FILTER_SIZE(u)){
+ if (_n_coefs != FILTER_SIZE(u)){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "This filter takes exactly %zd coefficients, you gave %d", FILTER_SIZE(u), _n_coefs);
return;
}
@@ -2057,7 +2057,7 @@ void equalizer_handle_save_profile(DBusConnection *conn, DBusMessage *msg, void
pa_assert(u);
dbus_error_init(&error);
- if(!dbus_message_get_args(msg, &error,
+ if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_UINT32, &channel,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_INVALID)){
@@ -2065,7 +2065,7 @@ void equalizer_handle_save_profile(DBusConnection *conn, DBusMessage *msg, void
dbus_error_free(&error);
return;
}
- if(channel > u->channels){
+ if (channel > u->channels){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
@@ -2092,7 +2092,7 @@ void equalizer_handle_load_profile(DBusConnection *conn, DBusMessage *msg, void
pa_assert(u);
dbus_error_init(&error);
- if(!dbus_message_get_args(msg, &error,
+ if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_UINT32, &channel,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_INVALID)){
@@ -2100,7 +2100,7 @@ void equalizer_handle_load_profile(DBusConnection *conn, DBusMessage *msg, void
dbus_error_free(&error);
return;
}
- if(channel > u->channels){
+ if (channel > u->channels){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
@@ -2108,12 +2108,12 @@ void equalizer_handle_load_profile(DBusConnection *conn, DBusMessage *msg, void
r_channel = channel == u->channels ? 0 : channel;
err_msg = load_profile(u, r_channel, name);
- if(err_msg != NULL){
+ if (err_msg != NULL){
pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "error loading profile %s: %s", name, err_msg);
dbus_error_free(&error);
return;
}
- if(channel == u->channels){
+ if (channel == u->channels){
for(uint32_t c = 1; c < u->channels; ++c){
load_profile(u, c, name);
}
@@ -2145,14 +2145,14 @@ void equalizer_handle_get_profile_name(DBusConnection *conn, DBusMessage *msg, v
pa_assert(u);
dbus_error_init(&error);
- if(!dbus_message_get_args(msg, &error,
+ if (!dbus_message_get_args(msg, &error,
DBUS_TYPE_UINT32, &channel,
DBUS_TYPE_INVALID)){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
dbus_error_free(&error);
return;
}
- if(channel > u->channels){
+ if (channel > u->channels){
pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
dbus_error_free(&error);
return;
diff --git a/src/modules/module-mmkbd-evdev.c b/src/modules/module-mmkbd-evdev.c
index 4e89aed..6cfd3a5 100644
--- a/src/modules/module-mmkbd-evdev.c
+++ b/src/modules/module-mmkbd-evdev.c
@@ -203,7 +203,7 @@ int pa__init(pa_module*m) {
pa_log_info("evdev driver version %i.%i.%i", version >> 16, (version >> 8) & 0xff, version & 0xff);
- if(ioctl(u->fd, EVIOCGID, &input_id)) {
+ if (ioctl(u->fd, EVIOCGID, &input_id)) {
pa_log("EVIOCGID failed: %s", pa_cstrerror(errno));
goto fail;
}
diff --git a/src/modules/module-virtual-source.c b/src/modules/module-virtual-source.c
index 58041e7..9049534 100644
--- a/src/modules/module-virtual-source.c
+++ b/src/modules/module-virtual-source.c
@@ -275,7 +275,7 @@ static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk)
/* if uplink sink exists, pull data from there; simplify by using
same length as chunk provided by source */
- if(u->sink && (pa_sink_get_state(u->sink) == PA_SINK_RUNNING)) {
+ if (u->sink && (pa_sink_get_state(u->sink) == PA_SINK_RUNNING)) {
pa_memchunk tchunk;
size_t nbytes = chunk->length;
pa_mix_info streams[2];
diff --git a/src/modules/oss/oss-util.c b/src/modules/oss/oss-util.c
index 3c7f0eb..1d82713 100644
--- a/src/modules/oss/oss-util.c
+++ b/src/modules/oss/oss-util.c
@@ -50,7 +50,7 @@ int pa_oss_open(const char *device, int *mode, int* pcaps) {
pa_assert(mode);
pa_assert(*mode == O_RDWR || *mode == O_RDONLY || *mode == O_WRONLY);
- if(!pcaps)
+ if (!pcaps)
pcaps = ∩︀
if (*mode == O_RDWR) {
diff --git a/src/pulsecore/protocol-http.c b/src/pulsecore/protocol-http.c
index 52571d3..1dcf010 100644
--- a/src/pulsecore/protocol-http.c
+++ b/src/pulsecore/protocol-http.c
@@ -596,7 +596,7 @@ static void handle_listen_prefix(struct connection *c, const char *source_name)
http_response(c, 200, "OK", t);
pa_xfree(t);
- if(c->method == METHOD_HEAD) {
+ if (c->method == METHOD_HEAD) {
connection_unlink(c);
return;
}
diff --git a/src/pulsecore/random.c b/src/pulsecore/random.c
index b2ec19f..e83af05 100644
--- a/src/pulsecore/random.c
+++ b/src/pulsecore/random.c
@@ -55,7 +55,7 @@ static int random_proper(void *ret_data, size_t length) {
pa_assert(length > 0);
if (CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
- if(CryptGenRandom(hCryptProv, length, ret_data))
+ if (CryptGenRandom(hCryptProv, length, ret_data))
ret = 0;
CryptReleaseContext(hCryptProv, 0);
}
commit 5e11ea06efbba02cfb76bffcba193fcc963e4e0f
Author: poljar (Damir Jelić) <poljarinho at gmail.com>
Date: Tue Jun 18 21:53:37 2013 +0200
Whitespace cleanup: Fix broken indentation by hand
This patch fixes wrong indentation introduced by the last patch.
This was mostly done with vim-s retab feature.
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 189dafe..5775d67 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -2182,11 +2182,11 @@ static int jack_parse_state(pa_config_parser_state *state) {
}
if (pa_streq(state->rvalue, "yes"))
- pa = PA_AVAILABLE_YES;
+ pa = PA_AVAILABLE_YES;
else if (pa_streq(state->rvalue, "no"))
- pa = PA_AVAILABLE_NO;
+ pa = PA_AVAILABLE_NO;
else if (pa_streq(state->rvalue, "unknown"))
- pa = PA_AVAILABLE_UNKNOWN;
+ pa = PA_AVAILABLE_UNKNOWN;
else {
pa_log("[%s:%u] state must be 'yes', 'no' or 'unknown' in '%s'", state->filename, state->lineno, state->section);
return -1;
diff --git a/src/modules/dbus/iface-card.c b/src/modules/dbus/iface-card.c
index fce7e42..6b5366a 100644
--- a/src/modules/dbus/iface-card.c
+++ b/src/modules/dbus/iface-card.c
@@ -457,8 +457,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_card_profile_get_path(pa_hashmap_get(c->profiles, c->active_profile->name));
pa_assert_se(signal_msg = dbus_message_new_signal(c->path,
- PA_DBUSIFACE_CARD_INTERFACE,
- signals[SIGNAL_ACTIVE_PROFILE_UPDATED].name));
+ PA_DBUSIFACE_CARD_INTERFACE,
+ signals[SIGNAL_ACTIVE_PROFILE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
@@ -472,8 +472,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
pa_proplist_update(c->proplist, PA_UPDATE_SET, c->card->proplist);
pa_assert_se(signal_msg = dbus_message_new_signal(c->path,
- PA_DBUSIFACE_CARD_INTERFACE,
- signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+ PA_DBUSIFACE_CARD_INTERFACE,
+ signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_dbus_append_proplist(&msg_iter, c->proplist);
diff --git a/src/modules/dbus/iface-client.c b/src/modules/dbus/iface-client.c
index 7812c96..a7d2cb4 100644
--- a/src/modules/dbus/iface-client.c
+++ b/src/modules/dbus/iface-client.c
@@ -411,8 +411,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
pa_proplist_update(c->proplist, PA_UPDATE_SET, c->client->proplist);
pa_assert_se(signal_msg = dbus_message_new_signal(c->path,
- PA_DBUSIFACE_CLIENT_INTERFACE,
- signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+ PA_DBUSIFACE_CLIENT_INTERFACE,
+ signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_dbus_append_proplist(&msg_iter, c->proplist);
diff --git a/src/modules/dbus/iface-core.c b/src/modules/dbus/iface-core.c
index bf31546..0a38272 100644
--- a/src/modules/dbus/iface-core.c
+++ b/src/modules/dbus/iface-core.c
@@ -1600,8 +1600,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_device_get_path(device_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_FALLBACK_SINK_UPDATED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_FALLBACK_SINK_UPDATED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
dbus_message_unref(signal_msg);
@@ -1627,8 +1627,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_device_get_path(device_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_FALLBACK_SOURCE_UPDATED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_FALLBACK_SOURCE_UPDATED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
dbus_message_unref(signal_msg);
@@ -1660,8 +1660,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_card_get_path(card_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_CARD].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_CARD].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
} else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1671,8 +1671,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_card_get_path(card_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_CARD_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_CARD_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbusiface_card_free(card_iface);
@@ -1694,8 +1694,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_stream_get_path(stream_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_PLAYBACK_STREAM].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_PLAYBACK_STREAM].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
} else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1705,8 +1705,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_stream_get_path(stream_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_PLAYBACK_STREAM_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_PLAYBACK_STREAM_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbusiface_stream_free(stream_iface);
@@ -1728,8 +1728,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_stream_get_path(stream_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_RECORD_STREAM].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_RECORD_STREAM].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
} else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1739,8 +1739,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_stream_get_path(stream_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_RECORD_STREAM_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_RECORD_STREAM_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbusiface_stream_free(stream_iface);
@@ -1762,8 +1762,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_sample_get_path(sample_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_SAMPLE].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_SAMPLE].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
} else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1773,8 +1773,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_sample_get_path(sample_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_SAMPLE_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_SAMPLE_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbusiface_sample_free(sample_iface);
@@ -1796,8 +1796,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_module_get_path(module_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_MODULE].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_MODULE].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
} else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1807,8 +1807,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_module_get_path(module_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_MODULE_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_MODULE_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbusiface_module_free(module_iface);
@@ -1830,8 +1830,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_client_get_path(client_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_CLIENT].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_CLIENT].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
} else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1841,8 +1841,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_client_get_path(client_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_CLIENT_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_CLIENT_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbusiface_client_free(client_iface);
@@ -1973,8 +1973,8 @@ static pa_hook_result_t extension_registered_cb(void *hook_data, void *call_data
pa_assert(ext_name);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_EXTENSION].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_EXTENSION].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_STRING, &ext_name, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
@@ -1992,8 +1992,8 @@ static pa_hook_result_t extension_unregistered_cb(void *hook_data, void *call_da
pa_assert(ext_name);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_EXTENSION_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_EXTENSION_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_STRING, &ext_name, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
diff --git a/src/modules/dbus/iface-device.c b/src/modules/dbus/iface-device.c
index a85250a..bedd6b8 100644
--- a/src/modules/dbus/iface-device.c
+++ b/src/modules/dbus/iface-device.c
@@ -1109,8 +1109,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
volume[i] = d->volume.values[i];
pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
- PA_DBUSIFACE_DEVICE_INTERFACE,
- signals[SIGNAL_VOLUME_UPDATED].name));
+ PA_DBUSIFACE_DEVICE_INTERFACE,
+ signals[SIGNAL_VOLUME_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg,
DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &volume_ptr, d->volume.channels,
DBUS_TYPE_INVALID));
@@ -1126,8 +1126,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
d->mute = new_mute;
pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
- PA_DBUSIFACE_DEVICE_INTERFACE,
- signals[SIGNAL_MUTE_UPDATED].name));
+ PA_DBUSIFACE_DEVICE_INTERFACE,
+ signals[SIGNAL_MUTE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_BOOLEAN, &d->mute, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
@@ -1152,8 +1152,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
state = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink_state : d->source_state;
pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
- PA_DBUSIFACE_DEVICE_INTERFACE,
- signals[SIGNAL_STATE_UPDATED].name));
+ PA_DBUSIFACE_DEVICE_INTERFACE,
+ signals[SIGNAL_STATE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_UINT32, &state, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
@@ -1170,8 +1170,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
object_path = pa_dbusiface_device_port_get_path(pa_hashmap_get(d->ports, d->active_port->name));
pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
- PA_DBUSIFACE_DEVICE_INTERFACE,
- signals[SIGNAL_ACTIVE_PORT_UPDATED].name));
+ PA_DBUSIFACE_DEVICE_INTERFACE,
+ signals[SIGNAL_ACTIVE_PORT_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
@@ -1187,8 +1187,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
pa_proplist_update(d->proplist, PA_UPDATE_SET, new_proplist);
pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
- PA_DBUSIFACE_DEVICE_INTERFACE,
- signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+ PA_DBUSIFACE_DEVICE_INTERFACE,
+ signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_dbus_append_proplist(&msg_iter, d->proplist);
diff --git a/src/modules/dbus/iface-module.c b/src/modules/dbus/iface-module.c
index ccfbaf3..ab92a73 100644
--- a/src/modules/dbus/iface-module.c
+++ b/src/modules/dbus/iface-module.c
@@ -288,8 +288,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
pa_proplist_update(m->proplist, PA_UPDATE_SET, m->module->proplist);
pa_assert_se(signal_msg = dbus_message_new_signal(m->path,
- PA_DBUSIFACE_MODULE_INTERFACE,
- signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+ PA_DBUSIFACE_MODULE_INTERFACE,
+ signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_dbus_append_proplist(&msg_iter, m->proplist);
diff --git a/src/modules/dbus/iface-sample.c b/src/modules/dbus/iface-sample.c
index fe76fe3..4287f2e 100644
--- a/src/modules/dbus/iface-sample.c
+++ b/src/modules/dbus/iface-sample.c
@@ -469,8 +469,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
pa_proplist_update(s->proplist, PA_UPDATE_SET, s->sample->proplist);
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_SAMPLE_INTERFACE,
- signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+ PA_DBUSIFACE_SAMPLE_INTERFACE,
+ signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_dbus_append_proplist(&msg_iter, s->proplist);
diff --git a/src/modules/dbus/iface-stream.c b/src/modules/dbus/iface-stream.c
index a0157fb..851d51f 100644
--- a/src/modules/dbus/iface-stream.c
+++ b/src/modules/dbus/iface-stream.c
@@ -692,8 +692,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
new_device_path = pa_dbusiface_core_get_sink_path(s->core, new_sink);
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_STREAM_INTERFACE,
- signals[SIGNAL_DEVICE_UPDATED].name));
+ PA_DBUSIFACE_STREAM_INTERFACE,
+ signals[SIGNAL_DEVICE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &new_device_path, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
@@ -710,8 +710,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
new_device_path = pa_dbusiface_core_get_source_path(s->core, new_source);
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_STREAM_INTERFACE,
- signals[SIGNAL_DEVICE_UPDATED].name));
+ PA_DBUSIFACE_STREAM_INTERFACE,
+ signals[SIGNAL_DEVICE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &new_device_path, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
@@ -726,8 +726,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
s->sample_rate = new_sample_rate;
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_STREAM_INTERFACE,
- signals[SIGNAL_SAMPLE_RATE_UPDATED].name));
+ PA_DBUSIFACE_STREAM_INTERFACE,
+ signals[SIGNAL_SAMPLE_RATE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_UINT32, &s->sample_rate, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
@@ -771,8 +771,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
s->mute = new_mute;
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_STREAM_INTERFACE,
- signals[SIGNAL_MUTE_UPDATED].name));
+ PA_DBUSIFACE_STREAM_INTERFACE,
+ signals[SIGNAL_MUTE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_BOOLEAN, &s->mute, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
@@ -789,8 +789,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
pa_proplist_update(s->proplist, PA_UPDATE_SET, new_proplist);
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_STREAM_INTERFACE,
- signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+ PA_DBUSIFACE_STREAM_INTERFACE,
+ signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_dbus_append_proplist(&msg_iter, s->proplist);
@@ -829,8 +829,8 @@ static pa_hook_result_t send_event_cb(void *hook_data, void *call_data, void *sl
}
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_STREAM_INTERFACE,
- signals[SIGNAL_STREAM_EVENT].name));
+ PA_DBUSIFACE_STREAM_INTERFACE,
+ signals[SIGNAL_STREAM_EVENT].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_assert_se(dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_STRING, &name));
pa_dbus_append_proplist(&msg_iter, property_list);
diff --git a/src/modules/dbus/module-dbus-protocol.c b/src/modules/dbus/module-dbus-protocol.c
index a35e122..7bd86cf 100644
--- a/src/modules/dbus/module-dbus-protocol.c
+++ b/src/modules/dbus/module-dbus-protocol.c
@@ -138,8 +138,8 @@ static void client_send_event_cb(pa_client *c, const char *name, pa_proplist *da
conn = c->userdata;
pa_assert_se(signal_msg = dbus_message_new_signal(pa_dbusiface_core_get_client_path(conn->server->userdata->core_iface, c),
- PA_DBUSIFACE_CLIENT_INTERFACE,
- "ClientEvent"));
+ PA_DBUSIFACE_CLIENT_INTERFACE,
+ "ClientEvent"));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_assert_se(dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_STRING, &name));
pa_dbus_append_proplist(&msg_iter, data);
diff --git a/src/modules/jack/module-jackdbus-detect.c b/src/modules/jack/module-jackdbus-detect.c
index b3d04b4..d8b218a 100644
--- a/src/modules/jack/module-jackdbus-detect.c
+++ b/src/modules/jack/module-jackdbus-detect.c
@@ -48,18 +48,18 @@ PA_MODULE_USAGE(
#define JACK_INTERFACE_NAME "org.jackaudio.JackControl"
#define JACK_INTERFACE_PATH "/org/jackaudio/Controller"
-#define SERVICE_FILTER \
- "type='signal'," \
- "sender='" DBUS_SERVICE_DBUS "'," \
- "interface='" DBUS_INTERFACE_DBUS "'," \
- "member='NameOwnerChanged'," \
- "arg0='" JACK_SERVICE_NAME "'"
-
-#define RUNNING_FILTER(_a) \
- "type='signal'," \
- "sender='" JACK_SERVICE_NAME "'," \
- "interface='" JACK_INTERFACE_NAME "'," \
- "member='" _a "'"
+#define SERVICE_FILTER \
+ "type='signal'," \
+ "sender='" DBUS_SERVICE_DBUS "'," \
+ "interface='" DBUS_INTERFACE_DBUS "'," \
+ "member='NameOwnerChanged'," \
+ "arg0='" JACK_SERVICE_NAME "'"
+
+#define RUNNING_FILTER(_a) \
+ "type='signal'," \
+ "sender='" JACK_SERVICE_NAME "'," \
+ "interface='" JACK_INTERFACE_NAME "'," \
+ "member='" _a "'"
static const char* const valid_modargs[] = {
"channels",
diff --git a/src/modules/xen/module-xenpv-sink.c b/src/modules/xen/module-xenpv-sink.c
index 8ac764f..aba1f75 100644
--- a/src/modules/xen/module-xenpv-sink.c
+++ b/src/modules/xen/module-xenpv-sink.c
@@ -796,7 +796,7 @@ static int wait_for_backend_state_change() {
free(buf);
free(vec);
}
- /* else: timeout */
+ /* else: timeout */
} while (backend_state == STATE_UNDEFINED && \
(now = time(NULL)) < start + seconds);
diff --git a/src/pulsecore/sndfile-util.c b/src/pulsecore/sndfile-util.c
index 61b4884..365c9b6 100644
--- a/src/pulsecore/sndfile-util.c
+++ b/src/pulsecore/sndfile-util.c
@@ -431,15 +431,15 @@ int pa_sndfile_format_from_string(const char *name) {
pa_assert_se(sf_command(NULL, SFC_GET_FORMAT_MAJOR, &fi, sizeof(fi)) == 0);
- /* First try to match via full type string */
+ /* First try to match via full type string */
if (strcasecmp(name, fi.name) == 0)
return fi.format;
- /* Then, try to match via the full extension */
+ /* Then, try to match via the full extension */
if (strcasecmp(name, fi.extension) == 0)
return fi.format;
- /* Then, try to match via the start of the type string */
+ /* Then, try to match via the start of the type string */
if (strncasecmp(name, fi.name, strlen(name)) == 0)
return fi.format;
}
commit aab63a34998092fc93799667b2995f04736f0e08
Author: poljar (Damir Jelić) <poljarinho at gmail.com>
Date: Tue Jun 18 21:39:30 2013 +0200
Whitespace cleanup: Remove tabs
This patch removes all tabs hidden inside the source tree and replaces
them with 4 spaces.
Command used for this:
find . -type d \( -name bluetooth \) -prune -o
-regex '\(.*\.[hc]\|.*\.cc\)' -a -not -name 'reserve*.[ch]'
-a -not -name 'gnt*.h' -a -not -name 'adrian*'
-exec sed -i -e 's/\t/ /g' {} \;
The excluded files are mirrored files from external sources containing
tabs.
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index be9ee4e..189dafe 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -2182,11 +2182,11 @@ static int jack_parse_state(pa_config_parser_state *state) {
}
if (pa_streq(state->rvalue, "yes"))
- pa = PA_AVAILABLE_YES;
+ pa = PA_AVAILABLE_YES;
else if (pa_streq(state->rvalue, "no"))
- pa = PA_AVAILABLE_NO;
+ pa = PA_AVAILABLE_NO;
else if (pa_streq(state->rvalue, "unknown"))
- pa = PA_AVAILABLE_UNKNOWN;
+ pa = PA_AVAILABLE_UNKNOWN;
else {
pa_log("[%s:%u] state must be 'yes', 'no' or 'unknown' in '%s'", state->filename, state->lineno, state->section);
return -1;
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
index 3b55e82..6860b82 100644
--- a/src/modules/alsa/alsa-ucm.c
+++ b/src/modules/alsa/alsa-ucm.c
@@ -1485,7 +1485,7 @@ pa_alsa_profile_set* pa_alsa_ucm_add_profile_set(pa_alsa_ucm_config *ucm, pa_cha
continue;
}
- ucm_create_profile(ucm, ps, verb, verb_name, verb_desc);
+ ucm_create_profile(ucm, ps, verb, verb_name, verb_desc);
}
ucm_probe_profile_set(ucm, ps);
diff --git a/src/modules/dbus/iface-card.c b/src/modules/dbus/iface-card.c
index 945f5bb..fce7e42 100644
--- a/src/modules/dbus/iface-card.c
+++ b/src/modules/dbus/iface-card.c
@@ -457,8 +457,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_card_profile_get_path(pa_hashmap_get(c->profiles, c->active_profile->name));
pa_assert_se(signal_msg = dbus_message_new_signal(c->path,
- PA_DBUSIFACE_CARD_INTERFACE,
- signals[SIGNAL_ACTIVE_PROFILE_UPDATED].name));
+ PA_DBUSIFACE_CARD_INTERFACE,
+ signals[SIGNAL_ACTIVE_PROFILE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
@@ -472,8 +472,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
pa_proplist_update(c->proplist, PA_UPDATE_SET, c->card->proplist);
pa_assert_se(signal_msg = dbus_message_new_signal(c->path,
- PA_DBUSIFACE_CARD_INTERFACE,
- signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+ PA_DBUSIFACE_CARD_INTERFACE,
+ signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_dbus_append_proplist(&msg_iter, c->proplist);
diff --git a/src/modules/dbus/iface-client.c b/src/modules/dbus/iface-client.c
index e667544..7812c96 100644
--- a/src/modules/dbus/iface-client.c
+++ b/src/modules/dbus/iface-client.c
@@ -411,8 +411,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
pa_proplist_update(c->proplist, PA_UPDATE_SET, c->client->proplist);
pa_assert_se(signal_msg = dbus_message_new_signal(c->path,
- PA_DBUSIFACE_CLIENT_INTERFACE,
- signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+ PA_DBUSIFACE_CLIENT_INTERFACE,
+ signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_dbus_append_proplist(&msg_iter, c->proplist);
diff --git a/src/modules/dbus/iface-core.c b/src/modules/dbus/iface-core.c
index a9716bc..bf31546 100644
--- a/src/modules/dbus/iface-core.c
+++ b/src/modules/dbus/iface-core.c
@@ -1600,8 +1600,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_device_get_path(device_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_FALLBACK_SINK_UPDATED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_FALLBACK_SINK_UPDATED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
dbus_message_unref(signal_msg);
@@ -1627,8 +1627,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_device_get_path(device_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_FALLBACK_SOURCE_UPDATED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_FALLBACK_SOURCE_UPDATED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
dbus_message_unref(signal_msg);
@@ -1660,8 +1660,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_card_get_path(card_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_CARD].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_CARD].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
} else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1671,8 +1671,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_card_get_path(card_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_CARD_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_CARD_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbusiface_card_free(card_iface);
@@ -1694,8 +1694,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_stream_get_path(stream_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_PLAYBACK_STREAM].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_PLAYBACK_STREAM].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
} else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1705,8 +1705,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_stream_get_path(stream_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_PLAYBACK_STREAM_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_PLAYBACK_STREAM_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbusiface_stream_free(stream_iface);
@@ -1728,8 +1728,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_stream_get_path(stream_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_RECORD_STREAM].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_RECORD_STREAM].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
} else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1739,8 +1739,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_stream_get_path(stream_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_RECORD_STREAM_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_RECORD_STREAM_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbusiface_stream_free(stream_iface);
@@ -1762,8 +1762,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_sample_get_path(sample_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_SAMPLE].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_SAMPLE].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
} else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1773,8 +1773,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_sample_get_path(sample_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_SAMPLE_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_SAMPLE_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbusiface_sample_free(sample_iface);
@@ -1796,8 +1796,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_module_get_path(module_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_MODULE].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_MODULE].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
} else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1807,8 +1807,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_module_get_path(module_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_MODULE_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_MODULE_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbusiface_module_free(module_iface);
@@ -1830,8 +1830,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_client_get_path(client_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_CLIENT].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_CLIENT].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
} else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1841,8 +1841,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
object_path = pa_dbusiface_client_get_path(client_iface);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_CLIENT_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_CLIENT_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbusiface_client_free(client_iface);
@@ -1973,8 +1973,8 @@ static pa_hook_result_t extension_registered_cb(void *hook_data, void *call_data
pa_assert(ext_name);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_NEW_EXTENSION].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_NEW_EXTENSION].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_STRING, &ext_name, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
@@ -1992,8 +1992,8 @@ static pa_hook_result_t extension_unregistered_cb(void *hook_data, void *call_da
pa_assert(ext_name);
pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
- PA_DBUS_CORE_INTERFACE,
- signals[SIGNAL_EXTENSION_REMOVED].name)));
+ PA_DBUS_CORE_INTERFACE,
+ signals[SIGNAL_EXTENSION_REMOVED].name)));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_STRING, &ext_name, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
diff --git a/src/modules/dbus/iface-device.c b/src/modules/dbus/iface-device.c
index 888d407..a85250a 100644
--- a/src/modules/dbus/iface-device.c
+++ b/src/modules/dbus/iface-device.c
@@ -1109,8 +1109,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
volume[i] = d->volume.values[i];
pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
- PA_DBUSIFACE_DEVICE_INTERFACE,
- signals[SIGNAL_VOLUME_UPDATED].name));
+ PA_DBUSIFACE_DEVICE_INTERFACE,
+ signals[SIGNAL_VOLUME_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg,
DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &volume_ptr, d->volume.channels,
DBUS_TYPE_INVALID));
@@ -1126,8 +1126,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
d->mute = new_mute;
pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
- PA_DBUSIFACE_DEVICE_INTERFACE,
- signals[SIGNAL_MUTE_UPDATED].name));
+ PA_DBUSIFACE_DEVICE_INTERFACE,
+ signals[SIGNAL_MUTE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_BOOLEAN, &d->mute, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
@@ -1152,8 +1152,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
state = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink_state : d->source_state;
pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
- PA_DBUSIFACE_DEVICE_INTERFACE,
- signals[SIGNAL_STATE_UPDATED].name));
+ PA_DBUSIFACE_DEVICE_INTERFACE,
+ signals[SIGNAL_STATE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_UINT32, &state, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
@@ -1170,8 +1170,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
object_path = pa_dbusiface_device_port_get_path(pa_hashmap_get(d->ports, d->active_port->name));
pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
- PA_DBUSIFACE_DEVICE_INTERFACE,
- signals[SIGNAL_ACTIVE_PORT_UPDATED].name));
+ PA_DBUSIFACE_DEVICE_INTERFACE,
+ signals[SIGNAL_ACTIVE_PORT_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
@@ -1187,8 +1187,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
pa_proplist_update(d->proplist, PA_UPDATE_SET, new_proplist);
pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
- PA_DBUSIFACE_DEVICE_INTERFACE,
- signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+ PA_DBUSIFACE_DEVICE_INTERFACE,
+ signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_dbus_append_proplist(&msg_iter, d->proplist);
diff --git a/src/modules/dbus/iface-module.c b/src/modules/dbus/iface-module.c
index 9973166..ccfbaf3 100644
--- a/src/modules/dbus/iface-module.c
+++ b/src/modules/dbus/iface-module.c
@@ -288,8 +288,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
pa_proplist_update(m->proplist, PA_UPDATE_SET, m->module->proplist);
pa_assert_se(signal_msg = dbus_message_new_signal(m->path,
- PA_DBUSIFACE_MODULE_INTERFACE,
- signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+ PA_DBUSIFACE_MODULE_INTERFACE,
+ signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_dbus_append_proplist(&msg_iter, m->proplist);
diff --git a/src/modules/dbus/iface-sample.c b/src/modules/dbus/iface-sample.c
index 93d4fc8..fe76fe3 100644
--- a/src/modules/dbus/iface-sample.c
+++ b/src/modules/dbus/iface-sample.c
@@ -469,8 +469,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
pa_proplist_update(s->proplist, PA_UPDATE_SET, s->sample->proplist);
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_SAMPLE_INTERFACE,
- signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+ PA_DBUSIFACE_SAMPLE_INTERFACE,
+ signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_dbus_append_proplist(&msg_iter, s->proplist);
diff --git a/src/modules/dbus/iface-stream.c b/src/modules/dbus/iface-stream.c
index c6dc1c9..a0157fb 100644
--- a/src/modules/dbus/iface-stream.c
+++ b/src/modules/dbus/iface-stream.c
@@ -692,8 +692,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
new_device_path = pa_dbusiface_core_get_sink_path(s->core, new_sink);
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_STREAM_INTERFACE,
- signals[SIGNAL_DEVICE_UPDATED].name));
+ PA_DBUSIFACE_STREAM_INTERFACE,
+ signals[SIGNAL_DEVICE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &new_device_path, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
@@ -710,8 +710,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
new_device_path = pa_dbusiface_core_get_source_path(s->core, new_source);
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_STREAM_INTERFACE,
- signals[SIGNAL_DEVICE_UPDATED].name));
+ PA_DBUSIFACE_STREAM_INTERFACE,
+ signals[SIGNAL_DEVICE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &new_device_path, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
@@ -726,8 +726,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
s->sample_rate = new_sample_rate;
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_STREAM_INTERFACE,
- signals[SIGNAL_SAMPLE_RATE_UPDATED].name));
+ PA_DBUSIFACE_STREAM_INTERFACE,
+ signals[SIGNAL_SAMPLE_RATE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_UINT32, &s->sample_rate, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
@@ -771,8 +771,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
s->mute = new_mute;
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_STREAM_INTERFACE,
- signals[SIGNAL_MUTE_UPDATED].name));
+ PA_DBUSIFACE_STREAM_INTERFACE,
+ signals[SIGNAL_MUTE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_BOOLEAN, &s->mute, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
@@ -789,8 +789,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
pa_proplist_update(s->proplist, PA_UPDATE_SET, new_proplist);
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_STREAM_INTERFACE,
- signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+ PA_DBUSIFACE_STREAM_INTERFACE,
+ signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_dbus_append_proplist(&msg_iter, s->proplist);
@@ -829,8 +829,8 @@ static pa_hook_result_t send_event_cb(void *hook_data, void *call_data, void *sl
}
pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
- PA_DBUSIFACE_STREAM_INTERFACE,
- signals[SIGNAL_STREAM_EVENT].name));
+ PA_DBUSIFACE_STREAM_INTERFACE,
+ signals[SIGNAL_STREAM_EVENT].name));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_assert_se(dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_STRING, &name));
pa_dbus_append_proplist(&msg_iter, property_list);
diff --git a/src/modules/dbus/module-dbus-protocol.c b/src/modules/dbus/module-dbus-protocol.c
index 7e49d93..a35e122 100644
--- a/src/modules/dbus/module-dbus-protocol.c
+++ b/src/modules/dbus/module-dbus-protocol.c
@@ -138,8 +138,8 @@ static void client_send_event_cb(pa_client *c, const char *name, pa_proplist *da
conn = c->userdata;
pa_assert_se(signal_msg = dbus_message_new_signal(pa_dbusiface_core_get_client_path(conn->server->userdata->core_iface, c),
- PA_DBUSIFACE_CLIENT_INTERFACE,
- "ClientEvent"));
+ PA_DBUSIFACE_CLIENT_INTERFACE,
+ "ClientEvent"));
dbus_message_iter_init_append(signal_msg, &msg_iter);
pa_assert_se(dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_STRING, &name));
pa_dbus_append_proplist(&msg_iter, data);
diff --git a/src/modules/jack/module-jackdbus-detect.c b/src/modules/jack/module-jackdbus-detect.c
index 25ac495..b3d04b4 100644
--- a/src/modules/jack/module-jackdbus-detect.c
+++ b/src/modules/jack/module-jackdbus-detect.c
@@ -48,18 +48,18 @@ PA_MODULE_USAGE(
#define JACK_INTERFACE_NAME "org.jackaudio.JackControl"
#define JACK_INTERFACE_PATH "/org/jackaudio/Controller"
-#define SERVICE_FILTER \
- "type='signal'," \
- "sender='" DBUS_SERVICE_DBUS "'," \
- "interface='" DBUS_INTERFACE_DBUS "'," \
- "member='NameOwnerChanged'," \
- "arg0='" JACK_SERVICE_NAME "'"
-
-#define RUNNING_FILTER(_a) \
- "type='signal'," \
- "sender='" JACK_SERVICE_NAME "'," \
- "interface='" JACK_INTERFACE_NAME "'," \
- "member='" _a "'"
+#define SERVICE_FILTER \
+ "type='signal'," \
+ "sender='" DBUS_SERVICE_DBUS "'," \
+ "interface='" DBUS_INTERFACE_DBUS "'," \
+ "member='NameOwnerChanged'," \
+ "arg0='" JACK_SERVICE_NAME "'"
+
+#define RUNNING_FILTER(_a) \
+ "type='signal'," \
+ "sender='" JACK_SERVICE_NAME "'," \
+ "interface='" JACK_INTERFACE_NAME "'," \
+ "member='" _a "'"
static const char* const valid_modargs[] = {
"channels",
diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c
index 6017891..4a32af4 100644
--- a/src/modules/module-loopback.c
+++ b/src/modules/module-loopback.c
@@ -972,10 +972,10 @@ int pa__init(pa_module *m) {
pa_source_output_put(u->source_output);
if (pa_source_get_state(u->source_output->source) != PA_SOURCE_SUSPENDED)
- pa_sink_input_cork(u->sink_input, FALSE);
+ pa_sink_input_cork(u->sink_input, FALSE);
if (pa_sink_get_state(u->sink_input->sink) != PA_SINK_SUSPENDED)
- pa_source_output_cork(u->source_output, FALSE);
+ pa_source_output_cork(u->source_output, FALSE);
update_adjust_timer(u);
diff --git a/src/modules/xen/module-xenpv-sink.c b/src/modules/xen/module-xenpv-sink.c
index 6f82ff4..8ac764f 100644
--- a/src/modules/xen/module-xenpv-sink.c
+++ b/src/modules/xen/module-xenpv-sink.c
@@ -76,15 +76,15 @@ PA_MODULE_USAGE(
int device_id = -1;
enum xenbus_state {
- XenbusStateUnknown = 0,
- XenbusStateInitialising = 1,
- XenbusStateInitWait = 2,
- XenbusStateInitialised = 3,
- XenbusStateConnected = 4,
- XenbusStateClosing = 5,
- XenbusStateClosed = 6,
- XenbusStateReconfiguring = 7,
- XenbusStateReconfigured = 8
+ XenbusStateUnknown = 0,
+ XenbusStateInitialising = 1,
+ XenbusStateInitWait = 2,
+ XenbusStateInitialised = 3,
+ XenbusStateConnected = 4,
+ XenbusStateClosing = 5,
+ XenbusStateClosed = 6,
+ XenbusStateReconfiguring = 7,
+ XenbusStateReconfigured = 8
};
static const char* xenbus_names[] = {
@@ -291,7 +291,7 @@ static int process_render(struct userdata *u) {
void *p;
p = pa_memblock_acquire(u->memchunk.memblock);
- /* xen: write data to ring buffer & notify backend */
+ /* xen: write data to ring buffer & notify backend */
l = ring_write(ioring, (uint8_t*)p + u->memchunk.index, u->memchunk.length);
pa_memblock_release(u->memchunk.memblock);
@@ -759,7 +759,7 @@ static int wait_for_backend_state_change() {
int xs_fd;
struct timeval tv;
- fd_set watch_fdset;
+ fd_set watch_fdset;
int start, now;
backend_state = STATE_UNDEFINED;
@@ -771,11 +771,11 @@ static int wait_for_backend_state_change() {
/*XXX: hardcoded */
seconds = 10;
- do {
- tv.tv_usec = 0;
- tv.tv_sec = (start + seconds) - now;
- FD_ZERO(&watch_fdset);
- FD_SET(xs_fd, &watch_fdset);
+ do {
+ tv.tv_usec = 0;
+ tv.tv_sec = (start + seconds) - now;
+ FD_ZERO(&watch_fdset);
+ FD_SET(xs_fd, &watch_fdset);
ret=select(xs_fd + 1, &watch_fdset, NULL, NULL, &tv);
if (ret==-1)
@@ -783,8 +783,8 @@ static int wait_for_backend_state_change() {
return -1;
else if (ret) {
- /* Read the watch to drain the buffer */
- vec = xs_read_watch(xsh, &len);
+ /* Read the watch to drain the buffer */
+ vec = xs_read_watch(xsh, &len);
buf = xs_read(xsh, XBT_NULL, vec[0], &len);
if (buf == 0) {
@@ -795,9 +795,9 @@ static int wait_for_backend_state_change() {
free(buf);
free(vec);
- }
+ }
/* else: timeout */
- } while (backend_state == STATE_UNDEFINED && \
+ } while (backend_state == STATE_UNDEFINED && \
(now = time(NULL)) < start + seconds);
return backend_state;
diff --git a/src/pulsecore/sndfile-util.c b/src/pulsecore/sndfile-util.c
index d8cc244..61b4884 100644
--- a/src/pulsecore/sndfile-util.c
+++ b/src/pulsecore/sndfile-util.c
@@ -431,15 +431,15 @@ int pa_sndfile_format_from_string(const char *name) {
pa_assert_se(sf_command(NULL, SFC_GET_FORMAT_MAJOR, &fi, sizeof(fi)) == 0);
- /* First try to match via full type string */
+ /* First try to match via full type string */
if (strcasecmp(name, fi.name) == 0)
return fi.format;
- /* Then, try to match via the full extension */
+ /* Then, try to match via the full extension */
if (strcasecmp(name, fi.extension) == 0)
return fi.format;
- /* Then, try to match via the start of the type string */
+ /* Then, try to match via the start of the type string */
if (strncasecmp(name, fi.name, strlen(name)) == 0)
return fi.format;
}
More information about the pulseaudio-commits
mailing list