commit 5d5d49e6396b4326e30f6cb5541dc322fb4b76fa
author Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Fri Aug 19 16:43:21 2016 +0300
committer Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Mon Aug 22 17:52:42 2016 +0300
tree 6481db3ac2c25c434820f85e4da9fa9eb4f58b6d
parent 1908e388aa2ce3d17053de79749b1864c80d81af

audio/player: Fix not setting scope properly

If file is played from search folder it shall use search scope not vfs.

profiles/audio/avrcp.c

diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index e20515d..51a89b1 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -3137,6 +3137,8 @@
 
 	if (g_strrstr(name, "/NowPlaying"))
 		player->scope = 0x03;
+	else if (g_strrstr(name, "/Search"))
+		player->scope = 0x02;
 	else
 		player->scope = 0x01;
 

profiles/audio/player.c

diff --git a/profiles/audio/player.c b/profiles/audio/player.c
index f1bd9de..7944b49 100644
--- a/profiles/audio/player.c
+++ b/profiles/audio/player.c
@@ -1483,12 +1483,15 @@
 	struct media_item *item = data;
 	struct media_player *mp = item->player;
 	struct player_callback *cb = mp->cb;
+	const char *path;
 	int err;
 
 	if (!item->playable || !cb->cbs->play_item)
 		return btd_error_not_supported(msg);
 
-	err = cb->cbs->play_item(mp, item->path, item->uid, cb->user_data);
+	path = mp->search && mp->scope == mp->search ? "/Search" : item->path;
+
+	err = cb->cbs->play_item(mp, path, item->uid, cb->user_data);
 	if (err < 0)
 		return btd_error_failed(msg, strerror(-err));