summaryrefslogtreecommitdiffstats
path: root/src/modules/module-zeroconf-publish.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-10-29 23:54:46 +0000
committerLennart Poettering <lennart@poettering.net>2007-10-29 23:54:46 +0000
commite406bbaa62e5e93fd9ec844513f0848eda034a9b (patch)
tree00732f9a2de8072f81c3d73bad9673ed80621e92 /src/modules/module-zeroconf-publish.c
parent5ef242c5b323a0abaca4cfb44b3a1cba99a4c43d (diff)
don't announce monitor sources
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1990 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/module-zeroconf-publish.c')
-rw-r--r--src/modules/module-zeroconf-publish.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
index 8e0419df..818a1b28 100644
--- a/src/modules/module-zeroconf-publish.c
+++ b/src/modules/module-zeroconf-publish.c
@@ -335,14 +335,14 @@ static void service_free(struct service *s) {
pa_xfree(s);
}
-static pa_bool_t is_network(pa_object *o) {
+static pa_bool_t shall_ignore(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);
+ return PA_SOURCE(o)->monitor_of || (PA_SOURCE(o)->flags & PA_SOURCE_NETWORK);
pa_assert_not_reached();
}
@@ -351,7 +351,7 @@ static pa_hook_result_t device_new_or_changed_cb(pa_core *c, pa_object *o, struc
pa_assert(c);
pa_object_assert_ref(o);
- if (!is_network(o))
+ if (!shall_ignore(o))
publish_service(get_service(u, o));
return PA_HOOK_OK;
@@ -462,11 +462,11 @@ 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)))
- if (!is_network(PA_OBJECT(sink)))
+ if (!shall_ignore(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)))
- if (!is_network(PA_OBJECT(source)))
+ if (!shall_ignore(PA_OBJECT(source)))
publish_service(get_service(u, PA_OBJECT(source)));
if (publish_main_service(u) < 0)