diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2013-11-04 13:10:02 +0200 |
|---|---|---|
| committer | rmerlino <regis.merlino@intel.com> | 2013-12-12 14:26:34 +0100 |
| commit | 46c830e2b4fb023a51d59b81792dffe22000faff (patch) | |
| tree | 02ffbfd4eb31089592113fe10488f67b6cfc71cf | |
| parent | b59b61ede6283138096327a06b5ef17cbc23288e (diff) | |
| download | dleyna-core-46c830e2b4fb023a51d59b81792dffe22000faff.tar.gz | |
[settings] Add "push-host-port" setting
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
| -rw-r--r-- | libdleyna/core/settings.c | 22 | ||||
| -rw-r--r-- | libdleyna/core/settings.h | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/libdleyna/core/settings.c b/libdleyna/core/settings.c index 71f680d..d97d3a2 100644 --- a/libdleyna/core/settings.c +++ b/libdleyna/core/settings.c @@ -36,6 +36,7 @@ struct dleyna_settings_t_ { gboolean never_quit; gchar *connector_name; guint port; + guint push_host_port; /* Log section */ dleyna_log_type_t log_type; @@ -50,6 +51,7 @@ struct dleyna_settings_t_ { #define DLEYNA_SETTINGS_KEY_NEVER_QUIT "never-quit" #define DLEYNA_SETTINGS_KEY_CONNECTOR_NAME "connector-name" #define DLEYNA_SETTINGS_KEY_PORT "port" +#define DLEYNA_SETTINGS_KEY_PUSH_HOST_PORT "push-host-port" #define DLEYNA_SETTINGS_GROUP_LOG "log" #define DLEYNA_SETTINGS_KEY_LOG_TYPE "log-type" @@ -80,6 +82,8 @@ do { \ DLEYNA_LOG_DEBUG_NL(); \ DLEYNA_LOG_INFO("Port: %u", (settings)->port);\ DLEYNA_LOG_DEBUG_NL(); \ + DLEYNA_LOG_INFO("Push host port: %u", (settings)->push_host_port);\ + DLEYNA_LOG_DEBUG_NL(); \ \ DLEYNA_LOG_INFO("[Logging settings]"); \ DLEYNA_LOG_INFO("Log Type : %d", (settings)->log_type); \ @@ -291,6 +295,18 @@ static void prv_read_keys(dleyna_settings_t *settings) error = NULL; } + u_val = g_key_file_get_uint64(keyfile, + DLEYNA_SETTINGS_GROUP_GENERAL, + DLEYNA_SETTINGS_KEY_PUSH_HOST_PORT, + &error); + + if (error == NULL) { + settings->push_host_port = (guint)u_val; + } else { + g_error_free(error); + error = NULL; + } + int_val = g_key_file_get_integer(keyfile, DLEYNA_SETTINGS_GROUP_LOG, DLEYNA_SETTINGS_KEY_LOG_TYPE, @@ -352,6 +368,7 @@ static void prv_init_default(dleyna_settings_t *settings) settings->connector_name = g_strdup( DLEYNA_SETTINGS_DEFAULT_CONNECTOR_NAME); settings->port = 0; + settings->push_host_port = 0; settings->log_type = DLEYNA_SETTINGS_DEFAULT_LOG_TYPE; settings->log_level = DLEYNA_SETTINGS_DEFAULT_LOG_LEVEL; @@ -449,6 +466,11 @@ guint dleyna_settings_port(dleyna_settings_t *settings) return settings->port; } +guint dleyna_settings_push_host_port(dleyna_settings_t *settings) +{ + return settings->push_host_port; +} + static void prv_save_settings_to_file(dleyna_settings_t *settings, GError **error) { diff --git a/libdleyna/core/settings.h b/libdleyna/core/settings.h index 3575242..a7603c9 100644 --- a/libdleyna/core/settings.h +++ b/libdleyna/core/settings.h @@ -37,6 +37,8 @@ gboolean dleyna_settings_is_never_quit(dleyna_settings_t *settings); guint dleyna_settings_port(dleyna_settings_t *settings); +guint dleyna_settings_push_host_port(dleyna_settings_t *settings); + void dleyna_settings_set_never_quit(dleyna_settings_t *settings, gboolean never_quit, GError **error); |