* Re: [PATCH neard 1/2] build: Use AM_CPPFLAGS instead of INCLUDES
From: Marcel Holtmann @ 2013-01-10 23:54 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: linux-bluetooth, linux-nfc
In-Reply-To: <1357831094-13513-1-git-send-email-lucas.demarchi@profusion.mobi>
Hi Lucas,
> Makefile.am:50: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
> ---
> Makefile.am | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
patch has been applied.
Regards
Marcel
^ permalink raw reply
* Re: [PATCH neard 2/2] build: Do not use deprecated AM_CONFIG_HEADER
From: Marcel Holtmann @ 2013-01-10 23:54 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: linux-bluetooth, linux-nfc
In-Reply-To: <1357831094-13513-2-git-send-email-lucas.demarchi@profusion.mobi>
Hi Lucas,
> The long-obsoleted AM_CONFIG_HEADER macro was removed in automake 1.13.
> Use AC_CONFIG_HEADERS instead.
> ---
> configure.ac | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
patch has been applied.
Regards
Marcel
^ permalink raw reply
* Re: [PATCH BlueZ v2] build: Fix using DBusBasicValue
From: Marcel Holtmann @ 2013-01-10 23:51 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
In-Reply-To: <1357837193-10092-1-git-send-email-luiz.dentz@gmail.com>
Hi Luiz,
> DBusBasicValue needs a more recent libdbus so use const void * instead
> ---
> v2: Fix all places
>
> tools/mpris-player.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
I changed the subject to tools: prefix since this is not build system
details. Otherwise, patch has been applied.
Regards
Marcel
^ permalink raw reply
* Re: [PATCH 8/8] Bluetooth: Fix sending incorrect new_settings for mgmt_set_powered
From: Gustavo Padovan @ 2013-01-10 18:31 UTC (permalink / raw)
To: Johan Hedberg; +Cc: linux-bluetooth
In-Reply-To: <1357738180-4128-9-git-send-email-johan.hedberg@gmail.com>
Hi Johan,
* Johan Hedberg <johan.hedberg@gmail.com> [2013-01-09 15:29:40 +0200]:
> From: Johan Hedberg <johan.hedberg@intel.com>
>
> The socket from which a mgmt_set_powered command was received should
> only receive the command response but no new_settings event.
>
> The mgmt_powered() function which is used to handle the situation with
> the HCI_AUTO_OFF flag tries to check for a pending command to know which
> socket to skip the event for, but since the pending command hasn't been
> added this will not happen.
>
> This patch fixes the issue by adding the pending command for the
> HCI_AUTO_OFF case and thereby ensures that mgmt_powered() will skip the
> right socket when sending the new_settings event, but still send the
> proper response to the socket where the command came from.
>
> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
> ---
> net/bluetooth/mgmt.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
Patch has been applied, thanks.
Gustavo
^ permalink raw reply
* Re: [PATCH 5/8 v2] Bluetooth: Fix returning proper command status for start_discovery
From: Gustavo Padovan @ 2013-01-10 18:30 UTC (permalink / raw)
To: Johan Hedberg; +Cc: linux-bluetooth
In-Reply-To: <1357822449-10727-1-git-send-email-johan.hedberg@gmail.com>
Hi Johan,
* Johan Hedberg <johan.hedberg@gmail.com> [2013-01-10 14:54:09 +0200]:
> From: Johan Hedberg <johan.hedberg@intel.com>
>
> Management commands should whenever possible fail with proper command
> status or command complete events. This patch fixes the
> mgmt_start_discovery command to do this for the failure cases where an
> incorrect parameter value was passed to it ("not supported" if the
> parameter value was valid but the controller doesn't support it and
> "invalid params" if it isn't valid at all).
>
> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
> ---
> v2: Use proposed logic for testing for not supported parameters
>
> net/bluetooth/mgmt.c | 46 ++++++++++++++++++++++++++++++----------------
> 1 file changed, 30 insertions(+), 16 deletions(-)
Patch has been applied. Thanks.
Gustavo
^ permalink raw reply
* [PATCH BlueZ v2] build: Fix using DBusBasicValue
From: Luiz Augusto von Dentz @ 2013-01-10 16:59 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
DBusBasicValue needs a more recent libdbus so use const void * instead
---
v2: Fix all places
tools/mpris-player.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/mpris-player.c b/tools/mpris-player.c
index de66f97..246791a 100644
--- a/tools/mpris-player.c
+++ b/tools/mpris-player.c
@@ -151,7 +151,6 @@ static int parse_metadata_entry(DBusMessageIter *entry, const char *key,
DBusMessageIter *metadata)
{
DBusMessageIter var;
- DBusBasicValue value;
int type;
printf("metadata %s found\n", key);
@@ -181,6 +180,8 @@ static int parse_metadata_entry(DBusMessageIter *entry, const char *key,
dict_append_array(metadata, key, DBUS_TYPE_STRING, &values, i);
dbus_free(values);
} else if (dbus_type_is_basic(type)) {
+ const void *value;
+
dbus_message_iter_get_basic(&var, &value);
dict_append_entry(metadata, key, type, &value);
} else
@@ -312,7 +313,7 @@ static int parse_property(DBusConnection *conn, const char *path,
DBusMessageIter *properties)
{
DBusMessageIter var;
- DBusBasicValue value;
+ const void *value;
int type;
printf("property %s found\n", key);
--
1.8.0.1
^ permalink raw reply related
* Re: [PATCH BlueZ 13/13 v2] tools: Update mpris-player to register using MPRIS interface
From: Luiz Augusto von Dentz @ 2013-01-10 16:56 UTC (permalink / raw)
To: Anderson Lizardo; +Cc: linux-bluetooth@vger.kernel.org
In-Reply-To: <CAJdJm_Nu0Mo7wGYWQr547Mat9hqXyygRbgn23p1QnyY3GrYJnA@mail.gmail.com>
Hi Anderson,
On Thu, Jan 10, 2013 at 6:02 PM, Anderson Lizardo
<anderson.lizardo@openbossa.org> wrote:
> Hi Luiz,
>
> On Thu, Jan 10, 2013 at 9:37 AM, Luiz Augusto von Dentz
> <luiz.dentz@gmail.com> wrote:
>> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>>
>> In addition fix not supporting new APIs for getting the adapter.
>> ---
>
> Got this compilation error after this patch:
>
> CC tools/mpris-player.o
> tools/mpris-player.c: In function ‘parse_metadata_entry’:
> tools/mpris-player.c:154:2: error: unknown type name ‘DBusBasicValue’
> tools/mpris-player.c: In function ‘parse_property’:
> tools/mpris-player.c:315:2: error: unknown type name ‘DBusBasicValue’
Just send a fix for this, can you try and let me know if it fix the problem.
--
Luiz Augusto von Dentz
^ permalink raw reply
* [PATCH BlueZ] build: Fix using DBusBasicValue
From: Luiz Augusto von Dentz @ 2013-01-10 16:55 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
DBusBasicValue needs a more recent libdbus so use const void * instead
---
tools/mpris-player.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/mpris-player.c b/tools/mpris-player.c
index de66f97..bf0f747 100644
--- a/tools/mpris-player.c
+++ b/tools/mpris-player.c
@@ -151,7 +151,6 @@ static int parse_metadata_entry(DBusMessageIter *entry, const char *key,
DBusMessageIter *metadata)
{
DBusMessageIter var;
- DBusBasicValue value;
int type;
printf("metadata %s found\n", key);
@@ -181,6 +180,8 @@ static int parse_metadata_entry(DBusMessageIter *entry, const char *key,
dict_append_array(metadata, key, DBUS_TYPE_STRING, &values, i);
dbus_free(values);
} else if (dbus_type_is_basic(type)) {
+ const void *value;
+
dbus_message_iter_get_basic(&var, &value);
dict_append_entry(metadata, key, type, &value);
} else
--
1.8.0.1
^ permalink raw reply related
* Re: [PATCH 5/8 v2] Bluetooth: Fix returning proper command status for start_discovery
From: Marcel Holtmann @ 2013-01-10 16:24 UTC (permalink / raw)
To: Johan Hedberg; +Cc: linux-bluetooth
In-Reply-To: <1357822449-10727-1-git-send-email-johan.hedberg@gmail.com>
Hi Johan,
> Management commands should whenever possible fail with proper command
> status or command complete events. This patch fixes the
> mgmt_start_discovery command to do this for the failure cases where an
> incorrect parameter value was passed to it ("not supported" if the
> parameter value was valid but the controller doesn't support it and
> "invalid params" if it isn't valid at all).
>
> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
> ---
> v2: Use proposed logic for testing for not supported parameters
>
> net/bluetooth/mgmt.c | 46 ++++++++++++++++++++++++++++++----------------
> 1 file changed, 30 insertions(+), 16 deletions(-)
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Regards
Marcel
^ permalink raw reply
* Re: [PATCH BlueZ 13/13 v2] tools: Update mpris-player to register using MPRIS interface
From: Anderson Lizardo @ 2013-01-10 16:02 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
In-Reply-To: <1357825038-21970-13-git-send-email-luiz.dentz@gmail.com>
Hi Luiz,
On Thu, Jan 10, 2013 at 9:37 AM, Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>
> In addition fix not supporting new APIs for getting the adapter.
> ---
Got this compilation error after this patch:
CC tools/mpris-player.o
tools/mpris-player.c: In function ‘parse_metadata_entry’:
tools/mpris-player.c:154:2: error: unknown type name ‘DBusBasicValue’
tools/mpris-player.c: In function ‘parse_property’:
tools/mpris-player.c:315:2: error: unknown type name ‘DBusBasicValue’
Regards,
--
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil
^ permalink raw reply
* [PATCH neard 2/2] build: Do not use deprecated AM_CONFIG_HEADER
From: Lucas De Marchi @ 2013-01-10 15:18 UTC (permalink / raw)
To: linux-bluetooth, linux-nfc-request; +Cc: Lucas De Marchi
In-Reply-To: <1357831094-13513-1-git-send-email-lucas.demarchi@profusion.mobi>
The long-obsoleted AM_CONFIG_HEADER macro was removed in automake 1.13.
Use AC_CONFIG_HEADERS instead.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 59d9a0a..3109192 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.60)
AC_INIT(neard, 0.8)
AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
--
1.8.1
^ permalink raw reply related
* [PATCH neard 1/2] build: Use AM_CPPFLAGS instead of INCLUDES
From: Lucas De Marchi @ 2013-01-10 15:18 UTC (permalink / raw)
To: linux-bluetooth, linux-nfc-request; +Cc: Lucas De Marchi
Makefile.am:50: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 2dd3517..8c3571e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,7 +47,7 @@ AM_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ @NETLINK_CFLAGS@ $(builtin_cflags) \
-DPLUGINDIR=\""$(plugindir)"\" \
-DCONFIGDIR=\""$(configdir)\""
-INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
+AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
CLEANFILES = src/builtin.h $(local_headers)
--
1.8.1
^ permalink raw reply related
* Re: [PATCH BlueZ 3/3] gitignore: Ignore file generated by Automake 1.13
From: Lucas De Marchi @ 2013-01-10 15:10 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth, Lucas De Marchi
In-Reply-To: <1357277576.19248.130.camel@aeonflux>
On Fri, Jan 4, 2013 at 3:32 AM, Marcel Holtmann <marcel@holtmann.org> wrote:
> Hi Lucas,
>
>> ---
>> .gitignore | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/.gitignore b/.gitignore
>> index 04c9862..619f492 100644
>> --- a/.gitignore
>> +++ b/.gitignore
>> @@ -25,6 +25,7 @@ ltmain.sh
>> missing
>> stamp-h1
>> autom4te.cache
>> +test-driver
>
> no idea what this is. I do not have that. What is it actually.
it seems to be a helper for running tests in parallel. There's this
while configuring:
parallel-tests: installing './test-driver'
Lucas De Marchi
^ permalink raw reply
* Re: [PATCH BlueZ 1/3] build: Do not use deprecated AM_CONFIG_HEADER
From: Lucas De Marchi @ 2013-01-10 14:59 UTC (permalink / raw)
To: Vinicius Costa Gomes; +Cc: linux-bluetooth, Lucas De Marchi
In-Reply-To: <20130110144734.GA25196@samus>
On Thu, Jan 10, 2013 at 12:47 PM, Vinicius Costa Gomes
<vinicius.gomes@openbossa.org> wrote:
> Hi Lucas,
>
> On 23:21 Thu 03 Jan, Lucas De Marchi wrote:
>> From: Lucas De Marchi <lucas.de.marchi@gmail.com>
>>
>> The long-obsoleted AM_CONFIG_HEADER macro was removed in automake 1.13.
>> Use AC_CONFIG_HEADERS instead.
>
> I think oFono and neard are still missing this fix. Would you care to
> send it?
>
Sure. Thanks for the prod.
Lucas De Marchi
^ permalink raw reply
* Re: [PATCH BlueZ 1/3] build: Do not use deprecated AM_CONFIG_HEADER
From: Vinicius Costa Gomes @ 2013-01-10 14:47 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: linux-bluetooth, Lucas De Marchi
In-Reply-To: <1357262465-19231-1-git-send-email-lucas.demarchi@profusion.mobi>
Hi Lucas,
On 23:21 Thu 03 Jan, Lucas De Marchi wrote:
> From: Lucas De Marchi <lucas.de.marchi@gmail.com>
>
> The long-obsoleted AM_CONFIG_HEADER macro was removed in automake 1.13.
> Use AC_CONFIG_HEADERS instead.
I think oFono and neard are still missing this fix. Would you care to
send it?
Cheers,
--
Vinicius
^ permalink raw reply
* [PATCH BlueZ 13/13 v2] tools: Update mpris-player to register using MPRIS interface
From: Luiz Augusto von Dentz @ 2013-01-10 13:37 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1357825038-21970-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
In addition fix not supporting new APIs for getting the adapter.
---
Makefile.tools | 1 +
tools/mpris-player.c | 517 ++++++++++++++++++++++++++-------------------------
2 files changed, 261 insertions(+), 257 deletions(-)
diff --git a/Makefile.tools b/Makefile.tools
index be70f51..bda4465 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -174,6 +174,7 @@ tools_btmgmt_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
tools_btiotest_SOURCES = tools/btiotest.c btio/btio.h btio/btio.c
tools_btiotest_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
+tools_mpris_player_SOURCES = $(gdbus_sources) tools/mpris-player.c
tools_mpris_player_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
EXTRA_DIST += tools/bdaddr.1
diff --git a/tools/mpris-player.c b/tools/mpris-player.c
index fd26101..de66f97 100644
--- a/tools/mpris-player.c
+++ b/tools/mpris-player.c
@@ -35,25 +35,35 @@
#include <dbus/dbus.h>
#include <glib.h>
+#include <gdbus/gdbus.h>
-static volatile sig_atomic_t __io_canceled = 0;
-static volatile sig_atomic_t __io_terminated = 0;
-static char *adapter = "/org/bluez/hci0";
+#define BLUEZ_BUS_NAME "org.bluez"
+#define BLUEZ_PATH "/org/bluez"
+#define BLUEZ_ADAPTER_INTERFACE "org.bluez.Adapter1"
+#define BLUEZ_MEDIA_INTERFACE "org.bluez.Media1"
+#define MPRIS_PLAYER_INTERFACE "org.mpris.MediaPlayer2.Player"
+#define MPRIS_PLAYER_PATH "/org/mpris/MediaPlayer2"
+
+static GMainLoop *main_loop;
+static GDBusProxy *adapter = NULL;
static DBusConnection *sys = NULL;
static DBusConnection *session = NULL;
+static void dict_append_entry(DBusMessageIter *dict, const char *key, int type,
+ void *val);
+
static void sig_term(int sig)
{
- __io_canceled = 1;
+ g_main_loop_quit(main_loop);
}
static DBusMessage *get_all(DBusConnection *conn, const char *name)
{
DBusMessage *msg, *reply;
DBusError err;
- const char *iface = "org.mpris.MediaPlayer2.Player";
+ const char *iface = MPRIS_PLAYER_INTERFACE;
- msg = dbus_message_new_method_call(name, "/org/mpris/MediaPlayer2",
+ msg = dbus_message_new_method_call(name, MPRIS_PLAYER_PATH,
DBUS_INTERFACE_PROPERTIES, "GetAll");
if (!msg) {
fprintf(stderr, "Can't allocate new method call\n");
@@ -70,7 +80,6 @@ static DBusMessage *get_all(DBusConnection *conn, const char *name)
dbus_message_unref(msg);
if (!reply) {
- fprintf(stderr, "Can't get default adapter\n");
if (dbus_error_is_set(&err)) {
fprintf(stderr, "%s\n", err.message);
dbus_error_free(&err);
@@ -93,23 +102,47 @@ static void append_variant(DBusMessageIter *iter, int type, void *val)
dbus_message_iter_close_container(iter, &value);
}
-static void dict_append_entry(DBusMessageIter *dict, const char *key, int type,
- void *val)
+static void append_array_variant(DBusMessageIter *iter, int type, void *val,
+ int n_elements)
{
- DBusMessageIter entry;
-
- if (type == DBUS_TYPE_STRING) {
- const char *str = *((const char **) val);
- if (str == NULL)
- return;
+ DBusMessageIter variant, array;
+ char type_sig[2] = { type, '\0' };
+ char array_sig[3] = { DBUS_TYPE_ARRAY, type, '\0' };
+
+ dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
+ array_sig, &variant);
+
+ dbus_message_iter_open_container(&variant, DBUS_TYPE_ARRAY,
+ type_sig, &array);
+
+ if (dbus_type_is_fixed(type) == TRUE) {
+ dbus_message_iter_append_fixed_array(&array, type, val,
+ n_elements);
+ } else if (type == DBUS_TYPE_STRING || type == DBUS_TYPE_OBJECT_PATH) {
+ const char ***str_array = val;
+ int i;
+
+ for (i = 0; i < n_elements; i++)
+ dbus_message_iter_append_basic(&array, type,
+ &((*str_array)[i]));
}
+ dbus_message_iter_close_container(&variant, &array);
+
+ dbus_message_iter_close_container(iter, &variant);
+}
+
+static void dict_append_array(DBusMessageIter *dict, const char *key, int type,
+ void *val, int n_elements)
+{
+ DBusMessageIter entry;
+
dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
- NULL, &entry);
+ NULL, &entry);
dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
- append_variant(&entry, type, val);
+ append_array_variant(&entry, type, val, n_elements);
dbus_message_iter_close_container(dict, &entry);
}
@@ -118,6 +151,8 @@ static int parse_metadata_entry(DBusMessageIter *entry, const char *key,
DBusMessageIter *metadata)
{
DBusMessageIter var;
+ DBusBasicValue value;
+ int type;
printf("metadata %s found\n", key);
@@ -126,89 +161,35 @@ static int parse_metadata_entry(DBusMessageIter *entry, const char *key,
dbus_message_iter_recurse(entry, &var);
- if (strcasecmp(key, "xesam:title") == 0) {
- const char *value;
-
- if (dbus_message_iter_get_arg_type(&var) !=
- DBUS_TYPE_STRING)
- return -EINVAL;
-
- dbus_message_iter_get_basic(&var, &value);
- dict_append_entry(metadata, "Title", DBUS_TYPE_STRING,
- &value);
- } else if (strcasecmp(key, "xesam:artist") == 0) {
- const char *value;
- DBusMessageIter array;
-
- if (dbus_message_iter_get_arg_type(&var) !=
- DBUS_TYPE_ARRAY)
- return -EINVAL;
-
- dbus_message_iter_recurse(&var, &array);
-
- if (dbus_message_iter_get_arg_type(&array) !=
- DBUS_TYPE_STRING)
- return -EINVAL;
-
- dbus_message_iter_get_basic(&array, &value);
- dict_append_entry(metadata, "Artist", DBUS_TYPE_STRING,
- &value);
- } else if (strcasecmp(key, "xesam:album") == 0) {
- const char *value;
-
- if (dbus_message_iter_get_arg_type(&var) !=
- DBUS_TYPE_STRING)
- return -EINVAL;
-
- dbus_message_iter_get_basic(&var, &value);
- dict_append_entry(metadata, "Album", DBUS_TYPE_STRING,
- &value);
- } else if (strcasecmp(key, "xesam:genre") == 0) {
- const char *value;
+ type = dbus_message_iter_get_arg_type(&var);
+ if (type == DBUS_TYPE_ARRAY) {
+ char **values;
+ int i;
DBusMessageIter array;
- if (dbus_message_iter_get_arg_type(&var) !=
- DBUS_TYPE_ARRAY)
- return -EINVAL;
-
dbus_message_iter_recurse(&var, &array);
- if (dbus_message_iter_get_arg_type(&array) !=
- DBUS_TYPE_STRING)
- return -EINVAL;
-
- dbus_message_iter_get_basic(&array, &value);
- dict_append_entry(metadata, "Genre", DBUS_TYPE_STRING,
- &value);
- } else if (strcasecmp(key, "mpris:length") == 0) {
- int64_t usec, msec;
-
- if (dbus_message_iter_get_arg_type(&var) !=
- DBUS_TYPE_INT64)
- return -EINVAL;
-
- dbus_message_iter_get_basic(&var, &usec);
- msec = usec / 1000;
-
- dict_append_entry(metadata, "Duration", DBUS_TYPE_UINT32,
- &msec);
- } else if (strcasecmp(key, "xesam:trackNumber") == 0) {
- int32_t value;
+ values = dbus_malloc0(sizeof(char *) * 8);
- if (dbus_message_iter_get_arg_type(&var) !=
- DBUS_TYPE_INT32)
- return -EINVAL;
+ i = 0;
+ while (dbus_message_iter_get_arg_type(&array) !=
+ DBUS_TYPE_INVALID) {
+ dbus_message_iter_get_basic(&array, &(values[i++]));
+ dbus_message_iter_next(&array);
+ }
+ dict_append_array(metadata, key, DBUS_TYPE_STRING, &values, i);
+ dbus_free(values);
+ } else if (dbus_type_is_basic(type)) {
dbus_message_iter_get_basic(&var, &value);
-
- dict_append_entry(metadata, "TrackNumber", DBUS_TYPE_UINT32,
- &value);
- }
+ dict_append_entry(metadata, key, type, &value);
+ } else
+ return -EINVAL;
return 0;
}
-static int parse_track(DBusMessageIter *args, DBusMessageIter *metadata)
+static int parse_metadata(DBusMessageIter *args, DBusMessageIter *metadata)
{
DBusMessageIter dict;
int ctype;
@@ -243,7 +224,7 @@ static int parse_track(DBusMessageIter *args, DBusMessageIter *metadata)
return 0;
}
-static void append_track(DBusMessageIter *iter, DBusMessageIter *dict)
+static void append_metadata(DBusMessageIter *iter, DBusMessageIter *dict)
{
DBusMessageIter value, metadata;
@@ -255,12 +236,36 @@ static void append_track(DBusMessageIter *iter, DBusMessageIter *dict)
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &metadata);
- parse_track(dict, &metadata);
+ parse_metadata(dict, &metadata);
dbus_message_iter_close_container(&value, &metadata);
dbus_message_iter_close_container(iter, &value);
}
+static void dict_append_entry(DBusMessageIter *dict, const char *key, int type,
+ void *val)
+{
+ DBusMessageIter entry;
+
+ if (type == DBUS_TYPE_STRING) {
+ const char *str = *((const char **) val);
+ if (str == NULL)
+ return;
+ }
+
+ dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ if (strcasecmp(key, "Metadata") == 0)
+ append_metadata(&entry, val);
+ else
+ append_variant(&entry, type, val);
+
+ dbus_message_iter_close_container(dict, &entry);
+}
+
static dbus_bool_t emit_properties_changed(DBusConnection *conn,
const char *path,
const char *interface,
@@ -268,7 +273,7 @@ static dbus_bool_t emit_properties_changed(DBusConnection *conn,
int type, void *value)
{
DBusMessage *signal;
- DBusMessageIter iter, dict, entry, array;
+ DBusMessageIter iter, dict, array;
dbus_bool_t result;
signal = dbus_message_new_signal(path, DBUS_INTERFACE_PROPERTIES,
@@ -287,16 +292,7 @@ static dbus_bool_t emit_properties_changed(DBusConnection *conn,
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
- dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY, NULL,
- &entry);
- dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &name);
-
- if (strcasecmp(name, "Track") == 0)
- append_track(&entry, value);
- else
- append_variant(&entry, type, value);
-
- dbus_message_iter_close_container(&dict, &entry);
+ dict_append_entry(&dict, name, type, value);
dbus_message_iter_close_container(&iter, &dict);
@@ -316,6 +312,8 @@ static int parse_property(DBusConnection *conn, const char *path,
DBusMessageIter *properties)
{
DBusMessageIter var;
+ DBusBasicValue value;
+ int type;
printf("property %s found\n", key);
@@ -324,65 +322,30 @@ static int parse_property(DBusConnection *conn, const char *path,
dbus_message_iter_recurse(entry, &var);
- if (strcasecmp(key, "PlaybackStatus") == 0) {
- const char *value;
-
- if (dbus_message_iter_get_arg_type(&var) !=
- DBUS_TYPE_STRING)
- return -EINVAL;
-
- dbus_message_iter_get_basic(&var, &value);
-
+ if (strcasecmp(key, "Metadata") == 0) {
if (properties)
- dict_append_entry(properties, "Status",
- DBUS_TYPE_STRING, &value);
+ dict_append_entry(properties, key,
+ DBUS_TYPE_DICT_ENTRY, &var);
else
emit_properties_changed(sys, path,
- "org.bluez.MediaPlayer1", "Status",
- DBUS_TYPE_STRING, &value);
- } else if (strcasecmp(key, "Position") == 0) {
- int64_t usec, msec;
-
- if (dbus_message_iter_get_arg_type(&var) !=
- DBUS_TYPE_INT64)
- return -EINVAL;
+ MPRIS_PLAYER_INTERFACE, key,
+ DBUS_TYPE_DICT_ENTRY, &var);
- dbus_message_iter_get_basic(&var, &usec);
- msec = usec / 1000;
+ return 0;
+ }
- if (properties)
- dict_append_entry(properties, "Position",
- DBUS_TYPE_UINT32, &msec);
- else
- emit_properties_changed(sys, path,
- "org.bluez.MediaPlayer1", "Position",
- DBUS_TYPE_UINT32, &msec);
- } else if (strcasecmp(key, "Shuffle") == 0) {
- dbus_bool_t value;
- const char *str;
-
- if (dbus_message_iter_get_arg_type(&var) !=
- DBUS_TYPE_BOOLEAN)
- return -EINVAL;
+ type = dbus_message_iter_get_arg_type(&var);
+ if (!dbus_type_is_basic(type))
+ return -EINVAL;
- dbus_message_iter_get_basic(&var, &value);
+ dbus_message_iter_get_basic(&var, &value);
- str = value ? "on" : "off";
- if (properties)
- dict_append_entry(properties, "Shuffle",
- DBUS_TYPE_STRING, &str);
- else
- emit_properties_changed(sys, path,
- "org.bluez.MediaPlayer1", "Shuffle",
- DBUS_TYPE_STRING, &str);
- } else if (strcasecmp(key, "Metadata") == 0) {
- if (properties)
- parse_track(&var, properties);
- else
- emit_properties_changed(sys, path,
- "org.bluez.MediaPlayer1", "Track",
- DBUS_TYPE_DICT_ENTRY, &var);
- }
+ if (properties)
+ dict_append_entry(properties, key, type, &value);
+ else
+ emit_properties_changed(sys, path,
+ MPRIS_PLAYER_INTERFACE, key,
+ type, &value);
return 0;
}
@@ -435,12 +398,33 @@ static char *sender2path(const char *sender)
static DBusHandlerResult player_message(DBusConnection *conn,
DBusMessage *msg, void *data)
{
- if (dbus_message_is_method_call(msg, "org.bluez.MediaPlayer1",
- "Release")) {
- printf("Release\n");
- exit(1);
+ char *owner = data;
+ dbus_uint32_t serial;
+ DBusMessage *copy, *reply;
+ DBusError err;
+
+ copy = dbus_message_copy(msg);
+ dbus_message_set_destination(copy, owner);
+ reply = dbus_connection_send_with_reply_and_block(session, copy, -1,
+ &err);
+ if (!reply) {
+ if (dbus_error_is_set(&err)) {
+ fprintf(stderr, "%s\n", err.message);
+ dbus_error_free(&err);
+ }
+ dbus_message_unref(copy);
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
+ dbus_message_unref(copy);
+
+ copy = dbus_message_copy(reply);
+ serial = dbus_message_get_serial(msg);
+ dbus_message_set_serial(copy, serial);
+
+ dbus_message_unref(copy);
+ dbus_message_unref(reply);
+
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
@@ -455,22 +439,28 @@ static void add_player(DBusConnection *conn, const char *name,
DBusMessage *msg;
DBusMessageIter iter, args, properties;
DBusError err;
- char *path;
+ char *path, *owner;
- if (!reply)
+ if (!reply || !adapter)
return;
- msg = dbus_message_new_method_call("org.bluez", adapter,
- "org.bluez.Media1",
+ msg = dbus_message_new_method_call(BLUEZ_BUS_NAME,
+ g_dbus_proxy_get_path(adapter),
+ BLUEZ_MEDIA_INTERFACE,
"RegisterPlayer");
if (!msg) {
fprintf(stderr, "Can't allocate new method call\n");
return;
}
+ path = sender2path(sender);
+ dbus_connection_get_object_path_data(sys, path, (void **) &owner);
+
+ if (owner != NULL)
+ goto done;
+
dbus_message_iter_init_append(msg, &iter);
- path = sender2path(sender);
dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH, &path);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
@@ -489,20 +479,25 @@ static void add_player(DBusConnection *conn, const char *name,
dbus_error_init(&err);
+ owner = strdup(sender);
+
+ if (!dbus_connection_register_object_path(sys, path, &player_table,
+ owner)) {
+ fprintf(stderr, "Can't register object path for player\n");
+ free(owner);
+ goto done;
+ }
+
reply = dbus_connection_send_with_reply_and_block(sys, msg, -1, &err);
if (!reply) {
fprintf(stderr, "Can't register player\n");
+ free(owner);
if (dbus_error_is_set(&err)) {
fprintf(stderr, "%s\n", err.message);
dbus_error_free(&err);
}
- goto done;
}
- if (!dbus_connection_register_object_path(sys, path, &player_table,
- NULL))
- fprintf(stderr, "Can't register object path for agent\n");
-
done:
if (reply)
dbus_message_unref(reply);
@@ -515,8 +510,12 @@ static void remove_player(DBusConnection *conn, const char *sender)
DBusMessage *msg;
char *path;
- msg = dbus_message_new_method_call("org.bluez", adapter,
- "org.bluez.Media1",
+ if (!adapter)
+ return;
+
+ msg = dbus_message_new_method_call(BLUEZ_BUS_NAME,
+ g_dbus_proxy_get_path(adapter),
+ BLUEZ_MEDIA_INTERFACE,
"UnregisterPlayer");
if (!msg) {
fprintf(stderr, "Can't allocate new method call\n");
@@ -529,12 +528,14 @@ static void remove_player(DBusConnection *conn, const char *sender)
dbus_connection_send(sys, msg, NULL);
+ dbus_connection_unregister_object_path(sys, path);
+
dbus_message_unref(msg);
g_free(path);
}
-static DBusHandlerResult properties_changed(DBusConnection *conn,
- DBusMessage *msg)
+static gboolean properties_changed(DBusConnection *conn,
+ DBusMessage *msg, void *user_data)
{
DBusMessageIter iter;
const char *iface;
@@ -556,22 +557,14 @@ static DBusHandlerResult properties_changed(DBusConnection *conn,
g_free(path);
- return DBUS_HANDLER_RESULT_HANDLED;
+ return TRUE;
}
-static DBusHandlerResult session_filter(DBusConnection *conn,
+static gboolean name_owner_changed(DBusConnection *conn,
DBusMessage *msg, void *data)
{
const char *name, *old, *new;
- if (dbus_message_is_signal(msg, DBUS_INTERFACE_PROPERTIES,
- "PropertiesChanged"))
- return properties_changed(conn, msg);
-
- if (!dbus_message_is_signal(msg, DBUS_INTERFACE_DBUS,
- "NameOwnerChanged"))
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
if (!dbus_message_get_args(msg, NULL,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_STRING, &old,
@@ -592,33 +585,7 @@ static DBusHandlerResult session_filter(DBusConnection *conn,
add_player(conn, name, new);
}
- return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusHandlerResult system_filter(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- const char *name, *old, *new;
-
- if (!dbus_message_is_signal(msg, DBUS_INTERFACE_DBUS,
- "NameOwnerChanged"))
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
- if (!dbus_message_get_args(msg, NULL,
- DBUS_TYPE_STRING, &name,
- DBUS_TYPE_STRING, &old,
- DBUS_TYPE_STRING, &new,
- DBUS_TYPE_INVALID)) {
- fprintf(stderr, "Invalid arguments for NameOwnerChanged signal");
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- }
-
- if (!strcmp(name, "org.bluez") && *new == '\0') {
- fprintf(stderr, "bluetoothd disconnected\n");
- __io_terminated = 1;
- }
-
- return DBUS_HANDLER_RESULT_HANDLED;
+ return TRUE;
}
static char *get_name_owner(DBusConnection *conn, const char *name)
@@ -645,7 +612,6 @@ static char *get_name_owner(DBusConnection *conn, const char *name)
dbus_message_unref(msg);
if (!reply) {
- fprintf(stderr, "Can't find adapter %s\n", adapter);
if (dbus_error_is_set(&err)) {
fprintf(stderr, "%s\n", err.message);
dbus_error_free(&err);
@@ -698,6 +664,8 @@ static void parse_list_names(DBusConnection *conn, DBusMessageIter *args)
if (owner == NULL)
goto next;
+ printf("player %s at %s found\n", name, owner);
+
add_player(conn, name, owner);
g_free(owner);
@@ -727,7 +695,6 @@ static void list_names(DBusConnection *conn)
dbus_message_unref(msg);
if (!reply) {
- fprintf(stderr, "Can't find adapter %s\n", adapter);
if (dbus_error_is_set(&err)) {
fprintf(stderr, "%s\n", err.message);
dbus_error_free(&err);
@@ -746,29 +713,71 @@ static void list_names(DBusConnection *conn)
static void usage(void)
{
- printf("Bluetooth player ver %s\n\n", VERSION);
+ printf("Bluetooth mpris-player ver %s\n\n", VERSION);
- printf("Usage:\n"
- "\tplayer [--adapter adapter id]\n"
- "\n");
+ printf("Usage:\n");
}
static struct option main_options[] = {
- { "adapter", 1, 0, 'a' },
{ 0, 0, 0, 0 }
};
+static void connect_handler(DBusConnection *connection, void *user_data)
+{
+ printf("org.bluez appeared\n");
+}
+
+static void disconnect_handler(DBusConnection *connection, void *user_data)
+{
+ printf("org.bluez disappeared\n");
+}
+
+static void proxy_added(GDBusProxy *proxy, void *user_data)
+{
+ const char *interface;
+
+ if (adapter != NULL)
+ return;
+
+ interface = g_dbus_proxy_get_interface(proxy);
+
+ if (!strcmp(interface, BLUEZ_ADAPTER_INTERFACE)) {
+ printf("Bluetooth Adapter %s found\n",
+ g_dbus_proxy_get_path(proxy));
+ adapter = proxy;
+ list_names(session);
+ }
+}
+
+static void proxy_removed(GDBusProxy *proxy, void *user_data)
+{
+ const char *interface;
+
+ if (adapter == NULL)
+ return;
+
+ interface = g_dbus_proxy_get_interface(proxy);
+
+ if (strcmp(interface, BLUEZ_ADAPTER_INTERFACE))
+ return;
+
+ if (adapter != proxy)
+ return;
+
+ printf("Bluetooth Adapter %s removed\n", g_dbus_proxy_get_path(proxy));
+ adapter = NULL;
+}
+
int main(int argc, char *argv[])
{
+ GDBusClient *client;
+ guint owner_watch, properties_watch;
struct sigaction sa;
- char match[128];
int opt;
- while ((opt = getopt_long(argc, argv, "+a,h", main_options, NULL)) != EOF) {
+ while ((opt = getopt_long(argc, argv, "h", main_options,
+ NULL)) != EOF) {
switch(opt) {
- case '1':
- adapter = optarg;
- break;
case 'h':
usage();
exit(0);
@@ -777,48 +786,31 @@ int main(int argc, char *argv[])
}
}
- sys = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
+ main_loop = g_main_loop_new(NULL, FALSE);
+
+ sys = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL, NULL);
if (!sys) {
fprintf(stderr, "Can't get on system bus");
exit(1);
}
- if (!dbus_connection_add_filter(sys, system_filter, NULL, NULL)) {
- fprintf(stderr, "Can't add signal filter");
- exit(1);
- }
-
- snprintf(match, sizeof(match),
- "interface=%s,member=NameOwnerChanged,arg0=%s",
- DBUS_INTERFACE_DBUS, "org.bluez");
-
- dbus_bus_add_match(sys, match, NULL);
-
- session = dbus_bus_get(DBUS_BUS_SESSION, NULL);
+ session = g_dbus_setup_bus(DBUS_BUS_SESSION, NULL, NULL);
if (!session) {
fprintf(stderr, "Can't get on session bus");
exit(1);
}
- if (!dbus_connection_add_filter(session, session_filter, NULL, NULL)) {
- fprintf(stderr, "Can't add signal filter");
- exit(1);
- }
-
- snprintf(match, sizeof(match),
- "interface=%s,member=NameOwnerChanged",
- DBUS_INTERFACE_DBUS);
+ owner_watch = g_dbus_add_signal_watch(session, NULL, NULL,
+ DBUS_INTERFACE_DBUS,
+ "NameOwnerChanged",
+ name_owner_changed,
+ NULL, NULL);
- dbus_bus_add_match(session, match, NULL);
- snprintf(match, sizeof(match),
- "interface=%s,member=PropertiesChanged,arg0=%s",
- DBUS_INTERFACE_PROPERTIES,
- "org.mpris.MediaPlayer2.Player");
-
- list_names(session);
-
- dbus_bus_add_match(session, match, NULL);
+ properties_watch = g_dbus_add_properties_watch(session, NULL, NULL,
+ MPRIS_PLAYER_INTERFACE,
+ properties_changed,
+ NULL, NULL);
memset(&sa, 0, sizeof(sa));
sa.sa_flags = SA_NOCLDSTOP;
@@ -826,14 +818,25 @@ int main(int argc, char *argv[])
sigaction(SIGTERM, &sa, NULL);
sigaction(SIGINT, &sa, NULL);
- while (!__io_canceled && !__io_terminated) {
- if (dbus_connection_read_write_dispatch(sys, 500) != TRUE)
- break;
- if (dbus_connection_read_write_dispatch(session, 500) != TRUE)
- break;
- }
+ client = g_dbus_client_new(sys, BLUEZ_BUS_NAME, BLUEZ_PATH);
+ 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,
+ NULL, NULL);
+
+ g_main_loop_run(main_loop);
+
+ g_dbus_remove_watch(session, owner_watch);
+ g_dbus_remove_watch(session, properties_watch);
+
+ g_dbus_client_unref(client);
+
+ dbus_connection_unref(session);
dbus_connection_unref(sys);
+ g_main_loop_unref(main_loop);
+
return 0;
}
--
1.8.0.1
^ permalink raw reply related
* [PATCH BlueZ 12/13 v2] media: Implement new RegisterPlayer API
From: Luiz Augusto von Dentz @ 2013-01-10 13:37 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1357825038-21970-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
RegisterPlayer now uses MPRIS spec
---
profiles/audio/media.c | 294 ++++++++++++++++++++++++++++++++-----------------
1 file changed, 195 insertions(+), 99 deletions(-)
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index b184f01..4b91656 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -28,6 +28,7 @@
#endif
#include <errno.h>
+#include <inttypes.h>
#include <glib.h>
#include <gdbus/gdbus.h>
@@ -51,7 +52,7 @@
#define MEDIA_INTERFACE "org.bluez.Media1"
#define MEDIA_ENDPOINT_INTERFACE "org.bluez.MediaEndpoint1"
-#define MEDIA_PLAYER_INTERFACE "org.bluez.MediaPlayer1"
+#define MEDIA_PLAYER_INTERFACE "org.mpris.MediaPlayer2.Player"
#define REQUEST_TIMEOUT (3 * 1000) /* 3 seconds */
@@ -1153,17 +1154,18 @@ static gboolean set_status(struct media_player *mp, DBusMessageIter *iter)
static gboolean set_position(struct media_player *mp, DBusMessageIter *iter)
{
- uint32_t value;
+ uint64_t value;
- if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_UINT32)
+ if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_INT64)
return FALSE;
dbus_message_iter_get_basic(iter, &value);
- DBG("Position=%u", value);
- mp->position = value;
+ mp->position = value / 1000;
g_timer_start(mp->timer);
+ DBG("Position=%u", mp->position);
+
if (!mp->position) {
avrcp_player_event(mp->player,
AVRCP_EVENT_TRACK_REACHED_START, NULL);
@@ -1181,12 +1183,98 @@ static gboolean set_position(struct media_player *mp, DBusMessageIter *iter)
return TRUE;
}
+static void set_metadata(struct media_player *mp, const char *key,
+ const char *value)
+{
+ DBG("%s=%s", key, value);
+ g_hash_table_replace(mp->track, g_strdup(key), g_strdup(value));
+}
+
+static gboolean parse_string_metadata(struct media_player *mp, const char *key,
+ DBusMessageIter *iter)
+{
+ const char *value;
+
+ if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_STRING)
+ return FALSE;
+
+ dbus_message_iter_get_basic(iter, &value);
+
+ set_metadata(mp, key, value);
+
+ return TRUE;
+}
+
+static gboolean parse_array_metadata(struct media_player *mp, const char *key,
+ DBusMessageIter *iter)
+{
+ DBusMessageIter array;
+ const char *value;
+
+ if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY)
+ return FALSE;
+
+ dbus_message_iter_recurse(iter, &array);
+
+ if (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_INVALID)
+ return TRUE;
+
+ if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_STRING)
+ return FALSE;
+
+ dbus_message_iter_get_basic(&array, &value);
+
+ set_metadata(mp, key, value);
+
+ return TRUE;
+}
+
+static gboolean parse_int64_metadata(struct media_player *mp, const char *key,
+ DBusMessageIter *iter)
+{
+ uint64_t value;
+ char valstr[20];
+
+ if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_INT64)
+ return FALSE;
+
+ dbus_message_iter_get_basic(iter, &value);
+
+ if (strcasecmp(key, "Duration") == 0) {
+ value /= 1000;
+ mp->duration = value;
+ }
+
+ snprintf(valstr, 20, "%" PRIu64, value);
+
+ set_metadata(mp, key, valstr);
+
+ return TRUE;
+}
+
+static gboolean parse_int32_metadata(struct media_player *mp, const char *key,
+ DBusMessageIter *iter)
+{
+ uint32_t value;
+ char valstr[20];
+
+ if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_INT32)
+ return FALSE;
+
+ dbus_message_iter_get_basic(iter, &value);
+
+ snprintf(valstr, 20, "%u", value);
+
+ set_metadata(mp, key, valstr);
+
+ return TRUE;
+}
+
static gboolean parse_player_metadata(struct media_player *mp,
DBusMessageIter *iter)
{
DBusMessageIter dict;
DBusMessageIter var;
- GHashTable *track;
int ctype;
gboolean title = FALSE;
uint64_t uid;
@@ -1197,155 +1285,163 @@ static gboolean parse_player_metadata(struct media_player *mp,
dbus_message_iter_recurse(iter, &dict);
- track = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+ if (mp->track != NULL)
+ g_hash_table_unref(mp->track);
+
+ mp->track = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
g_free);
while ((ctype = dbus_message_iter_get_arg_type(&dict)) !=
DBUS_TYPE_INVALID) {
DBusMessageIter entry;
const char *key;
- const char *string;
- char valstr[20];
- char *value;
- uint32_t num;
- int type;
if (ctype != DBUS_TYPE_DICT_ENTRY)
- goto parse_error;
+ return FALSE;
dbus_message_iter_recurse(&dict, &entry);
if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING)
- goto parse_error;
+ return FALSE;
dbus_message_iter_get_basic(&entry, &key);
dbus_message_iter_next(&entry);
if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_VARIANT)
- goto parse_error;
+ return FALSE;
dbus_message_iter_recurse(&entry, &var);
- type = dbus_message_iter_get_arg_type(&var);
-
- if (strcasecmp(key, "Title") == 0) {
- if (type != DBUS_TYPE_STRING)
- goto parse_error;
+ if (strcasecmp(key, "xesam:title") == 0) {
+ if (!parse_string_metadata(mp, "Title", &var))
+ return FALSE;
title = TRUE;
- dbus_message_iter_get_basic(&var, &string);
- } else if (strcasecmp(key, "Artist") == 0) {
- if (type != DBUS_TYPE_STRING)
- goto parse_error;
-
- dbus_message_iter_get_basic(&var, &string);
- } else if (strcasecmp(key, "Album") == 0) {
- if (type != DBUS_TYPE_STRING)
- goto parse_error;
-
- dbus_message_iter_get_basic(&var, &string);
- } else if (strcasecmp(key, "Genre") == 0) {
- if (type != DBUS_TYPE_STRING)
- goto parse_error;
-
- dbus_message_iter_get_basic(&var, &string);
- } else if (strcasecmp(key, "Duration") == 0) {
- if (type != DBUS_TYPE_UINT32)
- goto parse_error;
-
- dbus_message_iter_get_basic(&var, &num);
- mp->duration = num;
- } else if (strcasecmp(key, "TrackNumber") == 0) {
- if (type != DBUS_TYPE_UINT32)
- goto parse_error;
-
- dbus_message_iter_get_basic(&var, &num);
- } else if (strcasecmp(key, "NumberOfTracks") == 0) {
- if (type != DBUS_TYPE_UINT32)
- goto parse_error;
-
- dbus_message_iter_get_basic(&var, &num);
+ } else if (strcasecmp(key, "xesam:artist") == 0) {
+ if (!parse_array_metadata(mp, "Artist", &var))
+ return FALSE;
+ } else if (strcasecmp(key, "xesam:album") == 0) {
+ if (!parse_string_metadata(mp, "Album", &var))
+ return FALSE;
+ } else if (strcasecmp(key, "xesam:genre") == 0) {
+ if (!parse_array_metadata(mp, "Genre", &var))
+ return FALSE;
+ } else if (strcasecmp(key, "mpris:length") == 0) {
+ if (!parse_int64_metadata(mp, "Duration", &var))
+ return FALSE;
+ } else if (strcasecmp(key, "xesam:trackNumber") == 0) {
+ if (!parse_int32_metadata(mp, "TrackNumber", &var))
+ return FALSE;
} else
- goto parse_error;
-
- switch (type) {
- case DBUS_TYPE_STRING:
- value = g_strdup(string);
- break;
- default:
- snprintf(valstr, 20, "%u", num);
- value = g_strdup(valstr);
- }
+ DBG("%s not supported, ignoring", key);
- DBG("%s=%s", key, value);
- g_hash_table_replace(track, g_strdup(key), value);
dbus_message_iter_next(&dict);
}
- if (g_hash_table_size(track) == 0) {
- g_hash_table_unref(track);
- track = NULL;
- } else if (title == FALSE)
- g_hash_table_insert(track, g_strdup("Title"), g_strdup(""));
+ if (title == FALSE)
+ g_hash_table_insert(mp->track, g_strdup("Title"),
+ g_strdup(""));
- if (mp->track != NULL)
- g_hash_table_unref(mp->track);
-
- mp->track = track;
mp->position = 0;
g_timer_start(mp->timer);
uid = get_uid(mp);
avrcp_player_event(mp->player, AVRCP_EVENT_TRACK_CHANGED, &uid);
- avrcp_player_event(mp->player, AVRCP_EVENT_TRACK_REACHED_START,
- NULL);
+ avrcp_player_event(mp->player, AVRCP_EVENT_TRACK_REACHED_START, NULL);
return TRUE;
+}
+
+static gboolean set_property(struct media_player *mp, const char *key,
+ const char *value)
+{
+ const char *curval;
+ GList *settings;
+
+ curval = g_hash_table_lookup(mp->settings, key);
+ if (g_strcmp0(curval, value) == 0)
+ return TRUE;
+
+ DBG("%s=%s", key, value);
+
+ g_hash_table_replace(mp->settings, g_strdup(key), g_strdup(value));
+
+ settings = list_settings(mp);
+
+ avrcp_player_event(mp->player, AVRCP_EVENT_SETTINGS_CHANGED, settings);
+
+ g_list_free(settings);
+
+ return TRUE;
+}
+
+static gboolean set_shuffle(struct media_player *mp, DBusMessageIter *iter)
+{
+ dbus_bool_t value;
+ const char *strvalue;
+
+ if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_BOOLEAN)
+ return FALSE;
+
+ dbus_message_iter_get_basic(iter, &value);
-parse_error:
- if (track)
- g_hash_table_unref(track);
+ strvalue = value ? "alltracks" : "off";
- return FALSE;
+ return set_property(mp, "Shuffle", strvalue);
+}
+
+static const char *loop_status_to_repeat(const char *value)
+{
+ if (strcasecmp(value, "None") == 0)
+ return "off";
+ else if (strcasecmp(value, "Track") == 0)
+ return "singletrack";
+ else if (strcasecmp(value, "Track") == 0)
+ return "alltracks";
+
+ return NULL;
+}
+
+static gboolean set_repeat(struct media_player *mp, DBusMessageIter *iter)
+{
+ const char *value;
+
+ if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_STRING)
+ return FALSE;
+
+ dbus_message_iter_get_basic(iter, &value);
+
+ value = loop_status_to_repeat(value);
+ if (value == NULL)
+ return FALSE;
+
+ return set_property(mp, "Repeat", value);
}
static gboolean set_player_property(struct media_player *mp, const char *key,
DBusMessageIter *entry)
{
DBusMessageIter var;
- const char *value, *curval;
- GList *settings;
if (dbus_message_iter_get_arg_type(entry) != DBUS_TYPE_VARIANT)
return FALSE;
dbus_message_iter_recurse(entry, &var);
- if (strcasecmp(key, "Status") == 0)
+ if (strcasecmp(key, "PlaybackStatus") == 0)
return set_status(mp, &var);
if (strcasecmp(key, "Position") == 0)
return set_position(mp, &var);
- if (strcasecmp(key, "Track") == 0)
+ if (strcasecmp(key, "Metadata") == 0)
return parse_player_metadata(mp, &var);
- if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_STRING)
- return FALSE;
-
- dbus_message_iter_get_basic(&var, &value);
-
- curval = g_hash_table_lookup(mp->settings, key);
- if (g_strcmp0(curval, value) == 0)
- return TRUE;
-
- DBG("%s=%s", key, value);
-
- g_hash_table_replace(mp->settings, g_strdup(key), g_strdup(value));
-
- settings = list_settings(mp);
+ if (strcasecmp(key, "Shuffle") == 0)
+ return set_shuffle(mp, &var);
- avrcp_player_event(mp->player, AVRCP_EVENT_SETTINGS_CHANGED, settings);
+ if (strcasecmp(key, "LoopStatus") == 0)
+ return set_repeat(mp, &var);
- g_list_free(settings);
+ DBG("%s not supported, ignoring", key);
return TRUE;
}
--
1.8.0.1
^ permalink raw reply related
* [PATCH BlueZ 11/13 v2] test: Update test-player to register using MPRIS interface
From: Luiz Augusto von Dentz @ 2013-01-10 13:37 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1357825038-21970-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
test/simple-player | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/test/simple-player b/test/simple-player
index e331c52..01bec06 100755
--- a/test/simple-player
+++ b/test/simple-player
@@ -29,23 +29,30 @@ class Player(dbus.service.Object):
signal_name = "PropertiesChanged")
else:
track = dbus.Dictionary({
- "Title" : "Title",
- "Artist" : "Artist",
- "Album" : "Album",
- "Genre" : "Genre",
- "NumberOfTracks" : dbus.UInt32(10),
- "TrackNumber" : dbus.UInt32(1),
- "Duration" : dbus.UInt32(10000) },
+ "xesam:title" : "Title",
+ "xesam:artist" : "Artist",
+ "xesam:album" : "Album",
+ "xesam:genre" : "Genre",
+ "xesam:trackNumber" : dbus.Int32(1),
+ "mpris:length" : dbus.Int64(10000) },
signature="sv")
self.properties = dbus.Dictionary({
- "Equalizer" : "off",
- "Repeat" : "off",
- "Shuffle" : "off",
- "Scan" : "off",
- "Status" : "playing",
+ "PlaybackStatus" : "playing",
+ "LoopStatus" : "None",
+ "Rate" : dbus.Double(1.0),
+ "Shuffle" : dbus.Boolean(False),
+ "Metadata" : track,
+ "Volume" : dbus.Double(1.0),
"Position" : dbus.UInt32(0),
- "Track" : track },
+ "MinimumRate" : dbus.Double(1.0),
+ "MaximumRate" : dbus.Double(1.0),
+ "CanGoNext" : dbus.Boolean(False),
+ "CanGoPrevious" : dbus.Boolean(False),
+ "CanPlay" : dbus.Boolean(False),
+ "CanSeek" : dbus.Boolean(False),
+ "CanControl" : dbus.Boolean(False),
+ },
signature="sv")
handler = InputHandler(self)
@@ -87,7 +94,7 @@ class InputHandler:
print('\t', cmd, self.commands[cmd], sep='')
print("\nUse python syntax to pass arguments to available methods.\n" \
- "E.g.: PropertiesChanged({'Track' : {'Title': 'My title', \
+ "E.g.: PropertiesChanged({'Metadata' : {'Title': 'My title', \
'Album': 'my album' }})")
self.prompt()
--
1.8.0.1
^ permalink raw reply related
* [PATCH BlueZ 10/13 v2] media-api: Change RegisterPlayer to use MPRIS spec
From: Luiz Augusto von Dentz @ 2013-01-10 13:37 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1357825038-21970-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
RegisterPlayer now expect registered paths to implement
org.mpris.MediaPlayer2.player interface accourding to MPRIS spec:
http://specifications.freedesktop.org/mpris-spec/latest/
---
doc/media-api.txt | 70 ++++---------------------------------------------------
1 file changed, 5 insertions(+), 65 deletions(-)
diff --git a/doc/media-api.txt b/doc/media-api.txt
index c9c2e7a..8c64520 100644
--- a/doc/media-api.txt
+++ b/doc/media-api.txt
@@ -45,78 +45,18 @@ Methods void RegisterEndpoint(object endpoint, dict properties)
Unregister sender end point.
- void RegisterPlayer(object player, dict properties,
- dict metadata)
+ void RegisterPlayer(object player, dict properties)
Register a media player object to sender, the sender
can register as many objects as it likes.
+ Object must implement at least
+ org.mpris.MediaPlayer2.Player as defined in MPRIS 2.2
+ spec.
+
Note: If the sender disconnects its objects are
automatically unregistered.
- Properties:
-
- string Equalizer:
-
- Possible values: "off" or "on"
-
- string Repeat:
-
- Possible values: "off", "singletrack",
- "alltracks" or "group"
-
- string Shuffle:
-
- Possible values: "off", "alltracks" or
- "group"
-
- string Scan:
-
- Possible values: "off", "alltracks" or
- "group"
-
- string Status:
-
- Possible values: "playing", "stopped",
- "paused",
- "forward-seek",
- "reverse-seek" or
- "error"
-
- uint32 Position
-
- Playback position in milliseconds
-
- Metadata:
-
- string Title:
-
- Track title name
-
- string Artist:
-
- Track artist name
-
- string Album:
-
- Track album name
-
- string Genre:
-
- Track genre name
-
- uint32 NumberOfTracks:
-
- Number of tracks in total
-
- uint32 Number:
-
- Track number
-
- uint32 Duration:
-
- Track duration in milliseconds
-
Possible Errors: org.bluez.Error.InvalidArguments
org.bluez.Error.NotSupported
--
1.8.0.1
^ permalink raw reply related
* [PATCH BlueZ 09/13 v2] tools: Adapt mpris-player to new API of MediaPlayer1
From: Luiz Augusto von Dentz @ 2013-01-10 13:37 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1357825038-21970-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
In addition fix using Manager1 interface which no longer exists
---
tools/mpris-player.c | 482 +++++++++++++++++----------------------------------
1 file changed, 157 insertions(+), 325 deletions(-)
diff --git a/tools/mpris-player.c b/tools/mpris-player.c
index 90c87aa..fd26101 100644
--- a/tools/mpris-player.c
+++ b/tools/mpris-player.c
@@ -38,7 +38,7 @@
static volatile sig_atomic_t __io_canceled = 0;
static volatile sig_atomic_t __io_terminated = 0;
-static char *adapter = NULL;
+static char *adapter = "/org/bluez/hci0";
static DBusConnection *sys = NULL;
static DBusConnection *session = NULL;
@@ -114,157 +114,6 @@ static void dict_append_entry(DBusMessageIter *dict, const char *key, int type,
dbus_message_iter_close_container(dict, &entry);
}
-static dbus_bool_t emit_properties_changed(DBusConnection *conn,
- const char *path,
- const char *interface,
- const char *name,
- int type, void *value)
-{
- DBusMessage *signal;
- DBusMessageIter iter, dict, entry, array;
- dbus_bool_t result;
-
- signal = dbus_message_new_signal(path, DBUS_INTERFACE_PROPERTIES,
- "PropertiesChanged");
-
- if (!signal) {
- fprintf(stderr, "Unable to allocate new %s.PropertyChanged"
- " signal", interface);
- return FALSE;
- }
-
- dbus_message_iter_init_append(signal, &iter);
- dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &interface);
- 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_open_container(&dict, DBUS_TYPE_DICT_ENTRY, NULL,
- &entry);
- dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &name);
- append_variant(&entry, type, value);
- dbus_message_iter_close_container(&dict, &entry);
-
- dbus_message_iter_close_container(&iter, &dict);
-
- dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
- DBUS_TYPE_STRING_AS_STRING, &array);
- dbus_message_iter_close_container(&iter, &array);
-
- result = dbus_connection_send(conn, signal, NULL);
- dbus_message_unref(signal);
-
- return result;
-}
-
-static int parse_property(DBusConnection *conn, const char *path,
- const char *key,
- DBusMessageIter *entry,
- DBusMessageIter *properties)
-{
- DBusMessageIter var;
-
- printf("property %s found\n", key);
-
- if (dbus_message_iter_get_arg_type(entry) != DBUS_TYPE_VARIANT)
- return -EINVAL;
-
- dbus_message_iter_recurse(entry, &var);
-
- if (strcasecmp(key, "PlaybackStatus") == 0) {
- const char *value;
-
- if (dbus_message_iter_get_arg_type(&var) !=
- DBUS_TYPE_STRING)
- return -EINVAL;
-
- dbus_message_iter_get_basic(&var, &value);
-
- if (properties)
- dict_append_entry(properties, "Status",
- DBUS_TYPE_STRING, &value);
- else
- emit_properties_changed(sys, path,
- "org.bluez.MediaPlayer1", "Status",
- DBUS_TYPE_STRING, &value);
- } else if (strcasecmp(key, "Position") == 0) {
- int64_t usec, msec;
-
- if (dbus_message_iter_get_arg_type(&var) !=
- DBUS_TYPE_INT64)
- return -EINVAL;
-
- dbus_message_iter_get_basic(&var, &usec);
- msec = usec / 1000;
-
- if (properties)
- dict_append_entry(properties, "Position",
- DBUS_TYPE_UINT32, &msec);
- else
- emit_properties_changed(sys, path,
- "org.bluez.MediaPlayer1", "Position",
- DBUS_TYPE_UINT32, &msec);
- } else if (strcasecmp(key, "Shuffle") == 0) {
- dbus_bool_t value;
- const char *str;
-
- if (dbus_message_iter_get_arg_type(&var) !=
- DBUS_TYPE_BOOLEAN)
- return -EINVAL;
-
- dbus_message_iter_get_basic(&var, &value);
-
- str = value ? "on" : "off";
- if (properties)
- dict_append_entry(properties, "Shuffle",
- DBUS_TYPE_STRING, &str);
- else
- emit_properties_changed(sys, path,
- "org.bluez.MediaPlayer1", "Shuffle",
- DBUS_TYPE_STRING, &str);
- }
-
- return 0;
-}
-
-static int parse_properties(DBusConnection *conn, const char *path,
- DBusMessageIter *args,
- DBusMessageIter *properties)
-{
- DBusMessageIter dict;
- int ctype;
-
- ctype = dbus_message_iter_get_arg_type(args);
- if (ctype != DBUS_TYPE_ARRAY)
- return -EINVAL;
-
- dbus_message_iter_recurse(args, &dict);
-
- while ((ctype = dbus_message_iter_get_arg_type(&dict)) !=
- DBUS_TYPE_INVALID) {
- DBusMessageIter entry;
- const char *key;
-
- if (ctype != DBUS_TYPE_DICT_ENTRY)
- return -EINVAL;
-
- dbus_message_iter_recurse(&dict, &entry);
- if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING)
- return -EINVAL;
-
- dbus_message_iter_get_basic(&entry, &key);
- dbus_message_iter_next(&entry);
-
- if (parse_property(conn, path, key, &entry, properties) < 0)
- return -EINVAL;
-
- dbus_message_iter_next(&dict);
- }
-
- return 0;
-}
-
static int parse_metadata_entry(DBusMessageIter *entry, const char *key,
DBusMessageIter *metadata)
{
@@ -352,7 +201,7 @@ static int parse_metadata_entry(DBusMessageIter *entry, const char *key,
dbus_message_iter_get_basic(&var, &value);
- dict_append_entry(metadata, "Track", DBUS_TYPE_UINT32,
+ dict_append_entry(metadata, "TrackNumber", DBUS_TYPE_UINT32,
&value);
}
@@ -361,20 +210,14 @@ static int parse_metadata_entry(DBusMessageIter *entry, const char *key,
static int parse_track(DBusMessageIter *args, DBusMessageIter *metadata)
{
- DBusMessageIter var, dict;
+ DBusMessageIter dict;
int ctype;
ctype = dbus_message_iter_get_arg_type(args);
- if (ctype != DBUS_TYPE_VARIANT)
- return -EINVAL;
-
- dbus_message_iter_recurse(args, &var);
-
- ctype = dbus_message_iter_get_arg_type(&var);
if (ctype != DBUS_TYPE_ARRAY)
return -EINVAL;
- dbus_message_iter_recurse(&var, &dict);
+ dbus_message_iter_recurse(args, &dict);
while ((ctype = dbus_message_iter_get_arg_type(&dict)) !=
DBUS_TYPE_INVALID) {
@@ -400,7 +243,153 @@ static int parse_track(DBusMessageIter *args, DBusMessageIter *metadata)
return 0;
}
-static int parse_metadata(DBusMessageIter *args, DBusMessageIter *metadata)
+static void append_track(DBusMessageIter *iter, DBusMessageIter *dict)
+{
+ DBusMessageIter value, metadata;
+
+ dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, "a{sv}",
+ &value);
+
+ dbus_message_iter_open_container(&value, 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, &metadata);
+
+ parse_track(dict, &metadata);
+
+ dbus_message_iter_close_container(&value, &metadata);
+ dbus_message_iter_close_container(iter, &value);
+}
+
+static dbus_bool_t emit_properties_changed(DBusConnection *conn,
+ const char *path,
+ const char *interface,
+ const char *name,
+ int type, void *value)
+{
+ DBusMessage *signal;
+ DBusMessageIter iter, dict, entry, array;
+ dbus_bool_t result;
+
+ signal = dbus_message_new_signal(path, DBUS_INTERFACE_PROPERTIES,
+ "PropertiesChanged");
+
+ if (!signal) {
+ fprintf(stderr, "Unable to allocate new %s.PropertyChanged"
+ " signal", interface);
+ return FALSE;
+ }
+
+ dbus_message_iter_init_append(signal, &iter);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &interface);
+ 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_open_container(&dict, DBUS_TYPE_DICT_ENTRY, NULL,
+ &entry);
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &name);
+
+ if (strcasecmp(name, "Track") == 0)
+ append_track(&entry, value);
+ else
+ append_variant(&entry, type, value);
+
+ dbus_message_iter_close_container(&dict, &entry);
+
+ dbus_message_iter_close_container(&iter, &dict);
+
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_STRING_AS_STRING, &array);
+ dbus_message_iter_close_container(&iter, &array);
+
+ result = dbus_connection_send(conn, signal, NULL);
+ dbus_message_unref(signal);
+
+ return result;
+}
+
+static int parse_property(DBusConnection *conn, const char *path,
+ const char *key,
+ DBusMessageIter *entry,
+ DBusMessageIter *properties)
+{
+ DBusMessageIter var;
+
+ printf("property %s found\n", key);
+
+ if (dbus_message_iter_get_arg_type(entry) != DBUS_TYPE_VARIANT)
+ return -EINVAL;
+
+ dbus_message_iter_recurse(entry, &var);
+
+ if (strcasecmp(key, "PlaybackStatus") == 0) {
+ const char *value;
+
+ if (dbus_message_iter_get_arg_type(&var) !=
+ DBUS_TYPE_STRING)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(&var, &value);
+
+ if (properties)
+ dict_append_entry(properties, "Status",
+ DBUS_TYPE_STRING, &value);
+ else
+ emit_properties_changed(sys, path,
+ "org.bluez.MediaPlayer1", "Status",
+ DBUS_TYPE_STRING, &value);
+ } else if (strcasecmp(key, "Position") == 0) {
+ int64_t usec, msec;
+
+ if (dbus_message_iter_get_arg_type(&var) !=
+ DBUS_TYPE_INT64)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(&var, &usec);
+ msec = usec / 1000;
+
+ if (properties)
+ dict_append_entry(properties, "Position",
+ DBUS_TYPE_UINT32, &msec);
+ else
+ emit_properties_changed(sys, path,
+ "org.bluez.MediaPlayer1", "Position",
+ DBUS_TYPE_UINT32, &msec);
+ } else if (strcasecmp(key, "Shuffle") == 0) {
+ dbus_bool_t value;
+ const char *str;
+
+ if (dbus_message_iter_get_arg_type(&var) !=
+ DBUS_TYPE_BOOLEAN)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(&var, &value);
+
+ str = value ? "on" : "off";
+ if (properties)
+ dict_append_entry(properties, "Shuffle",
+ DBUS_TYPE_STRING, &str);
+ else
+ emit_properties_changed(sys, path,
+ "org.bluez.MediaPlayer1", "Shuffle",
+ DBUS_TYPE_STRING, &str);
+ } else if (strcasecmp(key, "Metadata") == 0) {
+ if (properties)
+ parse_track(&var, properties);
+ else
+ emit_properties_changed(sys, path,
+ "org.bluez.MediaPlayer1", "Track",
+ DBUS_TYPE_DICT_ENTRY, &var);
+ }
+
+ return 0;
+}
+
+static int parse_properties(DBusConnection *conn, const char *path,
+ DBusMessageIter *args,
+ DBusMessageIter *properties)
{
DBusMessageIter dict;
int ctype;
@@ -426,13 +415,13 @@ static int parse_metadata(DBusMessageIter *args, DBusMessageIter *metadata)
dbus_message_iter_get_basic(&entry, &key);
dbus_message_iter_next(&entry);
- if (strcasecmp(key, "Metadata") == 0)
- return parse_track(&entry, metadata);
+ if (parse_property(conn, path, key, &entry, properties) < 0)
+ return -EINVAL;
dbus_message_iter_next(&dict);
}
- return -EINVAL;
+ return 0;
}
static char *sender2path(const char *sender)
@@ -464,7 +453,7 @@ static void add_player(DBusConnection *conn, const char *name,
{
DBusMessage *reply = get_all(conn, name);
DBusMessage *msg;
- DBusMessageIter iter, args, properties, metadata;
+ DBusMessageIter iter, args, properties;
DBusError err;
char *path;
@@ -496,18 +485,6 @@ static void add_player(DBusConnection *conn, const char *name,
dbus_message_iter_close_container(&iter, &properties);
- 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, &metadata);
-
- dbus_message_iter_init(reply, &args);
-
- if (parse_metadata(&args, &metadata) < 0)
- goto done;
-
- dbus_message_iter_close_container(&iter, &metadata);
-
dbus_message_unref(reply);
dbus_error_init(&err);
@@ -559,8 +536,7 @@ static void remove_player(DBusConnection *conn, const char *sender)
static DBusHandlerResult properties_changed(DBusConnection *conn,
DBusMessage *msg)
{
- DBusMessage *signal;
- DBusMessageIter iter, entry, metadata;
+ DBusMessageIter iter;
const char *iface;
char *path;
@@ -578,40 +554,9 @@ static DBusHandlerResult properties_changed(DBusConnection *conn,
path = sender2path(dbus_message_get_sender(msg));
parse_properties(conn, path, &iter, NULL);
- signal = dbus_message_new_signal(path, "org.bluez.MediaPlayer1",
- "TrackChanged");
- if (!signal) {
- fprintf(stderr, "Unable to allocate new PropertyChanged"
- " signal\n");
- goto err;
- }
-
- dbus_message_iter_init_append(signal, &entry);
-
- dbus_message_iter_open_container(&entry, 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, &metadata);
-
- dbus_message_iter_init(msg, &iter);
- dbus_message_iter_next(&iter);
-
- if (parse_metadata(&iter, &metadata) < 0)
- goto err;
-
- dbus_message_iter_close_container(&entry, &metadata);
-
- dbus_connection_send(sys, signal, NULL);
- dbus_message_unref(signal);
g_free(path);
return DBUS_HANDLER_RESULT_HANDLED;
-
-err:
- if (signal)
- dbus_message_unref(signal);
- g_free(path);
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
static DBusHandlerResult session_filter(DBusConnection *conn,
@@ -676,114 +621,6 @@ static DBusHandlerResult system_filter(DBusConnection *conn,
return DBUS_HANDLER_RESULT_HANDLED;
}
-static char *get_default_adapter(DBusConnection *conn)
-{
- DBusMessage *msg, *reply;
- DBusError err;
- const char *reply_path;
- char *path;
-
- msg = dbus_message_new_method_call("org.bluez", "/",
- "org.bluez.Manager", "DefaultAdapter");
-
- if (!msg) {
- fprintf(stderr, "Can't allocate new method call\n");
- return NULL;
- }
-
- dbus_error_init(&err);
-
- reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &err);
-
- dbus_message_unref(msg);
-
- if (!reply) {
- fprintf(stderr, "Can't get default adapter\n");
- if (dbus_error_is_set(&err)) {
- fprintf(stderr, "%s\n", err.message);
- dbus_error_free(&err);
- }
- return NULL;
- }
-
- if (!dbus_message_get_args(reply, &err,
- DBUS_TYPE_OBJECT_PATH, &reply_path,
- DBUS_TYPE_INVALID)) {
- fprintf(stderr, "Can't get reply arguments\n");
- if (dbus_error_is_set(&err)) {
- fprintf(stderr, "%s\n", err.message);
- dbus_error_free(&err);
- }
- dbus_message_unref(reply);
- return NULL;
- }
-
- path = strdup(reply_path);
-
- dbus_message_unref(reply);
-
- dbus_connection_flush(conn);
-
- return path;
-}
-
-static char *get_adapter(DBusConnection *conn, const char *adapter)
-{
- DBusMessage *msg, *reply;
- DBusError err;
- const char *reply_path;
- char *path;
-
- if (!adapter)
- return get_default_adapter(conn);
-
- msg = dbus_message_new_method_call("org.bluez", "/",
- "org.bluez.Manager", "FindAdapter");
-
- if (!msg) {
- fprintf(stderr, "Can't allocate new method call\n");
- return NULL;
- }
-
- dbus_message_append_args(msg, DBUS_TYPE_STRING, &adapter,
- DBUS_TYPE_INVALID);
-
- dbus_error_init(&err);
-
- reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &err);
-
- dbus_message_unref(msg);
-
- if (!reply) {
- fprintf(stderr, "Can't find adapter %s\n", adapter);
- if (dbus_error_is_set(&err)) {
- fprintf(stderr, "%s\n", err.message);
- dbus_error_free(&err);
- }
- return NULL;
- }
-
- if (!dbus_message_get_args(reply, &err,
- DBUS_TYPE_OBJECT_PATH, &reply_path,
- DBUS_TYPE_INVALID)) {
- fprintf(stderr, "Can't get reply arguments\n");
- if (dbus_error_is_set(&err)) {
- fprintf(stderr, "%s\n", err.message);
- dbus_error_free(&err);
- }
- dbus_message_unref(reply);
- return NULL;
- }
-
- path = strdup(reply_path);
-
- dbus_message_unref(reply);
-
- dbus_connection_flush(conn);
-
- return path;
-}
-
static char *get_name_owner(DBusConnection *conn, const char *name)
{
DBusMessage *msg, *reply;
@@ -924,14 +761,13 @@ static struct option main_options[] = {
int main(int argc, char *argv[])
{
struct sigaction sa;
- char *adapter_id = NULL;
char match[128];
int opt;
while ((opt = getopt_long(argc, argv, "+a,h", main_options, NULL)) != EOF) {
switch(opt) {
case '1':
- adapter_id = optarg;
+ adapter = optarg;
break;
case 'h':
usage();
@@ -947,10 +783,6 @@ int main(int argc, char *argv[])
exit(1);
}
- adapter = get_adapter(sys, adapter_id);
- if (!adapter)
- exit(1);
-
if (!dbus_connection_add_filter(sys, system_filter, NULL, NULL)) {
fprintf(stderr, "Can't add signal filter");
exit(1);
--
1.8.0.1
^ permalink raw reply related
* [PATCH BlueZ 08/13 v2] test: Adapt simple-player to the new API of MediaPlayer1
From: Luiz Augusto von Dentz @ 2013-01-10 13:37 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1357825038-21970-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
test/simple-player | 62 ++++++++++++++++--------------------------------------
1 file changed, 18 insertions(+), 44 deletions(-)
diff --git a/test/simple-player b/test/simple-player
index 3bfc485..e331c52 100755
--- a/test/simple-player
+++ b/test/simple-player
@@ -22,46 +22,36 @@ class Player(dbus.service.Object):
"org.freedesktop.DBus.Properties")
self.properties = prop.GetAll("org.bluez.MediaPlayer1")
- self.metadata = mp.GetTrack()
bus.add_signal_receiver(self.properties_changed,
path = obj,
dbus_interface = "org.freedesktop.DBus.Properties",
signal_name = "PropertiesChanged")
-
- bus.add_signal_receiver(self.track_changed,
- path = obj,
- dbus_interface ="org.bluez.MediaPlayer",
- signal_name = "TrackChanged")
else:
+ track = dbus.Dictionary({
+ "Title" : "Title",
+ "Artist" : "Artist",
+ "Album" : "Album",
+ "Genre" : "Genre",
+ "NumberOfTracks" : dbus.UInt32(10),
+ "TrackNumber" : dbus.UInt32(1),
+ "Duration" : dbus.UInt32(10000) },
+ signature="sv")
+
self.properties = dbus.Dictionary({
"Equalizer" : "off",
"Repeat" : "off",
"Shuffle" : "off",
"Scan" : "off",
"Status" : "playing",
- "Position" : dbus.UInt32(0) },
+ "Position" : dbus.UInt32(0),
+ "Track" : track },
signature="sv")
- self.metadata = dbus.Dictionary({
- "Title" : "Title",
- "Artist" : "Artist",
- "Album" : "Album",
- "Genre" : "Genre",
- "NumberOfTracks" : dbus.UInt32(10),
- "Track" : dbus.UInt32(1),
- "Duration" : dbus.UInt32(10000) },
- signature="sv")
handler = InputHandler(self)
gobject.io_add_watch(sys.stdin, gobject.IO_IN,
handler.handle)
- @dbus.service.method("org.bluez.MediaPlayer1",
- in_signature="", out_signature="")
- def Release(self):
- print("Release")
- mainloop.quit()
-
@dbus.service.method("org.freedesktop.DBus.Properties",
in_signature="ssv", out_signature="")
def Set(self, interface, key, value):
@@ -79,15 +69,6 @@ class Player(dbus.service.Object):
"""
pass
- @dbus.service.signal("org.bluez.MediaPlayer1", signature="a{sv}")
- def TrackChanged(self, metadata):
- """TrackChanged(metadata)
-
- Send a TrackChanged signal. 'metadata' parameter is a dictionary,
- with values as defined in doc/media-api.txt.
- """
- pass
-
def help(self, func):
help(self.__class__.__dict__[func])
@@ -96,14 +77,8 @@ class Player(dbus.service.Object):
self.PropertiesChanged(interface, properties, invalidated)
- def track_changed(self, metadata):
- print("track_changed(%s)" % (metadata))
-
- self.TrackChanged(metadata)
-
class InputHandler:
- commands = { 'TrackChanged': '(metadata)',
- 'PropertiesChanged': '(interface, properties)',
+ commands = { 'PropertiesChanged': '(interface, properties)',
'help': '(cmd)' }
def __init__(self, player):
self.player = player
@@ -112,7 +87,8 @@ class InputHandler:
print('\t', cmd, self.commands[cmd], sep='')
print("\nUse python syntax to pass arguments to available methods.\n" \
- "E.g.: TrackChanged({'Title': 'My title', 'Album': 'my album' })")
+ "E.g.: PropertiesChanged({'Track' : {'Title': 'My title', \
+ 'Album': 'my album' }})")
self.prompt()
def prompt(self):
@@ -160,11 +136,9 @@ if __name__ == '__main__':
else:
player.set_object()
- print('Register media player with:\n\tProperties: %s\n\tMetadata: %s' \
- % (player.properties, player.metadata))
-
+ print('Register media player with:\n\tProperties: %s' \
+ % (player.properties))
- media.RegisterPlayer(dbus.ObjectPath(path), player.properties,
- player.metadata)
+ media.RegisterPlayer(dbus.ObjectPath(path), player.properties)
mainloop.run()
--
1.8.0.1
^ permalink raw reply related
* [PATCH BlueZ 07/13 v2] media: Adapt RegisterPlayer to changes in MediaPlayer1
From: Luiz Augusto von Dentz @ 2013-01-10 13:37 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1357825038-21970-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This adds support for Track being a property and the removal of
GetTrack and TrackChanged.
---
profiles/audio/media.c | 199 +++++++++++++++++++++----------------------------
1 file changed, 85 insertions(+), 114 deletions(-)
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 00aa2f4..b184f01 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -1181,99 +1181,6 @@ static gboolean set_position(struct media_player *mp, DBusMessageIter *iter)
return TRUE;
}
-static gboolean set_player_property(struct media_player *mp, const char *key,
- DBusMessageIter *entry)
-{
- DBusMessageIter var;
- const char *value, *curval;
- GList *settings;
-
- if (dbus_message_iter_get_arg_type(entry) != DBUS_TYPE_VARIANT)
- return FALSE;
-
- dbus_message_iter_recurse(entry, &var);
-
- if (strcasecmp(key, "Status") == 0)
- return set_status(mp, &var);
-
- if (strcasecmp(key, "Position") == 0)
- return set_position(mp, &var);
-
- if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_STRING)
- return FALSE;
-
- dbus_message_iter_get_basic(&var, &value);
-
- curval = g_hash_table_lookup(mp->settings, key);
- if (g_strcmp0(curval, value) == 0)
- return TRUE;
-
- DBG("%s=%s", key, value);
-
- g_hash_table_replace(mp->settings, g_strdup(key), g_strdup(value));
-
- settings = list_settings(mp);
-
- avrcp_player_event(mp->player, AVRCP_EVENT_SETTINGS_CHANGED, settings);
-
- g_list_free(settings);
-
- return TRUE;
-}
-
-static gboolean parse_player_properties(struct media_player *mp,
- DBusMessageIter *iter)
-{
- DBusMessageIter dict;
- int ctype;
-
- ctype = dbus_message_iter_get_arg_type(iter);
- if (ctype != DBUS_TYPE_ARRAY)
- return FALSE;
-
- dbus_message_iter_recurse(iter, &dict);
-
- while ((ctype = dbus_message_iter_get_arg_type(&dict)) !=
- DBUS_TYPE_INVALID) {
- DBusMessageIter entry;
- const char *key;
-
- if (ctype != DBUS_TYPE_DICT_ENTRY)
- return FALSE;
-
- dbus_message_iter_recurse(&dict, &entry);
- if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING)
- return FALSE;
-
- dbus_message_iter_get_basic(&entry, &key);
- dbus_message_iter_next(&entry);
-
- if (set_player_property(mp, key, &entry) == FALSE)
- return FALSE;
-
- dbus_message_iter_next(&dict);
- }
-
- return TRUE;
-}
-
-static gboolean properties_changed(DBusConnection *connection, DBusMessage *msg,
- void *user_data)
-{
- struct media_player *mp = user_data;
- DBusMessageIter iter;
-
- DBG("sender=%s path=%s", mp->sender, mp->path);
-
- dbus_message_iter_init(msg, &iter);
-
- dbus_message_iter_next(&iter);
-
- parse_player_properties(mp, &iter);
-
- return TRUE;
-}
-
static gboolean parse_player_metadata(struct media_player *mp,
DBusMessageIter *iter)
{
@@ -1346,7 +1253,7 @@ static gboolean parse_player_metadata(struct media_player *mp,
dbus_message_iter_get_basic(&var, &num);
mp->duration = num;
- } else if (strcasecmp(key, "Track") == 0) {
+ } else if (strcasecmp(key, "TrackNumber") == 0) {
if (type != DBUS_TYPE_UINT32)
goto parse_error;
@@ -1400,7 +1307,86 @@ parse_error:
return FALSE;
}
-static gboolean track_changed(DBusConnection *connection, DBusMessage *msg,
+static gboolean set_player_property(struct media_player *mp, const char *key,
+ DBusMessageIter *entry)
+{
+ DBusMessageIter var;
+ const char *value, *curval;
+ GList *settings;
+
+ if (dbus_message_iter_get_arg_type(entry) != DBUS_TYPE_VARIANT)
+ return FALSE;
+
+ dbus_message_iter_recurse(entry, &var);
+
+ if (strcasecmp(key, "Status") == 0)
+ return set_status(mp, &var);
+
+ if (strcasecmp(key, "Position") == 0)
+ return set_position(mp, &var);
+
+ if (strcasecmp(key, "Track") == 0)
+ return parse_player_metadata(mp, &var);
+
+ if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_STRING)
+ return FALSE;
+
+ dbus_message_iter_get_basic(&var, &value);
+
+ curval = g_hash_table_lookup(mp->settings, key);
+ if (g_strcmp0(curval, value) == 0)
+ return TRUE;
+
+ DBG("%s=%s", key, value);
+
+ g_hash_table_replace(mp->settings, g_strdup(key), g_strdup(value));
+
+ settings = list_settings(mp);
+
+ avrcp_player_event(mp->player, AVRCP_EVENT_SETTINGS_CHANGED, settings);
+
+ g_list_free(settings);
+
+ return TRUE;
+}
+
+static gboolean parse_player_properties(struct media_player *mp,
+ DBusMessageIter *iter)
+{
+ DBusMessageIter dict;
+ int ctype;
+
+ ctype = dbus_message_iter_get_arg_type(iter);
+ if (ctype != DBUS_TYPE_ARRAY)
+ return FALSE;
+
+ dbus_message_iter_recurse(iter, &dict);
+
+ while ((ctype = dbus_message_iter_get_arg_type(&dict)) !=
+ DBUS_TYPE_INVALID) {
+ DBusMessageIter entry;
+ const char *key;
+
+ if (ctype != DBUS_TYPE_DICT_ENTRY)
+ return FALSE;
+
+ dbus_message_iter_recurse(&dict, &entry);
+ if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING)
+ return FALSE;
+
+ dbus_message_iter_get_basic(&entry, &key);
+ dbus_message_iter_next(&entry);
+
+ if (set_player_property(mp, key, &entry) == FALSE)
+ return FALSE;
+
+ dbus_message_iter_next(&dict);
+ }
+
+ return TRUE;
+}
+
+static gboolean properties_changed(DBusConnection *connection, DBusMessage *msg,
void *user_data)
{
struct media_player *mp = user_data;
@@ -1410,11 +1396,9 @@ static gboolean track_changed(DBusConnection *connection, DBusMessage *msg,
dbus_message_iter_init(msg, &iter);
- if (parse_player_metadata(mp, &iter) == FALSE) {
- error("Unexpected signature in %s.%s signal",
- dbus_message_get_interface(msg),
- dbus_message_get_member(msg));
- }
+ dbus_message_iter_next(&iter);
+
+ parse_player_properties(mp, &iter);
return TRUE;
}
@@ -1440,11 +1424,6 @@ static struct media_player *media_player_create(struct media_adapter *adapter,
path, MEDIA_PLAYER_INTERFACE,
properties_changed,
mp, NULL);
- mp->track_watch = g_dbus_add_signal_watch(conn, sender,
- path, MEDIA_PLAYER_INTERFACE,
- "TrackChanged",
- track_changed,
- mp, NULL);
mp->player = avrcp_register_player(adapter->btd_adapter, &player_cb,
mp, media_player_free);
if (!mp->player) {
@@ -1499,13 +1478,6 @@ static DBusMessage *register_player(DBusConnection *conn, DBusMessage *msg,
return btd_error_invalid_args(msg);
}
- dbus_message_iter_next(&args);
-
- if (parse_player_metadata(mp, &args) == FALSE) {
- media_player_destroy(mp);
- return btd_error_invalid_args(msg);
- }
-
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
@@ -1539,8 +1511,7 @@ static const GDBusMethodTable media_methods[] = {
{ GDBUS_METHOD("UnregisterEndpoint",
GDBUS_ARGS({ "endpoint", "o" }), NULL, unregister_endpoint) },
{ GDBUS_EXPERIMENTAL_METHOD("RegisterPlayer",
- GDBUS_ARGS({ "player", "o" }, { "properties", "a{sv}" },
- { "metadata", "a{sv}" }),
+ GDBUS_ARGS({ "player", "o" }, { "properties", "a{sv}" }),
NULL, register_player) },
{ GDBUS_EXPERIMENTAL_METHOD("UnregisterPlayer",
GDBUS_ARGS({ "player", "o" }), NULL, unregister_player) },
--
1.8.0.1
^ permalink raw reply related
* [PATCH BlueZ 06/13 v2] player: Add Device property
From: Luiz Augusto von Dentz @ 2013-01-10 13:37 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1357825038-21970-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Device property indicates which device object the player belongs to.
---
doc/media-api.txt | 4 ++++
profiles/audio/player.c | 15 +++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/doc/media-api.txt b/doc/media-api.txt
index abf5ff9..c9c2e7a 100644
--- a/doc/media-api.txt
+++ b/doc/media-api.txt
@@ -280,6 +280,10 @@ Properties string Equalizer [readwrite]
Track duration in milliseconds
+ object Device [readonly]
+
+ Device object path.
+
MediaEndpoint1 hierarchy
========================
diff --git a/profiles/audio/player.c b/profiles/audio/player.c
index 880745d..f8920c9 100644
--- a/profiles/audio/player.c
+++ b/profiles/audio/player.c
@@ -56,6 +56,7 @@ struct pending_req {
};
struct media_player {
+ char *device; /* Device path */
char *path; /* Player object path */
GHashTable *settings; /* Player settings */
GHashTable *track; /* Player current track */
@@ -242,6 +243,16 @@ static gboolean get_track(const GDBusPropertyTable *property,
return TRUE;
}
+static gboolean get_device(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct media_player *mp = data;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &mp->device);
+
+ return TRUE;
+}
+
static DBusMessage *media_player_play(DBusConnection *conn, DBusMessage *msg,
void *data)
{
@@ -394,6 +405,8 @@ static const GDBusPropertyTable media_player_properties[] = {
G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
{ "Track", "a{sv}", get_track, NULL, NULL,
G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "Device", "s", get_device, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
{ }
};
@@ -419,6 +432,7 @@ void media_player_destroy(struct media_player *mp)
g_free(mp->cb);
g_free(mp->status);
g_free(mp->path);
+ g_free(mp->device);
g_free(mp);
}
@@ -427,6 +441,7 @@ struct media_player *media_player_controller_create(const char *path)
struct media_player *mp;
mp = g_new0(struct media_player, 1);
+ mp->device = g_strdup(path);
mp->path = g_strdup_printf("%s/player1", path);
mp->settings = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, g_free);
--
1.8.0.1
^ permalink raw reply related
* [PATCH BlueZ 05/13 v2] AVRCP: Always create a controller player even for version 1.0
From: Luiz Augusto von Dentz @ 2013-01-10 13:37 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1357825038-21970-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Since the buttons controls are now part of the MediaPlayer1 it can be used
even with AVRCP version 1.0.
---
profiles/audio/avrcp.c | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index 3366b48..d0cc346 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -1952,6 +1952,9 @@ static bool ct_set_setting(struct media_player *mp, const char *key,
if (session == NULL)
return false;
+ if (session->version < 0x0103)
+ return false;
+
attr = attr_to_val(key);
if (attr < 0)
return false;
@@ -2047,24 +2050,15 @@ static gboolean avrcp_get_capabilities_resp(struct avctp *conn,
void *user_data)
{
struct avrcp *session = user_data;
- struct avrcp_player *player = session->player;
- struct media_player *mp;
struct avrcp_header *pdu = (void *) operands;
uint16_t events = 0;
uint8_t count;
- const char *path;
if (pdu->params[0] != CAP_EVENTS_SUPPORTED)
return FALSE;
count = pdu->params[1];
- path = device_get_path(session->dev->btd_dev);
-
- mp = media_player_controller_create(path);
- if (mp == NULL)
- return FALSE;
-
for (; count > 0; count--) {
uint8_t event = pdu->params[1 + count];
@@ -2079,10 +2073,6 @@ static gboolean avrcp_get_capabilities_resp(struct avctp *conn,
}
}
- media_player_set_callbacks(mp, &ct_cbs, player);
- player->user_data = mp;
- player->destroy = (GDestroyNotify) media_player_destroy;
-
if (!(events & (1 << AVRCP_EVENT_SETTINGS_CHANGED)))
avrcp_list_player_attributes(session);
@@ -2169,6 +2159,8 @@ static void session_tg_init(struct avrcp *session)
static void session_ct_init(struct avrcp *session)
{
struct avrcp_player *player;
+ struct media_player *mp;
+ const char *path;
session->control_handlers = ct_control_handlers;
@@ -2179,13 +2171,22 @@ static void session_ct_init(struct avrcp *session)
handle_vendordep_pdu,
session);
- if (session->version < 0x0103)
- return;
-
player = g_new0(struct avrcp_player, 1);
player->sessions = g_slist_prepend(player->sessions, session);
session->player = player;
+ path = device_get_path(session->dev->btd_dev);
+
+ mp = media_player_controller_create(path);
+ if (mp != NULL) {
+ media_player_set_callbacks(mp, &ct_cbs, player);
+ player->user_data = mp;
+ player->destroy = (GDestroyNotify) media_player_destroy;
+ }
+
+ if (session->version < 0x0103)
+ return;
+
avrcp_get_capabilities(session);
}
--
1.8.0.1
^ permalink raw reply related
* [PATCH BlueZ 04/13 v2] player: Fix documentation to use TrackNumber in track metadata
From: Luiz Augusto von Dentz @ 2013-01-10 13:37 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1357825038-21970-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Using Track key inside a Track property would be pointless, despite the
documentation and code where also inconsistent.
---
doc/media-api.txt | 2 +-
profiles/audio/avrcp.c | 2 +-
profiles/audio/player.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/media-api.txt b/doc/media-api.txt
index ae4b0dd..abf5ff9 100644
--- a/doc/media-api.txt
+++ b/doc/media-api.txt
@@ -272,7 +272,7 @@ Properties string Equalizer [readwrite]
Number of tracks in total
- uint32 Number:
+ uint32 TrackNumber:
Track number
diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index 9ca5a3a..3366b48 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -649,7 +649,7 @@ static const char *metadata_to_str(uint32_t id)
case AVRCP_MEDIA_ATTRIBUTE_GENRE:
return "Genre";
case AVRCP_MEDIA_ATTRIBUTE_TRACK:
- return "Track";
+ return "TrackNumber";
case AVRCP_MEDIA_ATTRIBUTE_N_TRACKS:
return "NumberOfTracks";
case AVRCP_MEDIA_ATTRIBUTE_DURATION:
diff --git a/profiles/audio/player.c b/profiles/audio/player.c
index 2e5c386..880745d 100644
--- a/profiles/audio/player.c
+++ b/profiles/audio/player.c
@@ -72,7 +72,7 @@ static void append_metadata(void *key, void *value, void *user_data)
DBusMessageIter *dict = user_data;
if (strcasecmp((char *) key, "Duration") == 0 ||
- strcasecmp((char *) key, "Track") == 0 ||
+ strcasecmp((char *) key, "TrackNumber") == 0 ||
strcasecmp((char *) key, "NumberOfTracks") == 0) {
uint32_t num = atoi(value);
dict_append_entry(dict, key, DBUS_TYPE_UINT32, &num);
--
1.8.0.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox