From a3acb4947b7ae8c31e873befb24bebe64b36e49c Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 21 Jun 2011 10:12:12 +0200 Subject: expanded the signature on the dbus methods for player and track specific items to handle the object path on the other side --- src/sound-service-dbus.c | 17 +++++++++++++---- src/sound-service.c | 2 +- src/sound-service.xml | 6 ++++-- 3 files changed, 18 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c index 26477a1..afb4f04 100644 --- a/src/sound-service-dbus.c +++ b/src/sound-service-dbus.c @@ -319,15 +319,24 @@ bus_method_call (GDBusConnection * connection, retval = g_variant_new ("(b)", result); } else if (g_strcmp0(method, "EnableTrackSpecificItems") == 0) { - gchar* player_name; - g_variant_get (params, "(s)", &player_name); - g_debug ("EnableTrackSpecificItems - name %s", player_name); + gchar** player_object_path_and_id; + g_variant_get (params, "(ss)", &player_object_path_and_id); + /*g_debug ("EnableTrackSpecificItems - name %s", player_object_path); g_signal_emit (service, signals[TRACK_SPECIFIC_ITEM], 0, - player_name); + player_object_path);*/ } + else if (g_strcmp0(method, "EnablePlayerSpecificItems") == 0) { + /*gchar* player_object_path; + g_variant_get (params, "(s)", &player_object_path); + g_debug ("EnableTrackSpecificItems - name %s", player_object_path); + g_signal_emit (service, + signals[TRACK_SPECIFIC_ITEM], + 0, + player_object_path);*/ + } else { g_warning("Calling method '%s' on the sound service but it's unknown", method); } diff --git a/src/sound-service.c b/src/sound-service.c index 1f7ea73..918bde6 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -47,7 +47,7 @@ service_shutdown (IndicatorService *service, gpointer user_data) void on_player_specific_item_requested (SoundServiceDbus* sound_service, - const gchar* desktop_id, + const gchar* player_object_path, gpointer userdata) { music_player_bridge_enable_player_specific_items_for_client (player_bridge, desktop_id); diff --git a/src/sound-service.xml b/src/sound-service.xml index aa9f229..af0f136 100644 --- a/src/sound-service.xml +++ b/src/sound-service.xml @@ -18,11 +18,13 @@ - + + - + + -- cgit v1.2.3