Commit 9ddcbf97 authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Moved back devices_info in voip instead of base

parent d185d199
......@@ -52,7 +52,6 @@ set(BASE_SOURCE_FILES_C
otherfilters/join.c
otherfilters/tee.c
otherfilters/void.c
audiofilters/devices.c
)
if(ANDROID)
list(APPEND BASE_SOURCE_FILES_C utils/msjava.c)
......@@ -133,6 +132,7 @@ set(VOIP_SOURCE_FILES_C
audiofilters/alaw.c
audiofilters/audiomixer.c
audiofilters/chanadapt.c
audiofilters/devices.c
audiofilters/dtmfgen.c
audiofilters/equalizer.c
audiofilters/flowcontrol.c
......
......@@ -239,7 +239,7 @@ MSDevicesInfo *ms_devices_info_new(void) {
}
void ms_devices_info_free(MSDevicesInfo *devices_info) {
bctbx_list_free(devices_info->sound_devices_descriptions);
if (devices_info->sound_devices_descriptions) bctbx_list_free(devices_info->sound_devices_descriptions);
ms_free(devices_info);
}
......
......@@ -216,8 +216,6 @@ void ms_factory_init(MSFactory *obj){
tags = ms_factory_get_platform_tags_as_string(obj);
ms_message("ms_factory_init() done: platform_tags=%s", tags);
ms_free(tags);
obj->devices_info = ms_devices_info_new();
}
......@@ -931,7 +929,6 @@ void ms_factory_destroy(MSFactory *factory) {
bctbx_list_for_each(factory->platform_tags, ms_free);
factory->platform_tags = bctbx_list_free(factory->platform_tags);
if (factory->plugins_dir) ms_free(factory->plugins_dir);
if (factory->devices_info) ms_devices_info_free(factory->devices_info);
ms_free(factory);
if (factory == fallback_factory) fallback_factory = NULL;
}
......
......@@ -261,6 +261,7 @@ void ms_factory_init_voip(MSFactory *obj){
if (obj->voip_initd) return;
ms_srtp_init();
obj->devices_info = ms_devices_info_new();
/* register builtin VoIP MSFilter's */
for (i=0;ms_voip_filter_descs[i]!=NULL;i++){
......@@ -305,8 +306,6 @@ void ms_factory_init_voip(MSFactory *obj){
}
#endif
obj->devices_info = ms_devices_info_new();
#if defined(ANDROID) && defined (VIDEO_ENABLED)
{
MSDevicesInfo *devices = ms_factory_get_devices_info(obj);
......
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