mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-17 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Follow master change r34dd4a and fix shutdown when --disallow-module-loading=1 is passed

Browse source
This commit is contained in:
Colin Guthrie 2008-08-22 09:51:41 +01:00
parent 8715121755
commit 59eb64987f
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/module-raop-discover.c
View file

@ -248,7 +248,7 @@ static void browser_cb(
struct tunnel *t2; struct tunnel *t2;
if ((t2 = pa_hashmap_get(u->tunnels, t))) { if ((t2 = pa_hashmap_get(u->tunnels, t))) {
pa_module_unload_by_index(u->core, t2->module_index); pa_module_unload_by_index(u->core, t2->module_index, TRUE);
pa_hashmap_remove(u->tunnels, t2); pa_hashmap_remove(u->tunnels, t2);
tunnel_free(t2); tunnel_free(t2);
} }
@ -281,7 +281,7 @@ static void client_callback(AvahiClient *c, AvahiClientState state, void *userda
browser_cb, u))) { browser_cb, u))) {
pa_log("avahi_service_browser_new() failed: %s", avahi_strerror(avahi_client_errno(c))); pa_log("avahi_service_browser_new() failed: %s", avahi_strerror(avahi_client_errno(c)));
pa_module_unload_request(u->module); pa_module_unload_request(u->module, TRUE);
} }
} }
@ -295,7 +295,7 @@ static void client_callback(AvahiClient *c, AvahiClientState state, void *userda
if (!(u->client = avahi_client_new(u->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, u, &error))) { if (!(u->client = avahi_client_new(u->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, u, &error))) {
pa_log("avahi_client_new() failed: %s", avahi_strerror(error)); pa_log("avahi_client_new() failed: %s", avahi_strerror(error));
pa_module_unload_request(u->module); pa_module_unload_request(u->module, TRUE);
} }
} }
@ -369,7 +369,7 @@ void pa__done(pa_module*m) {
struct tunnel *t; struct tunnel *t;
while ((t = pa_hashmap_steal_first(u->tunnels))) { while ((t = pa_hashmap_steal_first(u->tunnels))) {
pa_module_unload_by_index(u->core, t->module_index); pa_module_unload_by_index(u->core, t->module_index, TRUE);
tunnel_free(t); tunnel_free(t);
} }

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

@ -245,7 +245,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
/* Quesiton: is this valid here: or should we do some sort of: /* Quesiton: is this valid here: or should we do some sort of:
return pa_sink_process_msg(PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL); return pa_sink_process_msg(PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL);
?? */ ?? */
pa_module_unload_request(u->module); pa_module_unload_request(u->module, TRUE);
} }
return 0; return 0;
} }