On Thu, Aug 15, 2013 at 11:48 AM, Tanu Kaskinen <tanu.kaskinen at linux.intel.com> wrote: > On Tue, 2013-08-13 at 01:53 -0300, jprvita at gmail.com wrote: >> From: Jo?o Paulo Rechi Vita <jprvita at openbossa.org> >> >> We need diferent object paths for BlueZ 4 and BlueZ 5 endpoints to avoid >> crashing the daemon in the case both modules are loaded in parallel. >> --- >> src/modules/bluetooth/bluez4-util.c | 48 ++++++++++++++++++------------------- >> 1 file changed, 24 insertions(+), 24 deletions(-) >> >> diff --git a/src/modules/bluetooth/bluez4-util.c b/src/modules/bluetooth/bluez4-util.c >> index 79e2dc8..49360a5 100644 >> --- a/src/modules/bluetooth/bluez4-util.c >> +++ b/src/modules/bluetooth/bluez4-util.c >> @@ -32,12 +32,12 @@ >> #include "bluez4-util.h" >> #include "a2dp-codecs.h" >> >> -#define HFP_AG_ENDPOINT "/MediaEndpoint/HFPAG" >> -#define HFP_HS_ENDPOINT "/MediaEndpoint/HFPHS" >> -#define A2DP_SOURCE_ENDPOINT "/MediaEndpoint/A2DPSource" >> -#define A2DP_SINK_ENDPOINT "/MediaEndpoint/A2DPSink" >> +#define PA_BLUEZ4_ENDPOINT_HFP_AG "/MediaEndpoint/BlueZ4/HFPAG" >> +#define PA_BLUEZ4_ENDPOINT_HFP_HS "/MediaEndpoint/BlueZ4/HFPHS" >> +#define PA_BLUEZ4_ENDPOINT_A2DP_SOURCE "/MediaEndpoint/BlueZ4/A2DPSource" >> +#define PA_BLUEZ4_ENDPOINT_A2DP_SINK "/MediaEndpoint/BlueZ4/A2DPSink" > > Private definitions shouldn't have the PA_BLUEZ4_ prefix. I'll fix this > myself and push to the bluez5 branch. > Ack. -- Jo?o Paulo Rechi Vita http://about.me/jprvita
