From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
Items are not only folders so this split the item creation from
media_player_create_folder.
---
profiles/audio/player.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/profiles/audio/player.c b/profiles/audio/player.c
index b222643..8401e19 100644
--- a/profiles/audio/player.c
+++ b/profiles/audio/player.c
@@ -1092,11 +1092,15 @@ static const GDBusPropertyTable media_item_properties[] = {
{ }
};
-int media_player_create_folder(struct media_player *mp, const char *name)
+static struct media_item *media_player_create_item(struct media_player *mp,
+ const char *name,
+ bool folder,
+ bool playable)
{
struct media_item *item;
- DBG("%s", name);
+ DBG("%s folder %s playable %s", name, folder ? "true" : "false",
+ playable ? "true" : "false");
item = g_new0(struct media_item, 1);
item->player = mp;
@@ -1113,9 +1117,20 @@ int media_player_create_folder(struct media_player *mp, const char *name)
error("D-Bus failed to register %s on %s path",
MEDIA_ITEM_INTERFACE, item->path);
media_item_destroy(item);
- return -EINVAL;
+ return NULL;
}
+ return item;
+}
+
+int media_player_create_folder(struct media_player *mp, const char *name)
+{
+ struct media_item *item;
+
+ item = media_player_create_item(mp, name, true, false);
+ if (item == NULL)
+ return -EINVAL;
+
if (mp->folder == NULL)
media_player_set_folder_item(mp, item, 0);
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
