diff options
| author | Colin Guthrie <pulse@colin.guthr.ie> | 2008-08-22 09:51:41 +0100 |
|---|---|---|
| committer | Colin Guthrie <pulse@colin.guthr.ie> | 2008-10-08 20:37:43 +0100 |
| commit | 59eb64987fdf5dde71638f5f77e705e490ec7133 (patch) | |
| tree | 459e8c17212b6f0d901a3a8531a82de957769576 | |
| parent | 8715121755ad1aa9c083dd70781a63ced13359c2 (diff) | |
Follow master change r34dd4a and fix shutdown when --disallow-module-loading=1 is passed
| -rw-r--r-- | src/modules/module-raop-discover.c | 8 | ||||
| -rw-r--r-- | src/modules/module-raop-sink.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c index 38436a38..3706d921 100644 --- a/src/modules/module-raop-discover.c +++ b/src/modules/module-raop-discover.c @@ -248,7 +248,7 @@ static void browser_cb( struct tunnel *t2; 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); tunnel_free(t2); } @@ -281,7 +281,7 @@ static void client_callback(AvahiClient *c, AvahiClientState state, void *userda browser_cb, u))) { 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))) { 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; 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); } diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c index b90d4e23..62f0a73c 100644 --- a/src/modules/module-raop-sink.c +++ b/src/modules/module-raop-sink.c @@ -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: 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; } |