Disable storage_change_cb at wearable because there is not external storage

Change-Id: I632ea0c5293203c3e7b014f033d2b394aa459924

diff --git a/packaging/mused.spec b/packaging/mused.spec
index 1cb00fc..670c725 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.62
+Version:    0.3.63
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause

diff --git a/server/include/muse_server_config.h b/server/include/muse_server_config.h
index 08ab5bc..783d9c2 100644 (file)
--- a/server/include/muse_server_config.h
+++ b/server/include/muse_server_config.h
@@ -32,19 +32,20 @@ extern "C" {
 #define CONFFILE                                               SYSCONFDIR"/multimedia/mused.conf"
 #define MUSE_LOG                                               "muse:logfile"
 #define MUSE_LOCK                                              "muse:lockfile"
-#define MUSE_WATCHDOG_MIN_TIMEOUT              "muse:min_timeout"
-#define MUSE_WATCHDOG_MAX_TIMEOUT              "muse:max_timeout"
-#define MUSE_MEMORY_THRESHOLD                  "muse:memory_threshold"
-#define MUSE_ON_DEMAND_LAUNCH                  "muse:on_demand"
-#define MUSE_ON_DEMAND_MAX_IDLE_TIME                   "muse:on_demand_max_idle_time"
-#define MUSE_ON_DEMAND_MAX_IDLE_MEMORY         "muse:on_demand_max_idle_memory"
+#define MUSE_WATCHDOG_MIN_TIMEOUT                              "muse:min_timeout"
+#define MUSE_WATCHDOG_MAX_TIMEOUT                              "muse:max_timeout"
+#define MUSE_MEMORY_THRESHOLD                                  "muse:memory_threshold"
+#define MUSE_WATCH_EXTERNAL_STORAGE                            "muse:enable_watch_external_storage"
+#define MUSE_ON_DEMAND_LAUNCH                                  "muse:on_demand"
+#define MUSE_ON_DEMAND_MAX_IDLE_TIME                           "muse:on_demand_max_idle_time"
+#define MUSE_ON_DEMAND_MAX_IDLE_MEMORY                         "muse:on_demand_max_idle_memory"
 #define MUSE_GST                                               "muse:gstparam"
-#define INI_PARSER_COLON                               ":"
+#define INI_PARSER_COLON                                       ":"
 #define PATH                                                   "path"
 #define PRELOADED                                              "preloaded"
 #define TIMEOUT                                                        "timeout"
-#define DIABLE_WATCHDOG_API_INDEX              "disable_watchdog_api"
-#define MAX_INSTANCE                                   "max_instance"
+#define DISABLE_WATCHDOG_API_INDEX                             "disable_watchdog_api"
+#define MAX_INSTANCE                                           "max_instance"
 #define CAUTION_INSTANCE                                       "caution_instance"
 
 #define DEFAULT_WATCHDOG_MIN_TIMEOUT                           5
@@ -52,10 +53,10 @@ extern "C" {
 #define DEFAULT_DISPATCH_WATCHDOG_TIMEOUT                      10
 #define DEFAULT_MEMORY_LEAK_THRESHOLD                          50000 /* 50MB */
 #define DEFAULT_WATCHDOG_DISABLED_API_INDEX                    -1 /* Watchdog is applied to all dispatcher functions */
-#define DEFAULT_MAX_INSTANCE                                           -1 /* Unlimited */
-#define DEFAULT_CAUTION_INSTANCE                                       -1
-#define DEFAULT_ON_DEMAND_MAX_IDLE_TIME                        600 /* 10 minutes */
-#define DEFAULT_ON_DEMAND_MAX_IDLE_MEMORY              30000 /* 30MB */
+#define DEFAULT_MAX_INSTANCE                                   -1 /* Unlimited */
+#define DEFAULT_CAUTION_INSTANCE                               -1
+#define DEFAULT_ON_DEMAND_MAX_IDLE_TIME                                600 /* 10 minutes */
+#define DEFAULT_ON_DEMAND_MAX_IDLE_MEMORY                      30000 /* 30MB */
 
 
 typedef struct host_info {
@@ -76,6 +77,7 @@ typedef struct ms_config {
        int min_timeout;
        int max_timeout;
        int memory_threshold;
+       gboolean is_watch_external_storage_enabled;
        char *gst_param_str[MUSE_PARAM_MAX];
        int gst_param_cnt;
        host_info_t *host_infos[MUSE_MODULE_TYPE_MAX];

diff --git a/server/src/muse_server_config.c b/server/src/muse_server_config.c
index b160493..1de0d7c 100644 (file)
--- a/server/src/muse_server_config.c
+++ b/server/src/muse_server_config.c
@@ -93,6 +93,8 @@ static int _ms_config_parser(ms_config_t *conf)
 
        conf->memory_threshold = _ms_config_get_int(conf->muse_dict, MUSE_MEMORY_THRESHOLD, DEFAULT_MEMORY_LEAK_THRESHOLD);
 
+       conf->is_watch_external_storage_enabled = (gboolean)_ms_config_get_int(conf->muse_dict, MUSE_WATCH_EXTERNAL_STORAGE, FALSE);
+
        conf->is_on_demand = (gboolean)_ms_config_get_int(conf->muse_dict, MUSE_ON_DEMAND_LAUNCH, FALSE);
 
        conf->max_idle_time = _ms_config_get_int(conf->muse_dict, MUSE_ON_DEMAND_MAX_IDLE_TIME, DEFAULT_ON_DEMAND_MAX_IDLE_TIME);
@@ -159,7 +161,7 @@ static int _ms_config_parser(ms_config_t *conf)
                }
 
                /* disable_watchdog_api */
-               snprintf(key, MUSE_MSG_LEN_MAX, "%s%s%s", host, INI_PARSER_COLON, DIABLE_WATCHDOG_API_INDEX);
+               snprintf(key, MUSE_MSG_LEN_MAX, "%s%s%s", host, INI_PARSER_COLON, DISABLE_WATCHDOG_API_INDEX);
                conf->host_infos[host_idx]->disable_watchdog_api = _ms_config_get_int(conf->muse_dict, key, DEFAULT_WATCHDOG_DISABLED_API_INDEX);
 
                /* max instance */

diff --git a/server/src/muse_server_system.c b/server/src/muse_server_system.c
index 112b4b3..358aada 100644 (file)
--- a/server/src/muse_server_system.c
+++ b/server/src/muse_server_system.c
@@ -370,7 +370,8 @@ void ms_system_subscribe_external_event(ms_system_t *system)
 #endif
 
 #ifdef MUSE_USE_EXTERNAL_STORAGE_STATE_CHANGE
-       if (_ms_system_subscribe_external_storage_state_change(system) != MM_ERROR_NONE)
+       if (ms_get_instance()->conf->is_watch_external_storage_enabled == TRUE &&
+               _ms_system_subscribe_external_storage_state_change(system) != MM_ERROR_NONE)
                LOGE("Fail to subscribe external storage state change");
 #endif