summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegis Merlino <regis.merlino@intel.com>2013-02-27 09:12:36 +0100
committerRegis Merlino <regis.merlino@intel.com>2013-02-27 09:12:36 +0100
commit1a9227c7712c4b75727d613e4ce6d30f2e9b4390 (patch)
treee928929598f4698d3fbaa26af1b1d1f2f29d5c1a
parent38e71f8a0dbdd2183b57c8f62e945021e2cd0ae4 (diff)
downloaddleyna-server-1a9227c7712c4b75727d613e4ce6d30f2e9b4390.tar.gz
[Server] Rename control point "finalize" function to "stop_service"
Signed-off-by: Regis Merlino <regis.merlino@intel.com>
-rw-r--r--lib/server.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/lib/server.c b/lib/server.c
index f09e238..6cfa036 100644
--- a/lib/server.c
+++ b/lib/server.c
@@ -1130,6 +1130,20 @@ out:
return retval;
}
+static void prv_control_point_stop_service(void)
+{
+ dls_upnp_unsubscribe(g_context.upnp);
+
+ dls_upnp_delete(g_context.upnp);
+
+ if (g_context.connection) {
+ if (g_context.dls_id)
+ g_context.connector->unpublish_object(
+ g_context.connection,
+ g_context.dls_id);
+ }
+}
+
static void prv_control_point_initialize(const dleyna_connector_t *connector,
dleyna_task_processor_t *processor,
dleyna_settings_t *settings)
@@ -1148,20 +1162,6 @@ static void prv_control_point_initialize(const dleyna_connector_t *connector,
g_set_prgname(DLS_PRG_NAME);
}
-static void prv_control_point_finalize(void)
-{
- dls_upnp_unsubscribe(g_context.upnp);
-
- dls_upnp_delete(g_context.upnp);
-
- if (g_context.connection) {
- if (g_context.dls_id)
- g_context.connector->unpublish_object(
- g_context.connection,
- g_context.dls_id);
- }
-}
-
static void prv_control_point_free(void)
{
if (g_context.watchers)
@@ -1185,12 +1185,12 @@ static const gchar *prv_control_point_root_introspection(void)
static const dleyna_control_point_t g_control_point = {
prv_control_point_initialize,
- prv_control_point_finalize,
prv_control_point_free,
prv_control_point_server_name,
prv_control_point_server_introspection,
prv_control_point_root_introspection,
- prv_control_point_start_service
+ prv_control_point_start_service,
+ prv_control_point_stop_service
};
const dleyna_control_point_t *dleyna_control_point_get_server(void)