mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Pull a2dp-codecs.h from BlueZ

Browse source 
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.
This commit is contained in:
Arun Raghavan 2011-03-31 00:56:20 +05:30 • committed by Colin Guthrie
parent fce93eb625
commit 62f181aa28
5 changed files with 125 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/bluetooth/bluetooth-util.c
View file

@ -29,6 +29,7 @@
#include "bluetooth-util.h"
#include "ipc.h"
#include "a2dp-codecs.h"
#define HFP_AG_ENDPOINT "/MediaEndpoint/HFPAG"
#define A2DP_SOURCE_ENDPOINT "/MediaEndpoint/A2DPSource"
@ -58,9 +59,6 @@
" </interface>" \
"</node>"
#define MAX_BITPOOL 64
#define MIN_BITPOOL 2U
struct pa_bluetooth_discovery {
PA_REFCNT_DECLARE;
@ -636,7 +634,7 @@ static void register_endpoint(pa_bluetooth_discovery *y, const char *path, const
uint8_t *caps = &capability;
pa_dbus_append_basic_array_variant_dict_entry(&d, "Capabilities", DBUS_TYPE_BYTE, &caps, 1);
} else {
sbc_capabilities_raw_t capabilities;
a2dp_sbc_t capabilities;
uint8_t *caps = (uint8_t *) &capabilities;
capabilities.channel_mode = BT_A2DP_CHANNEL_MODE_MONO | BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL |
@ -1277,7 +1275,7 @@ static uint8_t a2dp_default_bitpool(uint8_t freq, uint8_t mode) {
static DBusMessage *endpoint_select_configuration(DBusConnection *c, DBusMessage *m, void *userdata) {
pa_bluetooth_discovery *y = userdata;
sbc_capabilities_raw_t *cap, config;
a2dp_sbc_t *cap, config;
uint8_t *pconf = (uint8_t *) &config;
int i, size;
DBusMessage *r;