Commit 85715fe2 authored by Ghislain MARY's avatar Ghislain MARY

Perform mediastreamer plugins init after VOIP init.

parent 83267230
...@@ -165,7 +165,7 @@ MS2_PUBLIC MSList *ms_list_copy(const MSList *list); ...@@ -165,7 +165,7 @@ MS2_PUBLIC MSList *ms_list_copy(const MSList *list);
* Helper macro for backward compatibility. * Helper macro for backward compatibility.
* Use ms_base_init() and ms_voip_init() instead. * Use ms_base_init() and ms_voip_init() instead.
*/ */
#define ms_init() ms_base_init(), ms_voip_init() #define ms_init() ms_base_init(), ms_voip_init(), ms_plugins_init()
/** /**
* Helper macro for backward compatibility. * Helper macro for backward compatibility.
...@@ -188,6 +188,14 @@ MS2_PUBLIC void ms_base_init(void); ...@@ -188,6 +188,14 @@ MS2_PUBLIC void ms_base_init(void);
*/ */
MS2_PUBLIC void ms_voip_init(void); MS2_PUBLIC void ms_voip_init(void);
/**
* Load the plugins from the default plugin directory.
*
* This is just a wrapper around ms_load_plugins().
* This must be called after ms_base_init() and after ms_voip_init().
*/
MS2_PUBLIC void ms_plugins_init(void);
/** /**
* Load plugins from a specific directory. * Load plugins from a specific directory.
* This method basically loads all libraries in the specified directory and attempts to call a C function called * This method basically loads all libraries in the specified directory and attempts to call a C function called
......
...@@ -474,10 +474,6 @@ void ms_base_init(){ ...@@ -474,10 +474,6 @@ void ms_base_init(){
for (i=0;ms_base_filter_descs[i]!=NULL;i++){ for (i=0;ms_base_filter_descs[i]!=NULL;i++){
ms_filter_register(ms_base_filter_descs[i]); ms_filter_register(ms_base_filter_descs[i]);
} }
#ifdef PACKAGE_PLUGINS_DIR
ms_message("Loading ms plugins from [%s]",PACKAGE_PLUGINS_DIR);
ms_load_plugins(PACKAGE_PLUGINS_DIR);
#endif
ms_message("ms_base_init() done"); ms_message("ms_base_init() done");
} }
...@@ -487,6 +483,13 @@ void ms_base_exit(){ ...@@ -487,6 +483,13 @@ void ms_base_exit(){
ms_unload_plugins(); ms_unload_plugins();
} }
void ms_plugins_init(void) {
#ifdef PACKAGE_PLUGINS_DIR
ms_message("Loading ms plugins from [%s]",PACKAGE_PLUGINS_DIR);
ms_load_plugins(PACKAGE_PLUGINS_DIR);
#endif
}
void ms_sleep(int seconds){ void ms_sleep(int seconds){
#ifdef WIN32 #ifdef WIN32
Sleep(seconds*1000); Sleep(seconds*1000);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment