From 4d6894901eccaa611eec33f83ca8ea62dc878455 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 20 Mar 2014 16:25:15 +0100 Subject: [PATCH] remove unused variable and update ms2 --- coreapi/misc.c | 2 +- mediastreamer2 | 2 +- tester/call_tester.c | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/coreapi/misc.c b/coreapi/misc.c index b2dd6774e..e87544502 100644 --- a/coreapi/misc.c +++ b/coreapi/misc.c @@ -1308,7 +1308,7 @@ int linphone_core_migrate_to_multi_transport(LinphoneCore *lc){ newtp.udp_port=port; newtp.tcp_port=port; newtp.tls_port=LC_SIP_TRANSPORT_RANDOM; - lp_config_set_string(lc->config, "sip","sip_random_port",NULL); //remove + lp_config_set_string(lc->config, "sip","sip_random_port",NULL); /*remove*/ linphone_core_set_sip_transports(lc,&newtp); } lp_config_set_int(lc->config,"sip","multi_transport_migration_done",1); diff --git a/mediastreamer2 b/mediastreamer2 index e858677a1..aceebbf52 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit e858677a1835ac46823b76d887aba6a7b5b50e44 +Subproject commit aceebbf52fd94430c1aa17941f3d184be97a5b34 diff --git a/tester/call_tester.c b/tester/call_tester.c index 3e7f23dda..515c7980e 100644 --- a/tester/call_tester.c +++ b/tester/call_tester.c @@ -891,12 +891,8 @@ static void call_waiting_indication_with_param(bool_t enable_caller_privacy) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc"); LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc"); - stats initial_marie_stat; - stats initial_pauline_stat; - stats initial_laure_stat; char hellopath[256]; MSList *iterator; - LinphoneCall* marie_call_pauline; LinphoneCall* pauline_called_by_marie; LinphoneCall* pauline_called_by_laure=NULL; LinphoneCallParams *laure_params=linphone_core_create_default_call_parameters(laure->lc); @@ -910,13 +906,8 @@ static void call_waiting_indication_with_param(bool_t enable_caller_privacy) { lcs=ms_list_append(lcs,laure->lc); CU_ASSERT_TRUE(call_with_caller_params(marie,pauline,marie_params)); - marie_call_pauline=linphone_core_get_current_call(marie->lc); pauline_called_by_marie=linphone_core_get_current_call(pauline->lc); - initial_marie_stat=marie->stat; - initial_pauline_stat=pauline->stat; - initial_laure_stat=laure->stat; - /*use playfile for callee to avoid locking on capture card*/ linphone_core_use_files (laure->lc,TRUE);