Commit 0f523615 authored by Simon Morlat's avatar Simon Morlat

set correct name to constructor of LinphoneCoreVTable

parent 0825195d
......@@ -168,7 +168,7 @@ TunnelManager::TunnelManager(LinphoneCore* lc) :
mTransportFactories.video_rtcp_func_data=this;
mTransportFactories.video_rtp_func=sCreateRtpTransport;
mTransportFactories.video_rtp_func_data=this;
mVTable = linphone_vtable_new();
mVTable = linphone_core_v_table_new();
mVTable->network_reachable = networkReachableCb;
linphone_core_add_listener(mCore, mVTable);
}
......@@ -179,7 +179,7 @@ TunnelManager::~TunnelManager(){
}
stopClient();
linphone_core_remove_listener(mCore, mVTable);
linphone_vtable_destroy(mVTable);
linphone_core_v_table_destroy(mVTable);
}
void TunnelManager::doRegistration(){
......
......@@ -1436,7 +1436,7 @@ void linphone_configuring_terminated(LinphoneCore *lc, LinphoneConfiguringState
static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtable, LpConfig *config, void * userdata)
{
const char *remote_provisioning_uri = NULL;
LinphoneCoreVTable* local_vtable= linphone_vtable_new();
LinphoneCoreVTable* local_vtable= linphone_core_v_table_new();
ms_message("Initializing LinphoneCore %s", linphone_core_get_version());
memset (lc, 0, sizeof (LinphoneCore));
lc->config=lp_config_ref(config);
......@@ -6180,7 +6180,7 @@ static void linphone_core_uninit(LinphoneCore *lc)
if (liblinphone_serialize_logs == TRUE) {
ortp_set_log_thread_id(0);
}
ms_list_free_with_data(lc->vtables,(void (*)(void *))linphone_vtable_destroy);
ms_list_free_with_data(lc->vtables,(void (*)(void *))linphone_core_v_table_destroy);
}
static void set_network_reachable(LinphoneCore* lc,bool_t isReachable, time_t curtime){
......@@ -6916,11 +6916,11 @@ int linphone_payload_type_get_channels(const LinphonePayloadType *pt) {
return pt->channels;
}
LinphoneCoreVTable *linphone_vtable_new() {
LinphoneCoreVTable *linphone_core_v_table_new() {
return ms_new0(LinphoneCoreVTable,1);
}
void linphone_vtable_destroy(LinphoneCoreVTable* table) {
void linphone_core_v_table_destroy(LinphoneCoreVTable* table) {
ms_free(table);
}
#define NOTIFY_IF_EXIST(function_name) \
......
......@@ -1731,16 +1731,16 @@ typedef struct _LinphoneCoreVTable{
} LinphoneCoreVTable;
/**
* Instantiate a vtable with all argument set to NULL
* Instantiate a vtable with all arguments set to NULL
* @returns newly allocated vtable
*/
LINPHONE_PUBLIC LinphoneCoreVTable *linphone_vtable_new();
LINPHONE_PUBLIC LinphoneCoreVTable *linphone_core_v_table_new();
/**
* destroy a vtable.
* Destroy a vtable.
* @param vtable to be destroyed
*/
LINPHONE_PUBLIC void linphone_vtable_destroy(LinphoneCoreVTable* table);
LINPHONE_PUBLIC void linphone_core_v_table_destroy(LinphoneCoreVTable* table);
/**
* @}
......@@ -1748,8 +1748,8 @@ LINPHONE_PUBLIC void linphone_vtable_destroy(LinphoneCoreVTable* table);
typedef struct _LCCallbackObj
{
LinphoneCoreCbFunc _func;
void * _user_data;
LinphoneCoreCbFunc _func;
void * _user_data;
}LCCallbackObj;
......
......@@ -226,7 +226,7 @@ static void text_message_with_credential_from_auth_cb_auth_info_requested(Linpho
static void text_message_with_credential_from_auth_cb(void) {
char* to;
LinphoneChatRoom* chat_room;
LinphoneCoreVTable* vtable = linphone_vtable_new();
LinphoneCoreVTable* vtable = linphone_core_v_table_new();
LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
text_message_with_credential_from_auth_cb_auth_info=linphone_auth_info_clone((LinphoneAuthInfo*)(linphone_core_get_auth_info_list(marie->lc)->data));
......
......@@ -36,7 +36,7 @@ static LinphoneCoreManager* create_lcm_with_auth(unsigned int with_auth) {
LinphoneCoreManager* mgr=linphone_core_manager_new(NULL);
if (with_auth) {
LinphoneCoreVTable* vtable = linphone_vtable_new();
LinphoneCoreVTable* vtable = linphone_core_v_table_new();
vtable->auth_info_requested=auth_info_requested;
linphone_core_add_listener(mgr->lc,vtable);
}
......@@ -314,7 +314,7 @@ static void ha1_authenticated_register(){
static void authenticated_register_with_no_initial_credentials(){
LinphoneCoreManager *mgr;
LinphoneCoreVTable* vtable = linphone_vtable_new();
LinphoneCoreVTable* vtable = linphone_core_v_table_new();
stats* counters;
char route[256];
......
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