From patchwork Mon Mar 28 21:25:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 555164 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B0B9C433F5 for ; Mon, 28 Mar 2022 21:25:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229562AbiC1V12 (ORCPT ); Mon, 28 Mar 2022 17:27:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229565AbiC1V11 (ORCPT ); Mon, 28 Mar 2022 17:27:27 -0400 Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3C9A8CD86 for ; Mon, 28 Mar 2022 14:25:34 -0700 (PDT) Received: by mail-io1-xd2b.google.com with SMTP id 125so18754187iov.10 for ; Mon, 28 Mar 2022 14:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=TQ7eLcFz4jxLbmOnJ0Nttye8olqjEmQ9i/KR35LfNPU=; b=ItCh/VQBTYUek9XWcSsJzZ6FirJqZVJfh0ajUT3Nrp3W7oqUg8K6AwOH62aDBaSajx l7Y01uE9wXUyjeLTzPJwlkHaG1Mu2L25e+gzFU0+nJ6WgXG7Ai7YHm1/Ew8Wqan5fJ4K fO+YQxKirn+OMwtBsRVl+vkBjUcL3Rvpj71t6H0AKAK06uNqqgshf4WumRwpIWZM7Tun ankMhXeIAzE+44MFgW4yQnH78IUi0xDpUDWi0p8kP0G/NqCiJ5FCRO60BUYS3OXI1WsD Cb0aWfR6hZ8F5vAf9Sk9ZHd0R6Mm7pzEXFOJzqq6LCZ+1JsIUkLBU0xqevHipjLQyqem Rhgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TQ7eLcFz4jxLbmOnJ0Nttye8olqjEmQ9i/KR35LfNPU=; b=6rvbWmiAs35RRZjc75QQHlYsF9ScN3MYAbKipxno8ZE2a1v0CqNw8AomdJILyXvwTG MBcsnBiqexCEUEp+QjXl36igRePycUQ+ClQ+meycZlRKUBHYHfXbjUunX5qVQjsLGqPV 7wYBcwKMjypZcBUISf5nZLaNsL3yk8OSw4Bg7fo1m35cR8vZ/YusjI/OZ/+6B6+nkZQ8 JvZhIo/Iymy0akHuPupP8v0qjitc9JG3/ANtJx4EXi1e7qqLhCQs1qurw3Hy8zr5/pIj 1WHj0SJrnM2/R97+EltYcG9y2pJpaNoTCg/OQtubJ3Qn7gyGmElaKizD4saY3m5wspEP cNAQ== X-Gm-Message-State: AOAM5303NisKE03wSFGdJbqcQquND6G7ec58e9T8eWR4mgS0WDnI+yI5 9AWHTuGZ15Y28I9bOGEH/RNHkan4PjA= X-Google-Smtp-Source: ABdhPJz85oXrQZolLcAdrc2XbUetw53CDn+Y7yEsQdDYfLP63umCozxs5/Gj08APL8Hbl0v3fZXd/Q== X-Received: by 2002:a5d:8b8f:0:b0:649:ec6d:98e9 with SMTP id p15-20020a5d8b8f000000b00649ec6d98e9mr7425601iol.30.1648502720546; Mon, 28 Mar 2022 14:25:20 -0700 (PDT) Received: from lvondent-mobl4.intel.com (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id n3-20020a056e0208e300b002c9c9974c48sm925030ilt.36.2022.03.28.14.25.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 14:25:20 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ 2/2] client: Add support for player submenu Date: Mon, 28 Mar 2022 14:25:18 -0700 Message-Id: <20220328212518.1890451-2-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220328212518.1890451-1-luiz.dentz@gmail.com> References: <20220328212518.1890451-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This moves adds the functionality of bluetooth-player into bluetoothctl. --- Makefile.tools | 6 +- client/main.c | 5 + tools/bluetooth-player.c => client/player.c | 70 +- client/player.h | 12 + tools/bluetooth-player.c | 1081 +------------------ 5 files changed, 64 insertions(+), 1110 deletions(-) copy tools/bluetooth-player.c => client/player.c (96%) create mode 100644 client/player.h diff --git a/Makefile.tools b/Makefile.tools index bd902fd83..b7d893248 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -10,8 +10,8 @@ client_bluetoothctl_SOURCES = client/main.c \ client/adv_monitor.h \ client/adv_monitor.c \ client/gatt.h client/gatt.c \ - client/admin.h \ - client/admin.c + client/admin.h client/admin.c \ + client/player.h client/player.c client_bluetoothctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ $(GLIB_LIBS) $(DBUS_LIBS) -lreadline endif @@ -456,7 +456,7 @@ tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la \ src/libshared-glib.la $(GLIB_LIBS) -tools_bluetooth_player_SOURCES = tools/bluetooth-player.c +tools_bluetooth_player_SOURCES = tools/bluetooth-player.c client/player.c tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ src/libshared-glib.la \ $(GLIB_LIBS) $(DBUS_LIBS) -lreadline diff --git a/client/main.c b/client/main.c index 6bb11b1ad..589268c3a 100644 --- a/client/main.c +++ b/client/main.c @@ -30,6 +30,7 @@ #include "advertising.h" #include "adv_monitor.h" #include "admin.h" +#include "player.h" /* String display constants */ #define COLORED_NEW COLOR_GREEN "NEW" COLOR_OFF @@ -3215,6 +3216,8 @@ int main(int argc, char *argv[]) bt_shell_set_env("DBUS_CONNECTION", dbus_conn); + player_add_submenu(); + client = g_dbus_client_new(dbus_conn, "org.bluez", "/org/bluez"); g_dbus_client_set_connect_watch(client, connect_handler, NULL); @@ -3228,6 +3231,8 @@ int main(int argc, char *argv[]) status = bt_shell_run(); + player_remove_submenu(); + g_dbus_client_unref(client); dbus_connection_unref(dbus_conn); diff --git a/tools/bluetooth-player.c b/client/player.c similarity index 96% copy from tools/bluetooth-player.c copy to client/player.c index bdfd9aa46..1095482d4 100644 --- a/tools/bluetooth-player.c +++ b/client/player.c @@ -3,7 +3,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2012 Intel Corporation. All rights reserved. + * Copyright (C) 2020 Intel Corporation. All rights reserved. * * */ @@ -15,24 +15,30 @@ #define _GNU_SOURCE #include #include +#include #include #include #include +#include #include +#include #include #include "gdbus/gdbus.h" + +#include "lib/bluetooth.h" +#include "lib/uuid.h" + +#include "src/shared/util.h" #include "src/shared/shell.h" +#include "player.h" /* String display constants */ #define COLORED_NEW COLOR_GREEN "NEW" COLOR_OFF #define COLORED_CHG COLOR_YELLOW "CHG" COLOR_OFF #define COLORED_DEL COLOR_RED "DEL" COLOR_OFF -#define PROMPT_ON COLOR_BLUE "[bluetooth]" COLOR_OFF "# " -#define PROMPT_OFF "[bluetooth]# " - #define BLUEZ_MEDIA_PLAYER_INTERFACE "org.bluez.MediaPlayer1" #define BLUEZ_MEDIA_FOLDER_INTERFACE "org.bluez.MediaFolder1" #define BLUEZ_MEDIA_ITEM_INTERFACE "org.bluez.MediaItem1" @@ -43,18 +49,6 @@ static GList *players = NULL; static GList *folders = NULL; static GList *items = NULL; -static void connect_handler(DBusConnection *connection, void *user_data) -{ - bt_shell_attach(fileno(stdin)); - bt_shell_set_prompt(PROMPT_ON); -} - -static void disconnect_handler(DBusConnection *connection, void *user_data) -{ - bt_shell_detach(); - bt_shell_set_prompt(PROMPT_OFF); -} - static bool check_default_player(void) { if (!default_player) { @@ -69,9 +63,8 @@ static char *generic_generator(const char *text, int state, GList *source) { static int index = 0; - if (!state) { + if (!state) index = 0; - } return g_dbus_proxy_path_lookup(source, &index, text); } @@ -326,10 +319,11 @@ static void generic_callback(const DBusError *error, void *user_data) if (dbus_error_is_set(error)) { bt_shell_printf("Failed to set %s: %s\n", str, error->name); return bt_shell_noninteractive_quit(EXIT_FAILURE); - } else { - bt_shell_printf("Changing %s succeeded\n", str); - return bt_shell_noninteractive_quit(EXIT_SUCCESS); } + + bt_shell_printf("Changing %s succeeded\n", str); + + return bt_shell_noninteractive_quit(EXIT_SUCCESS); } static void cmd_equalizer(int argc, char *argv[]) @@ -653,7 +647,7 @@ static void cmd_select(int argc, char *argv[]) if (default_player == proxy) return bt_shell_noninteractive_quit(EXIT_SUCCESS); - default_player = proxy, + default_player = proxy; print_player(proxy, NULL); return bt_shell_noninteractive_quit(EXIT_SUCCESS); @@ -914,8 +908,9 @@ static void cmd_queue(int argc, char *argv[]) bt_shell_printf("Attempting to queue %s\n", argv[1]); } -static const struct bt_shell_menu main_menu = { - .name = "main", +static const struct bt_shell_menu player_menu = { + .name = "player", + .desc = "Media Player Submenu", .entries = { { "list", NULL, cmd_list, "List available players" }, { "show", "[player]", cmd_show, "Player information", @@ -1104,30 +1099,23 @@ static void property_changed(GDBusProxy *proxy, const char *name, item_property_changed(proxy, name, iter); } -int main(int argc, char *argv[]) -{ - GDBusClient *client; - int status; +static GDBusClient *client; - bt_shell_init(argc, argv, NULL); - bt_shell_set_menu(&main_menu); - bt_shell_set_prompt(PROMPT_OFF); +void player_add_submenu(void) +{ + bt_shell_add_submenu(&player_menu); - dbus_conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL, NULL); + dbus_conn = bt_shell_get_env("DBUS_CONNECTION"); + if (!dbus_conn || client) + return; client = g_dbus_client_new(dbus_conn, "org.bluez", "/org/bluez"); - g_dbus_client_set_connect_watch(client, connect_handler, NULL); - g_dbus_client_set_disconnect_watch(client, disconnect_handler, NULL); - g_dbus_client_set_proxy_handlers(client, proxy_added, proxy_removed, property_changed, NULL); +} - status = bt_shell_run(); - +void player_remove_submenu(void) +{ g_dbus_client_unref(client); - - dbus_connection_unref(dbus_conn); - - return status; } diff --git a/client/player.h b/client/player.h new file mode 100644 index 000000000..e7778cb1e --- /dev/null +++ b/client/player.h @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2020 Intel Corporation. All rights reserved. + * + * + */ + +void player_add_submenu(void); +void player_remove_submenu(void); diff --git a/tools/bluetooth-player.c b/tools/bluetooth-player.c index bdfd9aa46..497d975e9 100644 --- a/tools/bluetooth-player.c +++ b/tools/bluetooth-player.c @@ -15,33 +15,29 @@ #define _GNU_SOURCE #include #include +#include #include #include #include +#include #include +#include #include #include "gdbus/gdbus.h" -#include "src/shared/shell.h" -/* String display constants */ -#define COLORED_NEW COLOR_GREEN "NEW" COLOR_OFF -#define COLORED_CHG COLOR_YELLOW "CHG" COLOR_OFF -#define COLORED_DEL COLOR_RED "DEL" COLOR_OFF +#include "lib/bluetooth.h" +#include "lib/uuid.h" + +#include "src/shared/util.h" +#include "src/shared/shell.h" +#include "client/player.h" #define PROMPT_ON COLOR_BLUE "[bluetooth]" COLOR_OFF "# " #define PROMPT_OFF "[bluetooth]# " -#define BLUEZ_MEDIA_PLAYER_INTERFACE "org.bluez.MediaPlayer1" -#define BLUEZ_MEDIA_FOLDER_INTERFACE "org.bluez.MediaFolder1" -#define BLUEZ_MEDIA_ITEM_INTERFACE "org.bluez.MediaItem1" - static DBusConnection *dbus_conn; -static GDBusProxy *default_player; -static GList *players = NULL; -static GList *folders = NULL; -static GList *items = NULL; static void connect_handler(DBusConnection *connection, void *user_data) { @@ -55,1076 +51,29 @@ static void disconnect_handler(DBusConnection *connection, void *user_data) bt_shell_set_prompt(PROMPT_OFF); } -static bool check_default_player(void) -{ - if (!default_player) { - bt_shell_printf("No default player available\n"); - return FALSE; - } - - return TRUE; -} - -static char *generic_generator(const char *text, int state, GList *source) -{ - static int index = 0; - - if (!state) { - index = 0; - } - - return g_dbus_proxy_path_lookup(source, &index, text); -} - -static char *player_generator(const char *text, int state) -{ - return generic_generator(text, state, players); -} - -static char *item_generator(const char *text, int state) -{ - return generic_generator(text, state, items); -} - -static void play_reply(DBusMessage *message, void *user_data) -{ - DBusError error; - - dbus_error_init(&error); - - if (dbus_set_error_from_message(&error, message) == TRUE) { - bt_shell_printf("Failed to play: %s\n", error.name); - dbus_error_free(&error); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Play successful\n"); - - return bt_shell_noninteractive_quit(EXIT_FAILURE); -} - -static void cmd_play(int argc, char *argv[]) -{ - GDBusProxy *proxy; - - if (argc > 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 bt_shell_noninteractive_quit(EXIT_FAILURE); - } - } else { - if (!check_default_player()) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - proxy = default_player; - } - - if (g_dbus_proxy_method_call(proxy, "Play", NULL, play_reply, - NULL, NULL) == FALSE) { - bt_shell_printf("Failed to play\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Attempting to play %s\n", argv[1] ? : ""); -} - -static void pause_reply(DBusMessage *message, void *user_data) -{ - DBusError error; - - dbus_error_init(&error); - - if (dbus_set_error_from_message(&error, message) == TRUE) { - bt_shell_printf("Failed to pause: %s\n", error.name); - dbus_error_free(&error); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Pause successful\n"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void cmd_pause(int argc, char *argv[]) -{ - if (!check_default_player()) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - if (g_dbus_proxy_method_call(default_player, "Pause", NULL, - pause_reply, NULL, NULL) == FALSE) { - bt_shell_printf("Failed to play\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Attempting to pause\n"); -} - -static void stop_reply(DBusMessage *message, void *user_data) -{ - DBusError error; - - dbus_error_init(&error); - - if (dbus_set_error_from_message(&error, message) == TRUE) { - bt_shell_printf("Failed to stop: %s\n", error.name); - dbus_error_free(&error); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Stop successful\n"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void cmd_stop(int argc, char *argv[]) -{ - if (!check_default_player()) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - if (g_dbus_proxy_method_call(default_player, "Stop", NULL, stop_reply, - NULL, NULL) == FALSE) { - bt_shell_printf("Failed to stop\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Attempting to stop\n"); -} - -static void next_reply(DBusMessage *message, void *user_data) -{ - DBusError error; - - dbus_error_init(&error); - - if (dbus_set_error_from_message(&error, message) == TRUE) { - bt_shell_printf("Failed to jump to next: %s\n", error.name); - dbus_error_free(&error); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Next successful\n"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void cmd_next(int argc, char *argv[]) -{ - if (!check_default_player()) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - if (g_dbus_proxy_method_call(default_player, "Next", NULL, next_reply, - NULL, NULL) == FALSE) { - bt_shell_printf("Failed to jump to next\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Attempting to jump to next\n"); -} - -static void previous_reply(DBusMessage *message, void *user_data) -{ - DBusError error; - - dbus_error_init(&error); - - if (dbus_set_error_from_message(&error, message) == TRUE) { - bt_shell_printf("Failed to jump to previous: %s\n", error.name); - dbus_error_free(&error); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Previous successful\n"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void cmd_previous(int argc, char *argv[]) -{ - if (!check_default_player()) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - if (g_dbus_proxy_method_call(default_player, "Previous", NULL, - previous_reply, NULL, NULL) == FALSE) { - bt_shell_printf("Failed to jump to previous\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Attempting to jump to previous\n"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void fast_forward_reply(DBusMessage *message, void *user_data) -{ - DBusError error; - - dbus_error_init(&error); - - if (dbus_set_error_from_message(&error, message) == TRUE) { - bt_shell_printf("Failed to fast forward: %s\n", error.name); - dbus_error_free(&error); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("FastForward successful\n"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void cmd_fast_forward(int argc, char *argv[]) -{ - if (!check_default_player()) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - if (g_dbus_proxy_method_call(default_player, "FastForward", NULL, - fast_forward_reply, NULL, NULL) == FALSE) { - bt_shell_printf("Failed to jump to previous\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Fast forward playback\n"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void rewind_reply(DBusMessage *message, void *user_data) -{ - DBusError error; - - dbus_error_init(&error); - - if (dbus_set_error_from_message(&error, message) == TRUE) { - bt_shell_printf("Failed to rewind: %s\n", error.name); - dbus_error_free(&error); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Rewind successful\n"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void cmd_rewind(int argc, char *argv[]) -{ - if (!check_default_player()) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - if (g_dbus_proxy_method_call(default_player, "Rewind", NULL, - rewind_reply, NULL, NULL) == FALSE) { - bt_shell_printf("Failed to rewind\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Rewind playback\n"); -} - -static void generic_callback(const DBusError *error, void *user_data) -{ - char *str = user_data; - - if (dbus_error_is_set(error)) { - bt_shell_printf("Failed to set %s: %s\n", str, error->name); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } else { - bt_shell_printf("Changing %s succeeded\n", str); - return bt_shell_noninteractive_quit(EXIT_SUCCESS); - } -} - -static void cmd_equalizer(int argc, char *argv[]) -{ - char *value; - DBusMessageIter iter; - - if (!check_default_player()) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - if (!g_dbus_proxy_get_property(default_player, "Equalizer", &iter)) { - bt_shell_printf("Operation not supported\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - value = g_strdup(argv[1]); - - if (g_dbus_proxy_set_property_basic(default_player, "Equalizer", - DBUS_TYPE_STRING, &value, - generic_callback, value, - g_free) == FALSE) { - bt_shell_printf("Failed to setting equalizer\n"); - g_free(value); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Attempting to set equalizer\n"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void cmd_repeat(int argc, char *argv[]) -{ - char *value; - DBusMessageIter iter; - - if (!check_default_player()) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - if (!g_dbus_proxy_get_property(default_player, "Repeat", &iter)) { - bt_shell_printf("Operation not supported\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - value = g_strdup(argv[1]); - - if (g_dbus_proxy_set_property_basic(default_player, "Repeat", - DBUS_TYPE_STRING, &value, - generic_callback, value, - g_free) == FALSE) { - bt_shell_printf("Failed to set repeat\n"); - g_free(value); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Attempting to set repeat\n"); -} - -static void cmd_shuffle(int argc, char *argv[]) -{ - char *value; - DBusMessageIter iter; - - if (!check_default_player()) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - if (!g_dbus_proxy_get_property(default_player, "Shuffle", &iter)) { - bt_shell_printf("Operation not supported\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - value = g_strdup(argv[1]); - - if (g_dbus_proxy_set_property_basic(default_player, "Shuffle", - DBUS_TYPE_STRING, &value, - generic_callback, value, - g_free) == FALSE) { - bt_shell_printf("Failed to set shuffle\n"); - g_free(value); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Attempting to set shuffle\n"); -} - -static void cmd_scan(int argc, char *argv[]) -{ - char *value; - DBusMessageIter iter; - - if (!check_default_player()) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - if (!g_dbus_proxy_get_property(default_player, "Shuffle", &iter)) { - bt_shell_printf("Operation not supported\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - value = g_strdup(argv[1]); - - if (g_dbus_proxy_set_property_basic(default_player, "Shuffle", - DBUS_TYPE_STRING, &value, - generic_callback, value, - g_free) == FALSE) { - bt_shell_printf("Failed to set scan\n"); - g_free(value); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Attempting to set scan\n"); -} - -static char *proxy_description(GDBusProxy *proxy, const char *title, - const char *description) -{ - const char *path; - - path = g_dbus_proxy_get_path(proxy); - - return g_strdup_printf("%s%s%s%s %s ", - description ? "[" : "", - description ? : "", - description ? "] " : "", - title, path); -} - -static void print_player(GDBusProxy *proxy, const char *description) -{ - char *str; - - str = proxy_description(proxy, "Player", description); - - bt_shell_printf("%s%s\n", str, - default_player == proxy ? "[default]" : ""); - - g_free(str); -} - -static void cmd_list(int argc, char *arg[]) -{ - GList *l; - - for (l = players; l; l = g_list_next(l)) { - GDBusProxy *proxy = l->data; - print_player(proxy, NULL); - } - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void print_iter(const char *label, const char *name, - DBusMessageIter *iter) -{ - dbus_bool_t valbool; - dbus_uint32_t valu32; - dbus_uint16_t valu16; - dbus_int16_t vals16; - const char *valstr; - DBusMessageIter subiter; - - if (iter == NULL) { - bt_shell_printf("%s%s is nil\n", label, name); - return; - } - - switch (dbus_message_iter_get_arg_type(iter)) { - case DBUS_TYPE_INVALID: - bt_shell_printf("%s%s is invalid\n", label, name); - break; - case DBUS_TYPE_STRING: - case DBUS_TYPE_OBJECT_PATH: - dbus_message_iter_get_basic(iter, &valstr); - bt_shell_printf("%s%s: %s\n", label, name, valstr); - break; - case DBUS_TYPE_BOOLEAN: - dbus_message_iter_get_basic(iter, &valbool); - bt_shell_printf("%s%s: %s\n", label, name, - valbool == TRUE ? "yes" : "no"); - break; - case DBUS_TYPE_UINT32: - dbus_message_iter_get_basic(iter, &valu32); - bt_shell_printf("%s%s: 0x%06x\n", label, name, valu32); - break; - case DBUS_TYPE_UINT16: - dbus_message_iter_get_basic(iter, &valu16); - bt_shell_printf("%s%s: 0x%04x\n", label, name, valu16); - break; - case DBUS_TYPE_INT16: - dbus_message_iter_get_basic(iter, &vals16); - bt_shell_printf("%s%s: %d\n", label, name, vals16); - break; - case DBUS_TYPE_VARIANT: - dbus_message_iter_recurse(iter, &subiter); - print_iter(label, name, &subiter); - break; - case DBUS_TYPE_ARRAY: - dbus_message_iter_recurse(iter, &subiter); - while (dbus_message_iter_get_arg_type(&subiter) != - DBUS_TYPE_INVALID) { - print_iter(label, name, &subiter); - dbus_message_iter_next(&subiter); - } - break; - case DBUS_TYPE_DICT_ENTRY: - dbus_message_iter_recurse(iter, &subiter); - dbus_message_iter_get_basic(&subiter, &valstr); - dbus_message_iter_next(&subiter); - print_iter(label, valstr, &subiter); - break; - default: - bt_shell_printf("%s%s has unsupported type\n", label, name); - break; - } -} - -static void print_property(GDBusProxy *proxy, const char *name) -{ - DBusMessageIter iter; - - if (g_dbus_proxy_get_property(proxy, name, &iter) == FALSE) - return; - - print_iter("\t", name, &iter); -} - -static void cmd_show_item(int argc, char *argv[]) -{ - GDBusProxy *proxy; - - 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 bt_shell_noninteractive_quit(EXIT_SUCCESS); - } - - bt_shell_printf("Item %s\n", g_dbus_proxy_get_path(proxy)); - - print_property(proxy, "Player"); - print_property(proxy, "Name"); - print_property(proxy, "Type"); - print_property(proxy, "FolderType"); - print_property(proxy, "Playable"); - print_property(proxy, "Metadata"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void cmd_show(int argc, char *argv[]) -{ - GDBusProxy *proxy; - GDBusProxy *folder; - GDBusProxy *item; - DBusMessageIter iter; - const char *path; - - if (argc < 2) { - if (check_default_player() == FALSE) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - proxy = default_player; - } else { - 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 bt_shell_noninteractive_quit(EXIT_FAILURE); - } - } - - bt_shell_printf("Player %s\n", g_dbus_proxy_get_path(proxy)); - - print_property(proxy, "Name"); - print_property(proxy, "Repeat"); - print_property(proxy, "Equalizer"); - print_property(proxy, "Shuffle"); - print_property(proxy, "Scan"); - print_property(proxy, "Status"); - print_property(proxy, "Position"); - print_property(proxy, "Track"); - - folder = g_dbus_proxy_lookup(folders, NULL, - g_dbus_proxy_get_path(proxy), - BLUEZ_MEDIA_FOLDER_INTERFACE); - if (folder == NULL) - return bt_shell_noninteractive_quit(EXIT_SUCCESS); - - bt_shell_printf("Folder %s\n", g_dbus_proxy_get_path(proxy)); - - print_property(folder, "Name"); - print_property(folder, "NumberOfItems"); - - if (!g_dbus_proxy_get_property(proxy, "Playlist", &iter)) - return bt_shell_noninteractive_quit(EXIT_SUCCESS); - - dbus_message_iter_get_basic(&iter, &path); - - item = g_dbus_proxy_lookup(items, NULL, path, - BLUEZ_MEDIA_ITEM_INTERFACE); - if (item == NULL) - return bt_shell_noninteractive_quit(EXIT_SUCCESS); - - bt_shell_printf("Playlist %s\n", path); - - print_property(item, "Name"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void cmd_select(int argc, char *argv[]) -{ - GDBusProxy *proxy; - - 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 bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - if (default_player == proxy) - return bt_shell_noninteractive_quit(EXIT_SUCCESS); - - default_player = proxy, - print_player(proxy, NULL); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void change_folder_reply(DBusMessage *message, void *user_data) -{ - DBusError error; - - dbus_error_init(&error); - - if (dbus_set_error_from_message(&error, message) == TRUE) { - bt_shell_printf("Failed to change folder: %s\n", error.name); - dbus_error_free(&error); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("ChangeFolder successful\n"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void change_folder_setup(DBusMessageIter *iter, void *user_data) -{ - const char *path = user_data; - - dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &path); -} - -static void cmd_change_folder(int argc, char *argv[]) -{ - GDBusProxy *proxy; - - if (dbus_validate_path(argv[1], NULL) == FALSE) { - bt_shell_printf("Not a valid path\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - if (check_default_player() == FALSE) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - 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 bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - if (g_dbus_proxy_method_call(proxy, "ChangeFolder", change_folder_setup, - change_folder_reply, argv[1], NULL) == FALSE) { - bt_shell_printf("Failed to change current folder\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Attempting to change folder\n"); -} - -struct list_items_args { - int start; - int end; -}; - -static void list_items_setup(DBusMessageIter *iter, void *user_data) -{ - struct list_items_args *args = user_data; - DBusMessageIter dict; - - dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, - DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING - DBUS_TYPE_STRING_AS_STRING - DBUS_TYPE_VARIANT_AS_STRING - DBUS_DICT_ENTRY_END_CHAR_AS_STRING, - &dict); - - if (args->start < 0) - goto done; - - g_dbus_dict_append_entry(&dict, "Start", - DBUS_TYPE_UINT32, &args->start); - - if (args->end < 0) - goto done; - - g_dbus_dict_append_entry(&dict, "End", DBUS_TYPE_UINT32, &args->end); - -done: - dbus_message_iter_close_container(iter, &dict); -} - -static void list_items_reply(DBusMessage *message, void *user_data) -{ - DBusError error; - - dbus_error_init(&error); - - if (dbus_set_error_from_message(&error, message) == TRUE) { - bt_shell_printf("Failed to list items: %s\n", error.name); - dbus_error_free(&error); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("ListItems successful\n"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void cmd_list_items(int argc, char *argv[]) -{ - GDBusProxy *proxy; - struct list_items_args *args; - - if (check_default_player() == FALSE) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - 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 bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - args = g_new0(struct list_items_args, 1); - args->start = -1; - args->end = -1; - - if (argc < 2) - goto done; - - errno = 0; - args->start = strtol(argv[1], NULL, 10); - if (errno != 0) { - bt_shell_printf("%s(%d)\n", strerror(errno), errno); - g_free(args); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - if (argc < 3) - goto done; - - errno = 0; - args->end = strtol(argv[2], NULL, 10); - if (errno != 0) { - bt_shell_printf("%s(%d)\n", strerror(errno), errno); - g_free(args); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - -done: - if (g_dbus_proxy_method_call(proxy, "ListItems", list_items_setup, - list_items_reply, args, g_free) == FALSE) { - bt_shell_printf("Failed to change current folder\n"); - g_free(args); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Attempting to list items\n"); -} - -static void search_setup(DBusMessageIter *iter, void *user_data) -{ - char *string = user_data; - DBusMessageIter dict; - - dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &string); - - dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, - DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING - DBUS_TYPE_STRING_AS_STRING - DBUS_TYPE_VARIANT_AS_STRING - DBUS_DICT_ENTRY_END_CHAR_AS_STRING, - &dict); - - dbus_message_iter_close_container(iter, &dict); -} - -static void search_reply(DBusMessage *message, void *user_data) -{ - DBusError error; - - dbus_error_init(&error); - - if (dbus_set_error_from_message(&error, message) == TRUE) { - bt_shell_printf("Failed to search: %s\n", error.name); - dbus_error_free(&error); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Search successful\n"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void cmd_search(int argc, char *argv[]) -{ - GDBusProxy *proxy; - char *string; - - if (check_default_player() == FALSE) - return bt_shell_noninteractive_quit(EXIT_FAILURE); - - 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 bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - string = g_strdup(argv[1]); - - if (g_dbus_proxy_method_call(proxy, "Search", search_setup, - search_reply, string, g_free) == FALSE) { - bt_shell_printf("Failed to search\n"); - g_free(string); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Attempting to search\n"); -} - -static void add_to_nowplaying_reply(DBusMessage *message, void *user_data) -{ - DBusError error; - - dbus_error_init(&error); - - if (dbus_set_error_from_message(&error, message) == TRUE) { - bt_shell_printf("Failed to queue: %s\n", error.name); - dbus_error_free(&error); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("AddToNowPlaying successful\n"); - - return bt_shell_noninteractive_quit(EXIT_SUCCESS); -} - -static void cmd_queue(int argc, char *argv[]) -{ - GDBusProxy *proxy; - - 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 bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - if (g_dbus_proxy_method_call(proxy, "AddtoNowPlaying", NULL, - add_to_nowplaying_reply, NULL, - NULL) == FALSE) { - bt_shell_printf("Failed to play\n"); - return bt_shell_noninteractive_quit(EXIT_FAILURE); - } - - bt_shell_printf("Attempting to queue %s\n", argv[1]); -} - -static const struct bt_shell_menu main_menu = { - .name = "main", - .entries = { - { "list", NULL, cmd_list, "List available players" }, - { "show", "[player]", cmd_show, "Player information", - player_generator}, - { "select", "", cmd_select, "Select default player", - player_generator}, - { "play", "[item]", cmd_play, "Start playback", - item_generator}, - { "pause", NULL, cmd_pause, "Pause playback" }, - { "stop", NULL, cmd_stop, "Stop playback" }, - { "next", NULL, cmd_next, "Jump to next item" }, - { "previous", NULL, cmd_previous, "Jump to previous item" }, - { "fast-forward", NULL, cmd_fast_forward, - "Fast forward playback" }, - { "rewind", NULL, cmd_rewind, "Rewind playback" }, - { "equalizer", "", cmd_equalizer, - "Enable/Disable equalizer"}, - { "repeat", "", cmd_repeat, - "Set repeat mode"}, - { "shuffle", "", cmd_shuffle, - "Set shuffle mode"}, - { "scan", "", cmd_scan, - "Set scan mode"}, - { "change-folder", "", cmd_change_folder, - "Change current folder", - item_generator}, - { "list-items", "[start] [end]", cmd_list_items, - "List items of current folder" }, - { "search", "", cmd_search, - "Search items containing string" }, - { "queue", "", cmd_queue, "Add item to playlist queue", - item_generator}, - { "show-item", "", cmd_show_item, "Show item information", - item_generator}, - {} }, -}; - -static void player_added(GDBusProxy *proxy) -{ - players = g_list_append(players, proxy); - - if (default_player == NULL) - default_player = proxy; - - print_player(proxy, COLORED_NEW); -} - -static void print_folder(GDBusProxy *proxy, const char *description) -{ - const char *path; - - path = g_dbus_proxy_get_path(proxy); - - bt_shell_printf("%s%s%sFolder %s\n", description ? "[" : "", - description ? : "", - description ? "] " : "", - path); -} - -static void folder_added(GDBusProxy *proxy) -{ - folders = g_list_append(folders, proxy); - - print_folder(proxy, COLORED_NEW); -} - -static void print_item(GDBusProxy *proxy, const char *description) -{ - const char *path, *name; - DBusMessageIter iter; - - path = g_dbus_proxy_get_path(proxy); - - if (g_dbus_proxy_get_property(proxy, "Name", &iter)) - dbus_message_iter_get_basic(&iter, &name); - else - name = ""; - - bt_shell_printf("%s%s%sItem %s %s\n", description ? "[" : "", - description ? : "", - description ? "] " : "", - path, name); -} - -static void item_added(GDBusProxy *proxy) -{ - items = g_list_append(items, proxy); - - print_item(proxy, COLORED_NEW); -} - -static void proxy_added(GDBusProxy *proxy, void *user_data) -{ - const char *interface; - - interface = g_dbus_proxy_get_interface(proxy); - - if (!strcmp(interface, BLUEZ_MEDIA_PLAYER_INTERFACE)) - player_added(proxy); - else if (!strcmp(interface, BLUEZ_MEDIA_FOLDER_INTERFACE)) - folder_added(proxy); - else if (!strcmp(interface, BLUEZ_MEDIA_ITEM_INTERFACE)) - item_added(proxy); -} - -static void player_removed(GDBusProxy *proxy) -{ - print_player(proxy, COLORED_DEL); - - if (default_player == proxy) - default_player = NULL; - - players = g_list_remove(players, proxy); -} - -static void folder_removed(GDBusProxy *proxy) -{ - folders = g_list_remove(folders, proxy); - - print_folder(proxy, COLORED_DEL); -} - -static void item_removed(GDBusProxy *proxy) -{ - items = g_list_remove(items, proxy); - - print_item(proxy, COLORED_DEL); -} - -static void proxy_removed(GDBusProxy *proxy, void *user_data) -{ - const char *interface; - - interface = g_dbus_proxy_get_interface(proxy); - - if (!strcmp(interface, BLUEZ_MEDIA_PLAYER_INTERFACE)) - player_removed(proxy); - if (!strcmp(interface, BLUEZ_MEDIA_FOLDER_INTERFACE)) - folder_removed(proxy); - if (!strcmp(interface, BLUEZ_MEDIA_ITEM_INTERFACE)) - item_removed(proxy); -} - -static void player_property_changed(GDBusProxy *proxy, const char *name, - DBusMessageIter *iter) -{ - char *str; - - str = proxy_description(proxy, "Player", COLORED_CHG); - print_iter(str, name, iter); - g_free(str); -} - -static void folder_property_changed(GDBusProxy *proxy, const char *name, - DBusMessageIter *iter) -{ - char *str; - - str = proxy_description(proxy, "Folder", COLORED_CHG); - print_iter(str, name, iter); - g_free(str); -} - -static void item_property_changed(GDBusProxy *proxy, const char *name, - DBusMessageIter *iter) -{ - char *str; - - str = proxy_description(proxy, "Item", COLORED_CHG); - print_iter(str, name, iter); - g_free(str); -} - -static void property_changed(GDBusProxy *proxy, const char *name, - DBusMessageIter *iter, void *user_data) -{ - const char *interface; - - interface = g_dbus_proxy_get_interface(proxy); - - if (!strcmp(interface, BLUEZ_MEDIA_PLAYER_INTERFACE)) - player_property_changed(proxy, name, iter); - else if (!strcmp(interface, BLUEZ_MEDIA_FOLDER_INTERFACE)) - folder_property_changed(proxy, name, iter); - else if (!strcmp(interface, BLUEZ_MEDIA_ITEM_INTERFACE)) - item_property_changed(proxy, name, iter); -} - int main(int argc, char *argv[]) { GDBusClient *client; int status; bt_shell_init(argc, argv, NULL); - bt_shell_set_menu(&main_menu); bt_shell_set_prompt(PROMPT_OFF); dbus_conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL, NULL); + bt_shell_set_env("DBUS_CONNECTION", dbus_conn); + + player_add_submenu(); + client = g_dbus_client_new(dbus_conn, "org.bluez", "/org/bluez"); g_dbus_client_set_connect_watch(client, connect_handler, NULL); g_dbus_client_set_disconnect_watch(client, disconnect_handler, NULL); - g_dbus_client_set_proxy_handlers(client, proxy_added, proxy_removed, - property_changed, NULL); - status = bt_shell_run(); + player_remove_submenu(); + g_dbus_client_unref(client); dbus_connection_unref(dbus_conn);