OSDN Git Service

media: Enable RegisterPlayer and UnregisterPlayer methods as experimental
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Fri, 28 Dec 2012 12:51:07 +0000 (14:51 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Sun, 30 Dec 2012 18:53:43 +0000 (10:53 -0800)
profiles/audio/media.c

index f728460..e4206e3 100644 (file)
@@ -868,7 +868,6 @@ static DBusMessage *unregister_endpoint(DBusConnection *conn, DBusMessage *msg,
        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
-#if 0
 static struct media_player *media_adapter_find_player(
                                                struct media_adapter *adapter,
                                                const char *sender,
@@ -1533,7 +1532,6 @@ static DBusMessage *unregister_player(DBusConnection *conn, DBusMessage *msg,
 
        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
-#endif
 
 static const GDBusMethodTable media_methods[] = {
        { GDBUS_METHOD("RegisterEndpoint",
@@ -1541,14 +1539,12 @@ static const GDBusMethodTable media_methods[] = {
                NULL, register_endpoint) },
        { GDBUS_METHOD("UnregisterEndpoint",
                GDBUS_ARGS({ "endpoint", "o" }), NULL, unregister_endpoint) },
-#if 0
-       { GDBUS_METHOD("RegisterPlayer",
+       { GDBUS_EXPERIMENTAL_METHOD("RegisterPlayer",
                GDBUS_ARGS({ "player", "o" }, { "properties", "a{sv}" },
                                                { "metadata", "a{sv}" }),
                NULL, register_player) },
-       { GDBUS_METHOD("UnregisterPlayer",
+       { GDBUS_EXPERIMENTAL_METHOD("UnregisterPlayer",
                GDBUS_ARGS({ "player", "o" }), NULL, unregister_player) },
-#endif
        { },
 };
 
@@ -1559,10 +1555,8 @@ static void path_free(void *data)
        while (adapter->endpoints)
                release_endpoint(adapter->endpoints->data);
 
-#if 0
        while (adapter->players)
                media_player_destroy(adapter->players->data);
-#endif
 
        adapters = g_slist_remove(adapters, adapter);