Change to preload module after gst_init call

Change-Id: I2dbecf832745e0e5d15d7efbf820a08aab7b220f

diff --git a/packaging/mused.spec b/packaging/mused.spec
index e41f1086a16869f19f30d7d7b896a1386f452bb8..a289ac33ee43fd2104adc9d2530d960c682f92d3 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.100
+Version:    0.3.101
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/server/src/muse_server_private.c b/server/src/muse_server_private.c
index 75979950fc1b22153488d86d89d609872846d922..c0d382e11ccf06b308be2a6a45667ebf27f12d1f 100644 (file)
--- a/server/src/muse_server_private.c
+++ b/server/src/muse_server_private.c
@@ -855,20 +855,6 @@ void ms_init(char **argv)
        trace_end();
 #endif
 
-#ifdef MUSE_TTRACE_LOG
-       trace_begin("MUSE:preloading module");
-#endif
-       for (idx = 0; idx < ms_config_get_host_cnt(); idx++) {
-               if (0 == strncmp(ms_config_get_preloaded_value(idx), "yes", strlen("yes") + 1)) {
-                       g_module_symbol(ms_module_open(idx), CMD_DISPATCHER, (gpointer *)&cmd_dispatcher);
-                       if (cmd_dispatcher && cmd_dispatcher[MUSE_MODULE_COMMAND_INITIALIZE])
-                               cmd_dispatcher[MUSE_MODULE_COMMAND_INITIALIZE](NULL);
-               }
-       }
-#ifdef MUSE_TTRACE_LOG
-       trace_end();
-#endif
-
        ms_system_subscribe_external_event(ms_get_instance()->system);
 
        ms_diag_thread_create();
@@ -883,6 +869,21 @@ void ms_init(char **argv)
 
        ms_gst_init(argv);
 
+#ifdef MUSE_TTRACE_LOG
+       trace_begin("MUSE:preloading module");
+#endif
+       for (idx = 0; idx < ms_config_get_host_cnt(); idx++) {
+               if (0 == strncmp(ms_config_get_preloaded_value(idx), "yes", strlen("yes") + 1)) {
+                       g_module_symbol(ms_module_open(idx), CMD_DISPATCHER, (gpointer *)&cmd_dispatcher);
+                       if (cmd_dispatcher && cmd_dispatcher[MUSE_MODULE_COMMAND_INITIALIZE])
+                               cmd_dispatcher[MUSE_MODULE_COMMAND_INITIALIZE](NULL);
+               }
+       }
+
+#ifdef MUSE_TTRACE_LOG
+       trace_end();
+#endif
+
        LOGD("Leave");
 }