OSDN Git Service

player: Enable MediaPlayer1 interface as experimental
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Fri, 28 Dec 2012 12:51:08 +0000 (14:51 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Sun, 30 Dec 2012 18:53:43 +0000 (10:53 -0800)
This enable MediaPlayer1 when GDBUS_EXPERIMENTAL=1

profiles/audio/player.c

index 32533b8..8748893 100644 (file)
@@ -247,25 +247,31 @@ static void set_setting(const GDBusPropertyTable *property,
 }
 
 static const GDBusMethodTable media_player_methods[] = {
-       { GDBUS_METHOD("GetTrack",
+       { GDBUS_EXPERIMENTAL_METHOD("GetTrack",
                        NULL, GDBUS_ARGS({ "metadata", "a{sv}" }),
                        media_player_get_track) },
        { }
 };
 
 static const GDBusSignalTable media_player_signals[] = {
-       { GDBUS_SIGNAL("TrackChanged",
+       { GDBUS_EXPERIMENTAL_SIGNAL("TrackChanged",
                        GDBUS_ARGS({ "metadata", "a{sv}" })) },
        { }
 };
 
 static const GDBusPropertyTable media_player_properties[] = {
-       { "Position", "u", get_position },
-       { "Status", "s", get_status, NULL, status_exists },
-       { "Equalizer", "s", get_setting, set_setting, setting_exists },
-       { "Repeat", "s", get_setting, set_setting, setting_exists },
-       { "Shuffle", "s", get_setting, set_setting, setting_exists },
-       { "Scan", "s", get_setting, set_setting, setting_exists },
+       { "Position", "u", get_position, NULL, NULL,
+                                       G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+       { "Status", "s", get_status, NULL, status_exists,
+                                       G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+       { "Equalizer", "s", get_setting, set_setting, setting_exists,
+                                       G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+       { "Repeat", "s", get_setting, set_setting, setting_exists,
+                                       G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+       { "Shuffle", "s", get_setting, set_setting, setting_exists,
+                                       G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+       { "Scan", "s", get_setting, set_setting, setting_exists,
+                                       G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
        { }
 };
 
@@ -306,7 +312,6 @@ struct media_player *media_player_controller_create(const char *path)
                                                        g_free, g_free);
        mp->progress = g_timer_new();
 
-#if 0
        if (!g_dbus_register_interface(btd_get_dbus_connection(),
                                        mp->path, MEDIA_PLAYER_INTERFACE,
                                        media_player_methods,
@@ -316,7 +321,7 @@ struct media_player *media_player_controller_create(const char *path)
                media_player_destroy(mp);
                return NULL;
        }
-#endif
+
        DBG("%s", mp->path);
 
        return mp;
@@ -418,7 +423,6 @@ void media_player_set_status(struct media_player *mp, const char *status)
 
 static gboolean process_metadata_changed(void *user_data)
 {
-#if 0
        struct media_player *mp = user_data;
        DBusMessage *signal;
        DBusMessageIter iter, dict;
@@ -447,7 +451,7 @@ static gboolean process_metadata_changed(void *user_data)
        dbus_message_iter_close_container(&iter, &dict);
 
        g_dbus_send_message(btd_get_dbus_connection(), signal);
-#endif
+
        return FALSE;
 }