ignore network sinks/sources

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1988 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-10-29 21:23:08 +00:00
parent 625a87276a
commit 33c238b7ef
5 changed files with 29 additions and 8 deletions

View file

@ -335,11 +335,24 @@ static void service_free(struct service *s) {
pa_xfree(s);
}
static pa_bool_t is_network(pa_object *o) {
pa_object_assert_ref(o);
if (pa_sink_isinstance(o))
return !!(PA_SINK(o)->flags & PA_SINK_NETWORK);
if (pa_source_isinstance(o))
return !!(PA_SOURCE(o)->flags & PA_SOURCE_NETWORK);
pa_assert_not_reached();
}
static pa_hook_result_t device_new_or_changed_cb(pa_core *c, pa_object *o, struct userdata *u) {
pa_assert(c);
pa_object_assert_ref(o);
publish_service(get_service(u, o));
if (!is_network(o))
publish_service(get_service(u, o));
return PA_HOOK_OK;
}
@ -449,10 +462,12 @@ static int publish_all_services(struct userdata *u) {
pa_log_debug("Publishing services in Zeroconf");
for (sink = PA_SINK(pa_idxset_first(u->core->sinks, &idx)); sink; sink = PA_SINK(pa_idxset_next(u->core->sinks, &idx)))
publish_service(get_service(u, PA_OBJECT(sink)));
if (!is_network(PA_OBJECT(sink)))
publish_service(get_service(u, PA_OBJECT(sink)));
for (source = PA_SOURCE(pa_idxset_first(u->core->sources, &idx)); source; source = PA_SOURCE(pa_idxset_next(u->core->sources, &idx)))
publish_service(get_service(u, PA_OBJECT(source)));
if (!is_network(PA_OBJECT(source)))
publish_service(get_service(u, PA_OBJECT(source)));
if (publish_main_service(u) < 0)
goto fail;