From 62f181aa2834ceea1d759e75d59c4feae0f9b9f7 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Thu, 31 Mar 2011 00:56:20 +0530 Subject: bluetooth: Pull a2dp-codecs.h from BlueZ This pulls a2dp-codecs.h from BlueZ which contains the capabilities structures for SBC and MPEG. We currently have these manually added to ipc.h, so pulling this header makes our files identical to upstream. --- src/modules/bluetooth/module-bluetooth-device.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/modules/bluetooth/module-bluetooth-device.c') diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c index ac0f16fc..b132d420 100644 --- a/src/modules/bluetooth/module-bluetooth-device.c +++ b/src/modules/bluetooth/module-bluetooth-device.c @@ -52,12 +52,10 @@ #include "module-bluetooth-device-symdef.h" #include "ipc.h" #include "sbc.h" +#include "a2dp-codecs.h" #include "rtp.h" #include "bluetooth-util.h" -#define MAX_BITPOOL 64 -#define MIN_BITPOOL 2U - #define BITPOOL_DEC_LIMIT 32 #define BITPOOL_DEC_STEP 5 @@ -2112,12 +2110,12 @@ static void shutdown_bt(struct userdata *u) { static int bt_transport_config_a2dp(struct userdata *u) { const pa_bluetooth_transport *t; struct a2dp_info *a2dp = &u->a2dp; - sbc_capabilities_raw_t *config; + a2dp_sbc_t *config; t = pa_bluetooth_discovery_get_transport(u->discovery, u->transport); pa_assert(t); - config = (sbc_capabilities_raw_t *) t->config; + config = (a2dp_sbc_t *) t->config; if (a2dp->sbc_initialized) sbc_reinit(&a2dp->sbc, 0); -- cgit