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

alsa: unify alsa log handling and snd_config_update_free_global() handling in one place

Browse source
This commit is contained in:
Lennart Poettering 2009-06-18 21:27:02 +02:00
parent 25e5197f6a
commit 348dcd6a31
7 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -838,7 +838,6 @@ static int unsuspend(struct userdata *u) {
pa_log_info("Trying resume..."); pa_log_info("Trying resume...");
snd_config_update_free_global();
if ((err = snd_pcm_open(&u->pcm_handle, u->device_name, SND_PCM_STREAM_PLAYBACK, if ((err = snd_pcm_open(&u->pcm_handle, u->device_name, SND_PCM_STREAM_PLAYBACK,
/*SND_PCM_NONBLOCK|*/ /*SND_PCM_NONBLOCK|*/
SND_PCM_NO_AUTO_RESAMPLE| SND_PCM_NO_AUTO_RESAMPLE|

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

@ -787,8 +787,6 @@ static int unsuspend(struct userdata *u) {
pa_log_info("Trying resume..."); pa_log_info("Trying resume...");
snd_config_update_free_global();
if ((err = snd_pcm_open(&u->pcm_handle, u->device_name, SND_PCM_STREAM_CAPTURE, if ((err = snd_pcm_open(&u->pcm_handle, u->device_name, SND_PCM_STREAM_CAPTURE,
/*SND_PCM_NONBLOCK|*/ /*SND_PCM_NONBLOCK|*/
SND_PCM_NO_AUTO_RESAMPLE| SND_PCM_NO_AUTO_RESAMPLE|

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

@ -735,20 +735,22 @@ static void alsa_error_handler(const char *file, int line, const char *function,
static pa_atomic_t n_error_handler_installed = PA_ATOMIC_INIT(0); static pa_atomic_t n_error_handler_installed = PA_ATOMIC_INIT(0);
void pa_alsa_redirect_errors_inc(void) { void pa_alsa_refcnt_inc(void) {
/* This is not really thread safe, but we do our best */ /* This is not really thread safe, but we do our best */
if (pa_atomic_inc(&n_error_handler_installed) == 0) if (pa_atomic_inc(&n_error_handler_installed) == 0)
snd_lib_error_set_handler(alsa_error_handler); snd_lib_error_set_handler(alsa_error_handler);
} }
void pa_alsa_redirect_errors_dec(void) { void pa_alsa_refcnt_dec(void) {
int r; int r;
pa_assert_se((r = pa_atomic_dec(&n_error_handler_installed)) >= 1); pa_assert_se((r = pa_atomic_dec(&n_error_handler_installed)) >= 1);
if (r == 1) if (r == 1) {
snd_lib_error_set_handler(NULL); snd_lib_error_set_handler(NULL);
snd_config_update_free_global();
}
} }
pa_bool_t pa_alsa_init_description(pa_proplist *p) { pa_bool_t pa_alsa_init_description(pa_proplist *p) {

4
src/modules/alsa/alsa-util.h
View file

@ -114,8 +114,8 @@ snd_pcm_t *pa_alsa_open_by_template(
void pa_alsa_dump(pa_log_level_t level, snd_pcm_t *pcm); void pa_alsa_dump(pa_log_level_t level, snd_pcm_t *pcm);
void pa_alsa_dump_status(snd_pcm_t *pcm); void pa_alsa_dump_status(snd_pcm_t *pcm);
void pa_alsa_redirect_errors_inc(void); void pa_alsa_refcnt_inc(void);
void pa_alsa_redirect_errors_dec(void); void pa_alsa_refcnt_dec(void);
void pa_alsa_init_proplist_pcm_info(pa_core *c, pa_proplist *p, snd_pcm_info_t *pcm_info); void pa_alsa_init_proplist_pcm_info(pa_core *c, pa_proplist *p, snd_pcm_info_t *pcm_info);
void pa_alsa_init_proplist_card(pa_core *c, pa_proplist *p, int card); void pa_alsa_init_proplist_card(pa_core *c, pa_proplist *p, int card);

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

@ -287,8 +287,7 @@ int pa__init(pa_module *m) {
const char *description; const char *description;
char *fn = NULL; char *fn = NULL;
pa_alsa_redirect_errors_inc(); pa_alsa_refcnt_inc();
snd_config_update_free_global();
pa_assert(m); pa_assert(m);
@ -443,6 +442,5 @@ void pa__done(pa_module*m) {
pa_xfree(u); pa_xfree(u);
finish: finish:
snd_config_update_free_global(); pa_alsa_refcnt_dec();
pa_alsa_redirect_errors_dec();
} }

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

@ -82,8 +82,7 @@ int pa__init(pa_module*m) {
pa_assert(m); pa_assert(m);
pa_alsa_redirect_errors_inc(); pa_alsa_refcnt_inc();
snd_config_update_free_global();
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
pa_log("Failed to parse module arguments"); pa_log("Failed to parse module arguments");
@ -124,6 +123,5 @@ void pa__done(pa_module*m) {
if ((sink = m->userdata)) if ((sink = m->userdata))
pa_alsa_sink_free(sink); pa_alsa_sink_free(sink);
snd_config_update_free_global(); pa_alsa_refcnt_dec();
pa_alsa_redirect_errors_dec();
} }

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

@ -106,8 +106,7 @@ int pa__init(pa_module*m) {
pa_assert(m); pa_assert(m);
pa_alsa_redirect_errors_inc(); pa_alsa_refcnt_inc();
snd_config_update_free_global();
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
pa_log("Failed to parse module arguments"); pa_log("Failed to parse module arguments");
@ -148,6 +147,5 @@ void pa__done(pa_module*m) {
if ((source = m->userdata)) if ((source = m->userdata))
pa_alsa_source_free(source); pa_alsa_source_free(source);
snd_config_update_free_global(); pa_alsa_refcnt_dec();
pa_alsa_redirect_errors_dec();
} }