From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ 06/13 v2] player: Add Device property
Date: Thu, 10 Jan 2013 15:37:11 +0200 [thread overview]
Message-ID: <1357825038-21970-6-git-send-email-luiz.dentz@gmail.com> (raw)
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
next prev parent reply other threads:[~2013-01-10 13:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-10 13:37 [PATCH BlueZ 01/13 v2] media-api: Add playback control methods to MediaPlayer1 Luiz Augusto von Dentz
2013-01-10 13:37 ` [PATCH BlueZ 02/13 v2] player: Remove GetTrack and TrackChanged Luiz Augusto von Dentz
2013-01-10 13:37 ` [PATCH BlueZ 03/13 v2] player: Add support for button controls Luiz Augusto von Dentz
2013-01-10 13:37 ` [PATCH BlueZ 04/13 v2] player: Fix documentation to use TrackNumber in track metadata Luiz Augusto von Dentz
2013-01-10 13:37 ` [PATCH BlueZ 05/13 v2] AVRCP: Always create a controller player even for version 1.0 Luiz Augusto von Dentz
2013-01-10 13:37 ` Luiz Augusto von Dentz [this message]
2013-01-10 13:37 ` [PATCH BlueZ 07/13 v2] media: Adapt RegisterPlayer to changes in MediaPlayer1 Luiz Augusto von Dentz
2013-01-10 13:37 ` [PATCH BlueZ 08/13 v2] test: Adapt simple-player to the new API of MediaPlayer1 Luiz Augusto von Dentz
2013-01-10 13:37 ` [PATCH BlueZ 09/13 v2] tools: Adapt mpris-player to " Luiz Augusto von Dentz
2013-01-10 13:37 ` [PATCH BlueZ 10/13 v2] media-api: Change RegisterPlayer to use MPRIS spec Luiz Augusto von Dentz
2013-01-10 13:37 ` [PATCH BlueZ 11/13 v2] test: Update test-player to register using MPRIS interface Luiz Augusto von Dentz
2013-01-10 13:37 ` [PATCH BlueZ 12/13 v2] media: Implement new RegisterPlayer API Luiz Augusto von Dentz
2013-01-10 13:37 ` [PATCH BlueZ 13/13 v2] tools: Update mpris-player to register using MPRIS interface Luiz Augusto von Dentz
2013-01-10 16:02 ` Anderson Lizardo
2013-01-10 16:56 ` Luiz Augusto von Dentz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357825038-21970-6-git-send-email-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox