diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-08-21 23:16:08 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-09-03 20:25:35 +0200 |
| commit | d612c4e404dbd474f115ea9e2c986cb94145987a (patch) | |
| tree | 47f21593310fb44b40c43db0fff91e57ad0d698c /pulse/conf_pulse.c | |
| parent | 567fb2d4ff1270a3c425688bd410edadc12428a2 (diff) | |
Reindent to Linux kernel style
The PulseAudio plugin was horrible mix-up of different indenting styles even in
the same files. Indenting by 4, by 2, by 8 characters, sometimes with tabs,
sometimes with spaces. To fix this chaos I ran all files through "indent -kr
-i8". Hopefully future patches will follow kernel style indenting too.
Diffstat (limited to 'pulse/conf_pulse.c')
| -rw-r--r-- | pulse/conf_pulse.c | 86 |
1 files changed, 44 insertions, 42 deletions
diff --git a/pulse/conf_pulse.c b/pulse/conf_pulse.c index 6627b31..aa9a51a 100644 --- a/pulse/conf_pulse.c +++ b/pulse/conf_pulse.c @@ -28,64 +28,66 @@ /* Not actually part of the alsa api.... */ extern int -snd_config_hook_load (snd_config_t *root, snd_config_t *config, - snd_config_t **dst, snd_config_t *private_data); +snd_config_hook_load(snd_config_t * root, snd_config_t * config, + snd_config_t ** dst, snd_config_t * private_data); int -conf_pulse_hook_load_if_running (snd_config_t *root, snd_config_t *config, - snd_config_t **dst, snd_config_t *private_data) { - pa_mainloop *loop = NULL; - pa_context *context = NULL; - int ret = 0, err, state; +conf_pulse_hook_load_if_running(snd_config_t * root, snd_config_t * config, + snd_config_t ** dst, + snd_config_t * private_data) +{ + pa_mainloop *loop = NULL; + pa_context *context = NULL; + int ret = 0, err, state; - *dst = NULL; + *dst = NULL; - /* Defined if we're called inside the pulsedaemon itself */ - if (getenv("PULSE_INTERNAL") != NULL) - goto out; + /* Defined if we're called inside the pulsedaemon itself */ + if (getenv("PULSE_INTERNAL") != NULL) + goto out; - loop = pa_mainloop_new(); - if (loop == NULL) - goto out; + loop = pa_mainloop_new(); + if (loop == NULL) + goto out; - context = pa_context_new(pa_mainloop_get_api(loop), "Alsa hook"); - if (context == NULL) - goto out; + context = pa_context_new(pa_mainloop_get_api(loop), "Alsa hook"); + if (context == NULL) + goto out; - err = pa_context_connect (context, NULL, 0, NULL); - if (err < 0) - goto out; + err = pa_context_connect(context, NULL, 0, NULL); + if (err < 0) + goto out; - do { - err = pa_mainloop_prepare (loop, -1); - if (err < 0) - goto out; + do { + err = pa_mainloop_prepare(loop, -1); + if (err < 0) + goto out; - err = pa_mainloop_poll (loop); - if (err < 0) - goto out; + err = pa_mainloop_poll(loop); + if (err < 0) + goto out; - err = pa_mainloop_dispatch (loop); - if (err < 0) - goto out; + err = pa_mainloop_dispatch(loop); + if (err < 0) + goto out; - state = pa_context_get_state(context); - } while (state < PA_CONTEXT_AUTHORIZING); + state = pa_context_get_state(context); + } while (state < PA_CONTEXT_AUTHORIZING); - if (state > PA_CONTEXT_READY) - goto out; + if (state > PA_CONTEXT_READY) + goto out; - ret = snd_config_hook_load(root, config, dst, private_data); + ret = snd_config_hook_load(root, config, dst, private_data); -out: - if (context != NULL) - pa_context_unref(context); + out: + if (context != NULL) + pa_context_unref(context); - if (loop != NULL) - pa_mainloop_free(loop); + if (loop != NULL) + pa_mainloop_free(loop); - return ret; + return ret; } SND_DLSYM_BUILD_VERSION(conf_pulse_hook_load_if_running, - SND_CONFIG_DLSYM_VERSION_HOOK); + SND_CONFIG_DLSYM_VERSION_HOOK); |
