From 9d67330566b681489bb8f1fec4e0100fa40239f9 Mon Sep 17 00:00:00 2001 From: Janos Kovacs Date: Sat, 11 Aug 2012 00:19:12 +0300 Subject: [PATCH] routing: enable carkit default routing --- murphy/classify.c | 5 +---- murphy/router.c | 18 +++++++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/murphy/classify.c b/murphy/classify.c index db8cda9..a8bb065 100644 --- a/murphy/classify.c +++ b/murphy/classify.c @@ -333,10 +333,7 @@ pa_bool_t pa_classify_multiplex_stream(mir_node *node) const char *pa_classify_loopback_stream(mir_node *node) { const char *role[mir_device_class_end - mir_device_class_begin] = { - /* - [ mir_bluetooth_sco - mir_device_class_begin ] = "phone" , - [ mir_bluetooth_carkit - mir_device_class_begin ] = "carkit", - */ + [ mir_bluetooth_carkit - mir_device_class_begin ] = "phone", [ mir_bluetooth_source - mir_device_class_begin ] = "music" , }; diff --git a/murphy/router.c b/murphy/router.c index 6d1c092..b58a115 100644 --- a/murphy/router.c +++ b/murphy/router.c @@ -516,8 +516,11 @@ pa_bool_t mir_router_default_accept(struct userdata *u, mir_rtgroup *rtg, pa_assert(rtg); pa_assert(node); - accept = (node->type >= mir_device_class_begin && - node->type < mir_device_class_end); + if (node->type == mir_bluetooth_carkit) + accept = FALSE; + else + accept = (node->type >= mir_device_class_begin && + node->type < mir_device_class_end); return accept; } @@ -535,11 +538,12 @@ pa_bool_t mir_router_phone_accept(struct userdata *u, mir_rtgroup *rtg, class = node->type; if (class >= mir_device_class_begin && class < mir_device_class_end) { - if (class != mir_bluetooth_a2dp && - class != mir_usb_headphone && - class != mir_wired_headphone && - class != mir_hdmi && - class != mir_spdif ) + if (class != mir_bluetooth_a2dp && + class != mir_usb_headphone && + class != mir_wired_headphone && + class != mir_hdmi && + class != mir_spdif && + class != mir_bluetooth_carkit ) { return TRUE; } -- 2.7.4