Commit ca908304 authored by Gautier Pelloux-Prayer's avatar Gautier Pelloux-Prayer
Browse files

msvoip.c: dont uninit srtp twice

parent 7b3f7cb2
...@@ -254,9 +254,9 @@ static MSWebCamDesc * ms_web_cam_descs[]={ ...@@ -254,9 +254,9 @@ static MSWebCamDesc * ms_web_cam_descs[]={
void ms_factory_init_voip(MSFactory *obj){ void ms_factory_init_voip(MSFactory *obj){
MSSndCardManager *cm; MSSndCardManager *cm;
int i; int i;
if (obj->voip_initd) return; if (obj->voip_initd) return;
ms_srtp_init(); ms_srtp_init();
/* register builtin VoIP MSFilter's */ /* register builtin VoIP MSFilter's */
...@@ -321,11 +321,11 @@ void ms_factory_uninit_voip(MSFactory *obj){ ...@@ -321,11 +321,11 @@ void ms_factory_uninit_voip(MSFactory *obj){
obj->wbcmanager = NULL; obj->wbcmanager = NULL;
ms_video_presets_manager_destroy(obj->video_presets_manager); ms_video_presets_manager_destroy(obj->video_presets_manager);
#endif #endif
ms_srtp_shutdown();
obj->voip_initd = FALSE; obj->voip_initd = FALSE;
} }
ms_srtp_shutdown();
} }
MSFactory *ms_factory_new_with_voip(void){ MSFactory *ms_factory_new_with_voip(void){
MSFactory *f = ms_factory_new(); MSFactory *f = ms_factory_new();
ms_factory_init_voip(f); ms_factory_init_voip(f);
...@@ -361,19 +361,17 @@ void ms_offer_answer_context_destroy(MSOfferAnswerContext *ctx){ ...@@ -361,19 +361,17 @@ void ms_offer_answer_context_destroy(MSOfferAnswerContext *ctx){
static int ms_voip_ref=0; static int ms_voip_ref=0;
void ms_voip_init(){ void ms_voip_init(){
if (ms_voip_ref++ >0 ) { if (ms_voip_ref++ >0 ) {
ms_message ("Skiping ms_voip_init, because [%i] ref",ms_voip_ref); ms_message ("Skipping ms_voip_init, because [%i] ref",ms_voip_ref);
return; return;
} }
ms_srtp_init();
ms_factory_init_voip(ms_factory_get_fallback()); ms_factory_init_voip(ms_factory_get_fallback());
} }
void ms_voip_exit(){ void ms_voip_exit(){
if (--ms_voip_ref >0 ) { if (--ms_voip_ref >0 ) {
ms_message ("Skiping ms_voip_exit, still [%i] ref",ms_voip_ref); ms_message ("Skipping ms_voip_exit, still [%i] ref",ms_voip_ref);
return; return;
} }
ms_srtp_shutdown();
ms_factory_uninit_voip(ms_factory_get_fallback()); ms_factory_uninit_voip(ms_factory_get_fallback());
} }
......
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