diff options
| author | Regis Merlino <regis.merlino@intel.com> | 2013-07-23 11:32:41 +0200 |
|---|---|---|
| committer | Ludovic Ferrandis <ludovic.ferrandis@intel.com> | 2013-07-23 15:06:27 +0200 |
| commit | 5c88fc3d20de52675111e19f9ac61aa1303534a6 (patch) | |
| tree | 1c65c28e2ff211cd2514f397a9aa54a504ec5458 /libdleyna | |
| parent | bea777685ef0638ee3c5f289bceab20fdba585ad (diff) | |
| download | dleyna-renderer-5c88fc3d20de52675111e19f9ac61aa1303534a6.tar.gz | |
[Server] Update following the publish_object() connector API change
Signed-off-by: Regis Merlino <regis.merlino@intel.com>
Diffstat (limited to 'libdleyna')
| -rw-r--r-- | libdleyna/renderer/device.c | 2 | ||||
| -rw-r--r-- | libdleyna/renderer/server.c | 26 | ||||
| -rw-r--r-- | libdleyna/renderer/server.h | 2 |
3 files changed, 23 insertions, 7 deletions
diff --git a/libdleyna/renderer/device.c b/libdleyna/renderer/device.c index d01fec2..af19da2 100644 --- a/libdleyna/renderer/device.c +++ b/libdleyna/renderer/device.c @@ -745,7 +745,7 @@ static GUPnPServiceProxyAction *prv_declare(dleyna_service_task_t *task, device->connection, device->path, FALSE, - i, + dlr_renderer_get_interface_name(i), table + i); if (!device->ids[i]) { diff --git a/libdleyna/renderer/server.c b/libdleyna/renderer/server.c index ea18689..15a5ed7 100644 --- a/libdleyna/renderer/server.c +++ b/libdleyna/renderer/server.c @@ -386,7 +386,7 @@ static const dleyna_connector_dispatch_cb_t g_root_vtables[1] = { static const dleyna_connector_dispatch_cb_t g_server_vtables[DLR_INTERFACE_INFO_MAX] = { - /* MUST be in the exact same order as g_msu_server_introspection */ + /* MUST be in the exact same order as g_server_introspection */ prv_props_method_call, prv_dlr_device_method_call, prv_dlr_player_method_call, @@ -394,6 +394,20 @@ static const dleyna_connector_dispatch_cb_t prv_renderer_device_method_call }; +static const gchar *g_server_interfaces[DLR_INTERFACE_INFO_MAX] = { + /* MUST be in the exact same order as g_server_introspection */ + DLR_INTERFACE_PROPERTIES, + DLR_INTERFACE_SERVER, + DLR_INTERFACE_PLAYER, + DLEYNA_INTERFACE_PUSH_HOST, + DLEYNA_SERVER_INTERFACE_RENDERER_DEVICE +}; + +const gchar *dlr_renderer_get_interface_name(guint index) +{ + return g_server_interfaces[index]; +} + const dleyna_connector_t *dlr_renderer_get_connector(void) { return g_context.connector; @@ -934,11 +948,11 @@ static gboolean prv_control_point_start_service( g_context.connection = connection; g_context.dlr_id = g_context.connector->publish_object( - connection, - DLEYNA_SERVER_OBJECT, - TRUE, - 0, - g_root_vtables); + connection, + DLEYNA_SERVER_OBJECT, + TRUE, + DLEYNA_SERVER_INTERFACE_MANAGER, + g_root_vtables); if (g_context.dlr_id) g_context.upnp = dlr_upnp_new(connection, diff --git a/libdleyna/renderer/server.h b/libdleyna/renderer/server.h index ad770e9..3951b17 100644 --- a/libdleyna/renderer/server.h +++ b/libdleyna/renderer/server.h @@ -37,4 +37,6 @@ dleyna_task_processor_t *dlr_renderer_service_get_task_processor(void); const dleyna_connector_t *dlr_renderer_get_connector(void); +const gchar *dlr_renderer_get_interface_name(guint index); + #endif /* DLR_SERVER_H__ */ |