aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2019-03-27 18:25:47 -0700
committerMatt Ranostay <matt.ranostay@konsulko.com>2019-04-13 18:40:50 -0700
commitc455c0b51cc06901e9afc168cf5afc6503f32e12 (patch)
tree2fe468f667d19c509fa8e92adc60ce46d1bfda8b
parentdb49d1d1bf5454fb371fc8c2731a0c5b1ed255d9 (diff)
binding: bluetooth: allow multiple paths for org.bluez.MediaPlayer1 interfacesguppy_7.0.4guppy_7.0.3guppy_7.0.2guppy/7.0.4guppy/7.0.3guppy/7.0.27.0.47.0.37.0.2guppy
Previously org.bluez.MediaPlayer1 paths could only resolve to player0 but certain phones request another instance for another application (e.g. player1). This patchset changes the default media player path to last connected, and which in theory should be from the media application in use on the phone. From limited experiments not in use interfaces will be reaped shortly after going idle. Bug-AGL: SPEC-2281 Change-Id: Id4bdc89cd395d5cd3ac043394761a95b306e5c6d Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
-rw-r--r--README.md5
-rw-r--r--binding/bluetooth-api.c10
-rw-r--r--binding/bluetooth-api.h4
3 files changed, 12 insertions, 7 deletions
diff --git a/README.md b/README.md
index fcfd0a1..85150c7 100644
--- a/README.md
+++ b/README.md
@@ -303,8 +303,9 @@ Playing audio reporting event (not all fields will be passed in every event):
"genre": "Dance & DJ/General"
},
"position": 5600,
- "status": "playing"
- "connected": false
+ "status": "playing",
+ "connected": true,
+ "player": "player0"
}
</pre>
diff --git a/binding/bluetooth-api.c b/binding/bluetooth-api.c
index 8fdb0f8..8905c6a 100644
--- a/binding/bluetooth-api.c
+++ b/binding/bluetooth-api.c
@@ -356,13 +356,14 @@ static void bluez_devices_signal_callback(
event = ns->media_event;
}
json_object_object_add(jresp, "properties", jobj);
- } else if (is_mediaplayer1_interface(path) &&
- g_str_has_suffix(path, BLUEZ_DEFAULT_PLAYER)) {
-
+ } else if (is_mediaplayer1_interface(path)) {
+ gchar *player = find_index(path, 5);
json_object_object_add(jresp, "connected",
json_object_new_boolean(TRUE));
json_object_object_add(jresp, "type",
json_object_new_string("playback"));
+ json_object_object_add(jresp, "player",
+ json_object_new_string(player));
mediaplayer1_set_path(ns, path);
event = ns->media_event;
} else {
@@ -390,10 +391,13 @@ static void bluez_devices_signal_callback(
event = ns->media_event;
} else if (is_mediaplayer1_interface(path)) {
+ gchar *player = find_index(path, 5);
json_object_object_add(jresp, "connected",
json_object_new_boolean(FALSE));
json_object_object_add(jresp, "type",
json_object_new_string("playback"));
+ json_object_object_add(jresp, "player",
+ json_object_new_string(player));
event = ns->media_event;
/* adapter removal */
} else if (split_length(path) == 4) {
diff --git a/binding/bluetooth-api.h b/binding/bluetooth-api.h
index 6b24d13..a0b807b 100644
--- a/binding/bluetooth-api.h
+++ b/binding/bluetooth-api.h
@@ -116,9 +116,9 @@ static inline gboolean is_mediaplayer1_interface(const char *path)
if (split_length(path) != 6)
return FALSE;
- // TODO: allow mutiple players per device
+ // Check for 'playerX' suffix, not always player0
data = find_index(path, 5);
- ret = !g_strcmp0(data, BLUEZ_DEFAULT_PLAYER);
+ ret = !strncmp(data, BLUEZ_DEFAULT_PLAYER, sizeof(BLUEZ_DEFAULT_PLAYER) - 1);
g_free(data);
return ret;