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: Avoid PA_BLUETOOTH_TRANSPORT_HOOK_NREC_CHANGED

Browse source 
The hook has been recently moved to pa_bluetooth_hook_t, so make use
of the new version.
This commit is contained in:
Mikel Astiz 2012-12-10 08:30:41 +01:00 • committed by Tanu Kaskinen
parent 2a3874dc36
commit 7c2465d5f9
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/modules/bluetooth/module-bluetooth-device.c
View file

@ -124,7 +124,6 @@ struct hsp_info {
void (*sco_source_set_volume)(pa_source *s); void (*sco_source_set_volume)(pa_source *s);
pa_hook_slot *sink_state_changed_slot; pa_hook_slot *sink_state_changed_slot;
pa_hook_slot *source_state_changed_slot; pa_hook_slot *source_state_changed_slot;
pa_hook_slot *nrec_changed_slot;
}; };
struct bluetooth_msg { struct bluetooth_msg {
@ -148,6 +147,7 @@ struct userdata {
char *accesstype; char *accesstype;
pa_hook_slot *discovery_slot; pa_hook_slot *discovery_slot;
pa_hook_slot *transport_state_changed_slot; pa_hook_slot *transport_state_changed_slot;
pa_hook_slot *transport_nrec_changed_slot;
pa_bluetooth_discovery *discovery; pa_bluetooth_discovery *discovery;
pa_bool_t auto_connect; pa_bool_t auto_connect;
@ -1578,12 +1578,15 @@ static pa_hook_result_t source_state_changed_cb(pa_core *c, pa_source *s, struct
return PA_HOOK_OK; return PA_HOOK_OK;
} }
static pa_hook_result_t nrec_changed_cb(pa_bluetooth_transport *t, void *call_data, struct userdata *u) { static pa_hook_result_t transport_nrec_changed_cb(pa_bluetooth_discovery *y, pa_bluetooth_transport *t, struct userdata *u) {
pa_proplist *p; pa_proplist *p;
pa_assert(t); pa_assert(t);
pa_assert(u); pa_assert(u);
if (t != u->transport)
return PA_HOOK_OK;
p = pa_proplist_new(); p = pa_proplist_new();
pa_proplist_sets(p, "bluetooth.nrec", t->nrec ? "1" : "0"); pa_proplist_sets(p, "bluetooth.nrec", t->nrec ? "1" : "0");
pa_source_update_proplist(u->source, PA_UPDATE_REPLACE, p); pa_source_update_proplist(u->source, PA_UPDATE_REPLACE, p);
@ -1813,9 +1816,6 @@ static int add_source(struct userdata *u) {
if ((u->profile == PROFILE_HSP) || (u->profile == PROFILE_HFGW)) { if ((u->profile == PROFILE_HSP) || (u->profile == PROFILE_HFGW)) {
pa_bluetooth_transport *t = u->transport; pa_bluetooth_transport *t = u->transport;
pa_proplist_sets(u->source->proplist, "bluetooth.nrec", t->nrec ? "1" : "0"); pa_proplist_sets(u->source->proplist, "bluetooth.nrec", t->nrec ? "1" : "0");
if (!u->hsp.nrec_changed_slot)
u->hsp.nrec_changed_slot = pa_hook_connect(&t->hooks[PA_BLUETOOTH_TRANSPORT_HOOK_NREC_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) nrec_changed_cb, u);
} }
if (u->profile == PROFILE_HSP) { if (u->profile == PROFILE_HSP) {
@ -2047,11 +2047,6 @@ static void stop_thread(struct userdata *u) {
u->hsp.source_state_changed_slot = NULL; u->hsp.source_state_changed_slot = NULL;
} }
if (u->hsp.nrec_changed_slot) {
pa_hook_slot_free(u->hsp.nrec_changed_slot);
u->hsp.nrec_changed_slot = NULL;
}
if (u->transport) { if (u->transport) {
bt_transport_release(u); bt_transport_release(u);
u->transport = NULL; u->transport = NULL;
@ -2645,6 +2640,10 @@ int pa__init(pa_module* m) {
pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_STATE_CHANGED), pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_STATE_CHANGED),
PA_HOOK_NORMAL, (pa_hook_cb_t) transport_state_changed_cb, u); PA_HOOK_NORMAL, (pa_hook_cb_t) transport_state_changed_cb, u);
u->transport_nrec_changed_slot =
pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_NREC_CHANGED),
PA_HOOK_NORMAL, (pa_hook_cb_t) transport_nrec_changed_cb, u);
/* Add the card structure. This will also initialize the default profile */ /* Add the card structure. This will also initialize the default profile */
if (add_card(u) < 0) if (add_card(u) < 0)
goto fail; goto fail;
@ -2738,6 +2737,9 @@ void pa__done(pa_module *m) {
if (u->transport_state_changed_slot) if (u->transport_state_changed_slot)
pa_hook_slot_free(u->transport_state_changed_slot); pa_hook_slot_free(u->transport_state_changed_slot);
if (u->transport_nrec_changed_slot)
pa_hook_slot_free(u->transport_nrec_changed_slot);
if (USE_SCO_OVER_PCM(u)) if (USE_SCO_OVER_PCM(u))
restore_sco_volume_callbacks(u); restore_sco_volume_callbacks(u);