Return-Path: Subject: [PATCH BlueZ v2 3/8] tools/bluetooth-player: Use g_dbus_proxy_lookup() instead of find_* From: ERAMOTO Masaya To: "linux-bluetooth@vger.kernel.org" References: <2003783a-cdd8-597a-6438-967ffafe67c8@jp.fujitsu.com> Message-ID: <8e50ba2b-f0c4-6954-3ff3-5760a81a47d7@jp.fujitsu.com> Date: Thu, 28 Dec 2017 14:44:07 +0900 MIME-Version: 1.0 In-Reply-To: <2003783a-cdd8-597a-6438-967ffafe67c8@jp.fujitsu.com> Content-Type: text/plain; charset="utf-8" Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Uses g_dbus_proxy_lookup() instead of find_{player,folder,item} --- tools/bluetooth-player.c | 98 +++++++++++++++++------------------------------- 1 file changed, 35 insertions(+), 63 deletions(-) diff --git a/tools/bluetooth-player.c b/tools/bluetooth-player.c index b22de2775..0ab8cab33 100644 --- a/tools/bluetooth-player.c +++ b/tools/bluetooth-player.c @@ -51,9 +51,9 @@ static DBusConnection *dbus_conn; static GDBusProxy *default_player; -static GSList *players = NULL; -static GSList *folders = NULL; -static GSList *items = NULL; +static GList *players = NULL; +static GList *folders = NULL; +static GList *items = NULL; static void connect_handler(DBusConnection *connection, void *user_data) { @@ -90,25 +90,12 @@ static void play_reply(DBusMessage *message, void *user_data) bt_shell_printf("Play successful\n"); } -static GDBusProxy *find_item(const char *path) -{ - GSList *l; - - for (l = items; l; l = g_slist_next(l)) { - GDBusProxy *proxy = l->data; - - if (strcmp(path, g_dbus_proxy_get_path(proxy)) == 0) - return proxy; - } - - return NULL; -} - static void cmd_play_item(int argc, char *argv[]) { GDBusProxy *proxy; - proxy = find_item(argv[1]); + proxy = g_dbus_proxy_lookup(items, NULL, argv[1], + BLUEZ_MEDIA_ITEM_INTERFACE); if (proxy == NULL) { bt_shell_printf("Item %s not available\n", argv[1]); return; @@ -460,28 +447,14 @@ static void print_player(GDBusProxy *proxy, const char *description) static void cmd_list(int argc, char *arg[]) { - GSList *l; + GList *l; - for (l = players; l; l = g_slist_next(l)) { + for (l = players; l; l = g_list_next(l)) { GDBusProxy *proxy = l->data; print_player(proxy, NULL); } } -static GDBusProxy *find_player(const char *path) -{ - GSList *l; - - for (l = players; l; l = g_slist_next(l)) { - GDBusProxy *proxy = l->data; - - if (strcmp(path, g_dbus_proxy_get_path(proxy)) == 0) - return proxy; - } - - return NULL; -} - static void print_iter(const char *label, const char *name, DBusMessageIter *iter) { @@ -557,25 +530,12 @@ static void print_property(GDBusProxy *proxy, const char *name) print_iter("\t", name, &iter); } -static GDBusProxy *find_folder(const char *path) -{ - GSList *l; - - for (l = folders; l; l = g_slist_next(l)) { - GDBusProxy *proxy = l->data; - - if (strcmp(path, g_dbus_proxy_get_path(proxy)) == 0) - return proxy; - } - - return NULL; -} - static void cmd_show_item(int argc, char *argv[]) { GDBusProxy *proxy; - proxy = find_item(argv[1]); + proxy = g_dbus_proxy_lookup(items, NULL, argv[1], + BLUEZ_MEDIA_ITEM_INTERFACE); if (!proxy) { bt_shell_printf("Item %s not available\n", argv[1]); return; @@ -605,7 +565,8 @@ static void cmd_show(int argc, char *argv[]) proxy = default_player; } else { - proxy = find_player(argv[1]); + proxy = g_dbus_proxy_lookup(players, NULL, argv[1], + BLUEZ_MEDIA_PLAYER_INTERFACE); if (!proxy) { bt_shell_printf("Player %s not available\n", argv[1]); return; @@ -623,7 +584,9 @@ static void cmd_show(int argc, char *argv[]) print_property(proxy, "Position"); print_property(proxy, "Track"); - folder = find_folder(g_dbus_proxy_get_path(proxy)); + folder = g_dbus_proxy_lookup(folders, NULL, + g_dbus_proxy_get_path(proxy), + BLUEZ_MEDIA_FOLDER_INTERFACE); if (folder == NULL) return; @@ -637,7 +600,8 @@ static void cmd_show(int argc, char *argv[]) dbus_message_iter_get_basic(&iter, &path); - item = find_item(path); + item = g_dbus_proxy_lookup(items, NULL, path, + BLUEZ_MEDIA_ITEM_INTERFACE); if (item == NULL) return; @@ -650,7 +614,8 @@ static void cmd_select(int argc, char *argv[]) { GDBusProxy *proxy; - proxy = find_player(argv[1]); + proxy = g_dbus_proxy_lookup(players, NULL, argv[1], + BLUEZ_MEDIA_PLAYER_INTERFACE); if (proxy == NULL) { bt_shell_printf("Player %s not available\n", argv[1]); return; @@ -697,7 +662,9 @@ static void cmd_change_folder(int argc, char *argv[]) if (check_default_player() == FALSE) return; - proxy = find_folder(g_dbus_proxy_get_path(default_player)); + proxy = g_dbus_proxy_lookup(folders, NULL, + g_dbus_proxy_get_path(default_player), + BLUEZ_MEDIA_FOLDER_INTERFACE); if (proxy == NULL) { bt_shell_printf("Operation not supported\n"); return; @@ -799,7 +766,9 @@ static void cmd_list_items(int argc, char *argv[]) if (check_default_player() == FALSE) return; - proxy = find_folder(g_dbus_proxy_get_path(default_player)); + proxy = g_dbus_proxy_lookup(folders, NULL, + g_dbus_proxy_get_path(default_player), + BLUEZ_MEDIA_FOLDER_INTERFACE); if (proxy == NULL) { bt_shell_printf("Operation not supported\n"); return; @@ -882,7 +851,9 @@ static void cmd_search(int argc, char *argv[]) if (check_default_player() == FALSE) return; - proxy = find_folder(g_dbus_proxy_get_path(default_player)); + proxy = g_dbus_proxy_lookup(folders, NULL, + g_dbus_proxy_get_path(default_player), + BLUEZ_MEDIA_FOLDER_INTERFACE); if (proxy == NULL) { bt_shell_printf("Operation not supported\n"); return; @@ -919,7 +890,8 @@ static void cmd_queue(int argc, char *argv[]) { GDBusProxy *proxy; - proxy = find_item(argv[1]); + proxy = g_dbus_proxy_lookup(items, NULL, argv[1], + BLUEZ_MEDIA_ITEM_INTERFACE); if (proxy == NULL) { bt_shell_printf("Item %s not available\n", argv[1]); return; @@ -970,7 +942,7 @@ static const struct bt_shell_menu main_menu = { static void player_added(GDBusProxy *proxy) { - players = g_slist_append(players, proxy); + players = g_list_append(players, proxy); if (default_player == NULL) default_player = proxy; @@ -992,7 +964,7 @@ static void print_folder(GDBusProxy *proxy, const char *description) static void folder_added(GDBusProxy *proxy) { - folders = g_slist_append(folders, proxy); + folders = g_list_append(folders, proxy); print_folder(proxy, COLORED_NEW); } @@ -1017,7 +989,7 @@ static void print_item(GDBusProxy *proxy, const char *description) static void item_added(GDBusProxy *proxy) { - items = g_slist_append(items, proxy); + items = g_list_append(items, proxy); print_item(proxy, COLORED_NEW); } @@ -1043,19 +1015,19 @@ static void player_removed(GDBusProxy *proxy) if (default_player == proxy) default_player = NULL; - players = g_slist_remove(players, proxy); + players = g_list_remove(players, proxy); } static void folder_removed(GDBusProxy *proxy) { - folders = g_slist_remove(folders, proxy); + folders = g_list_remove(folders, proxy); print_folder(proxy, COLORED_DEL); } static void item_removed(GDBusProxy *proxy) { - items = g_slist_remove(items, proxy); + items = g_list_remove(items, proxy); print_item(proxy, COLORED_DEL); } -- 2.14.1