From acca0f19ad4b1fe77033edbe7a571531de87ef85 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 1 Jul 2014 16:34:09 +0200 Subject: [PATCH] Normalize function name. --- console/commands.c | 2 +- coreapi/linphonecall.c | 2 +- coreapi/linphonecore.h | 3 ++- coreapi/linphonecore_jni.cc | 2 +- gtk/incall_view.c | 6 +++--- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/console/commands.c b/console/commands.c index c22c963b0..3af324b7c 100644 --- a/console/commands.c +++ b/console/commands.c @@ -2438,7 +2438,7 @@ static void lpc_display_call_states(LinphoneCore *lc){ for(;elem!=NULL;elem=elem->next){ const char *flag; call=(LinphoneCall*)elem->data; - bool_t in_conference=linphone_call_params_local_conference_mode(linphone_call_get_current_params(call)); + bool_t in_conference=linphone_call_params_get_local_conference_mode(linphone_call_get_current_params(call)); tmp=linphone_call_get_remote_address_as_string (call); flag=in_conference ? "conferencing" : ""; flag=linphone_call_has_transfer_pending(call) ? "transfer pending" : flag; diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index e5dfbed58..042fe89c5 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -1404,7 +1404,7 @@ bool_t linphone_call_params_early_media_sending_enabled(const LinphoneCallParams /** * Returns true if the call is part of the locally managed conference. **/ -bool_t linphone_call_params_local_conference_mode(const LinphoneCallParams *cp){ +bool_t linphone_call_params_get_local_conference_mode(const LinphoneCallParams *cp){ return cp->in_conference; } diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index d1b6d1212..a4e91e2c3 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -389,7 +389,8 @@ LINPHONE_PUBLIC LinphoneMediaEncryption linphone_call_params_get_media_encryptio LINPHONE_PUBLIC void linphone_call_params_set_media_encryption(LinphoneCallParams *cp, LinphoneMediaEncryption e); LINPHONE_PUBLIC void linphone_call_params_enable_early_media_sending(LinphoneCallParams *cp, bool_t enabled); LINPHONE_PUBLIC bool_t linphone_call_params_early_media_sending_enabled(const LinphoneCallParams *cp); -LINPHONE_PUBLIC bool_t linphone_call_params_local_conference_mode(const LinphoneCallParams *cp); +#define linphone_call_params_local_conference_mode linphone_call_params_get_local_conference_mode /* Deprecated */ +LINPHONE_PUBLIC bool_t linphone_call_params_get_local_conference_mode(const LinphoneCallParams *cp); LINPHONE_PUBLIC void linphone_call_params_set_audio_bandwidth_limit(LinphoneCallParams *cp, int bw); LINPHONE_PUBLIC void linphone_call_params_destroy(LinphoneCallParams *cp); LINPHONE_PUBLIC bool_t linphone_call_params_low_bandwidth_enabled(const LinphoneCallParams *cp); diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index dd84cafba..3ab985981 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -2789,7 +2789,7 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCallParamsImpl_getVideoEnable } extern "C" jboolean Java_org_linphone_core_LinphoneCallParamsImpl_localConferenceMode(JNIEnv *env, jobject thiz, jlong lcp){ - return (jboolean)linphone_call_params_local_conference_mode((LinphoneCallParams*)lcp); + return (jboolean)linphone_call_params_get_local_conference_mode((LinphoneCallParams*)lcp); } extern "C" jstring Java_org_linphone_core_LinphoneCallParamsImpl_getCustomHeader(JNIEnv *env, jobject thiz, jlong lcp, jstring jheader_name){ diff --git a/gtk/incall_view.c b/gtk/incall_view.c index 0450f374c..979330123 100644 --- a/gtk/incall_view.c +++ b/gtk/incall_view.c @@ -442,7 +442,7 @@ void linphone_gtk_remove_in_call_view(LinphoneCall *call){ GtkWidget *w=(GtkWidget*)linphone_call_get_user_pointer (call); GtkWidget *main_window=linphone_gtk_get_main_window (); GtkWidget *nb=linphone_gtk_get_widget(main_window,"viewswitch"); - gboolean in_conf=linphone_call_params_local_conference_mode(linphone_call_get_current_params(call)); + gboolean in_conf=linphone_call_params_get_local_conference_mode(linphone_call_get_current_params(call)); int idx; g_return_if_fail(w!=NULL); idx=gtk_notebook_page_num(GTK_NOTEBOOK(nb),w); @@ -684,7 +684,7 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){ GtkWidget *callee=linphone_gtk_get_widget(callview,"in_call_uri"); GtkWidget *duration=linphone_gtk_get_widget(callview,"in_call_duration"); guint taskid=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(callview),"taskid")); - gboolean in_conf=linphone_call_params_local_conference_mode(linphone_call_get_current_params(call)); + gboolean in_conf=linphone_call_params_get_local_conference_mode(linphone_call_get_current_params(call)); GtkWidget *call_stats=(GtkWidget*)g_object_get_data(G_OBJECT(callview),"call_stats"); display_peer_name_in_label(callee,linphone_call_get_remote_address (call)); @@ -753,7 +753,7 @@ void linphone_gtk_in_call_view_terminate(LinphoneCall *call, const char *error_m if(callview==NULL) return; GtkWidget *status=linphone_gtk_get_widget(callview,"in_call_status"); guint taskid=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(callview),"taskid")); - gboolean in_conf=linphone_call_params_local_conference_mode(linphone_call_get_current_params(call)); + gboolean in_conf=linphone_call_params_get_local_conference_mode(linphone_call_get_current_params(call)); if (status==NULL) return; if (error_msg==NULL)