diff options
| author | Regis Merlino <regis.merlino@intel.com> | 2013-09-04 11:09:27 +0200 |
|---|---|---|
| committer | Regis Merlino <regis.merlino@intel.com> | 2013-09-04 11:09:27 +0200 |
| commit | 9cd2537fc4ec61e25228875976254e2e9f3e8c9b (patch) | |
| tree | 944fec724c156aec0baaa3b22e7818933e23b40c | |
| parent | 43a885f028eb0d1a010e9c77f8fa1f70a2712ffd (diff) | |
| download | dleyna-core-9cd2537fc4ec61e25228875976254e2e9f3e8c9b.tar.gz | |
[Control Point] Get version from the control point lib
Signed-off-by: Regis Merlino <regis.merlino@intel.com>
| -rw-r--r-- | libdleyna/core/control-point.h | 2 | ||||
| -rw-r--r-- | libdleyna/core/main-loop.c | 3 | ||||
| -rw-r--r-- | libdleyna/core/main-loop.h | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libdleyna/core/control-point.h b/libdleyna/core/control-point.h index f8e227a..0385715 100644 --- a/libdleyna/core/control-point.h +++ b/libdleyna/core/control-point.h @@ -38,6 +38,7 @@ typedef void (*dleyna_control_point_free_t)(void); typedef const gchar *(*dleyna_control_point_server_name_t)(void); typedef const gchar *(*dleyna_control_point_server_introspection_t)(void); typedef const gchar *(*dleyna_control_point_root_introspection_t)(void); +typedef const gchar *(*dleyna_control_point_get_version_t)(void); typedef gboolean (*dleyna_control_point_start_service_t)( dleyna_connector_id_t connection); @@ -52,6 +53,7 @@ struct dleyna_control_point_t_ { dleyna_control_point_root_introspection_t root_introspection; dleyna_control_point_start_service_t start_service; dleyna_control_point_stop_service_t stop_service; + dleyna_control_point_get_version_t get_version; }; #endif /* DLEYNA_CONTROL_POINT_H__ */ diff --git a/libdleyna/core/main-loop.c b/libdleyna/core/main-loop.c index 9a78666..3d80402 100644 --- a/libdleyna/core/main-loop.c +++ b/libdleyna/core/main-loop.c @@ -120,7 +120,6 @@ static void prv_context_free(void) } int dleyna_main_loop_start(const char *server, - const char *version, const dleyna_control_point_t *control_point, gpointer user_data) { @@ -130,7 +129,7 @@ int dleyna_main_loop_start(const char *server, g_type_init(); #endif - dleyna_log_init(server, version); + dleyna_log_init(server, control_point->get_version()); if (!prv_context_init(server, control_point)) goto out; diff --git a/libdleyna/core/main-loop.h b/libdleyna/core/main-loop.h index 71d49be..7a31a7b 100644 --- a/libdleyna/core/main-loop.h +++ b/libdleyna/core/main-loop.h @@ -27,7 +27,6 @@ #include "control-point.h" int dleyna_main_loop_start(const char *server, - const char *version, const dleyna_control_point_t *control_point, gpointer user_data); void dleyna_main_loop_quit(void); |