From dcafb75f869aee37e9df281e8b67ddada015f849 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 4 Oct 2011 21:05:26 +0200 Subject: [PATCH] fix function call names --- coreapi/linphonecore.c | 3 +-- coreapi/linphonecore.h | 12 +++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index db4088153..e55235eff 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -4237,7 +4237,6 @@ LinphoneCallParams *linphone_core_create_default_call_parameters(LinphoneCore *l LinphoneCallParams *p=ms_new0(LinphoneCallParams,1); p->has_video=linphone_core_video_enabled(lc); p->media_encryption=linphone_core_get_media_encryption(lc); - ms_message("%s : %d", __FUNCTION__, p->media_encryption); return p; } @@ -4358,7 +4357,7 @@ void linphone_core_set_srtp_enabled(LinphoneCore *lc, bool_t enabled) { lp_config_set_int(lc->config,"sip","srtp",(int)enabled); } -void linphone_core_set_media_encryption_enabled(LinphoneCore *lc, enum LinphoneMediaEncryption menc) { +void linphone_core_set_media_encryption(LinphoneCore *lc, enum LinphoneMediaEncryption menc) { if (menc == LinphoneMediaEncryptionSRTP) lp_config_set_string(lc->config,"sip","media_encryption","srtp"); else if (menc == LinphoneMediaEncryptionZRTP) diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index c2c02f0e5..d849933cb 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -263,6 +263,10 @@ float linphone_call_get_play_volume(LinphoneCall *call); float linphone_call_get_record_volume(LinphoneCall *call); float linphone_call_get_current_quality(LinphoneCall *call); float linphone_call_get_average_quality(LinphoneCall *call); +bool_t linphone_call_are_all_streams_encrypted(LinphoneCall *call); +const char* linphone_call_get_authentication_token(LinphoneCall *call); +bool_t linphone_call_get_authentication_token_verified(LinphoneCall *call); +void linphone_call_send_vfu_request(LinphoneCall *call); void *linphone_call_get_user_pointer(LinphoneCall *call); void linphone_call_set_user_pointer(LinphoneCall *call, void *user_pointer); /** @@ -1011,15 +1015,9 @@ LinphoneGlobalState linphone_core_get_global_state(const LinphoneCore *lc); */ void linphone_core_refresh_registers(LinphoneCore* lc); - -void linphone_call_send_vfu_request(LinphoneCall *call); - /* Path to the file storing secrets cache */ void linphone_core_set_zrtp_secrets_file(LinphoneCore *lc, const char* file); -bool_t linphone_call_are_all_streams_encrypted(LinphoneCall *call); -const char* linphone_call_get_authentication_token(LinphoneCall *call); -bool_t linphone_call_get_authentication_token_verified(LinphoneCall *call); const LinphoneCall* linphone_core_find_call_from_uri(LinphoneCore *lc, const char *uri); @@ -1033,7 +1031,7 @@ int linphone_core_leave_conference(LinphoneCore *lc); int linphone_core_terminate_conference(LinphoneCore *lc); int linphone_core_get_conference_size(LinphoneCore *lc); -void linphone_core_set_media_encryption_enabled(LinphoneCore *lc, enum LinphoneMediaEncryption menc); +void linphone_core_set_media_encryption(LinphoneCore *lc, enum LinphoneMediaEncryption menc); enum LinphoneMediaEncryption linphone_core_get_media_encryption(LinphoneCore *lc); bool_t linphone_core_is_media_encryption_mandatory(LinphoneCore *lc);