mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing cb named qrcode_founded to qrcode_found

Browse source
This commit is contained in:
Erwan Croze 2018-04-10 10:06:44 +02:00
parent 2b578b4ef9
commit 451f75275c
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
coreapi/linphonecore.c
View file

@ -450,12 +450,12 @@ void linphone_core_cbs_set_chat_room_state_changed (LinphoneCoreCbs *cbs, Linpho
cbs->vtable->chat_room_state_changed = cb;
}
LinphoneCoreCbsQrcodeFoundedCb linphone_core_cbs_get_qrcode_founded(LinphoneCoreCbs *cbs) {
return cbs->vtable->qrcode_founded;
LinphoneCoreCbsQrcodeFoundCb linphone_core_cbs_get_qrcode_found(LinphoneCoreCbs *cbs) {
return cbs->vtable->qrcode_found;
}
void linphone_core_cbs_set_qrcode_founded(LinphoneCoreCbs *cbs, LinphoneCoreCbsQrcodeFoundedCb cb) {
cbs->vtable->qrcode_founded = cb;
void linphone_core_cbs_set_qrcode_found(LinphoneCoreCbs *cbs, LinphoneCoreCbsQrcodeFoundCb cb) {
cbs->vtable->qrcode_found = cb;
}
void linphone_core_cbs_set_ec_calibration_result(LinphoneCoreCbs *cbs, LinphoneCoreCbsEcCalibrationResultCb cb) {
@ -4795,9 +4795,9 @@ static void video_filter_callback(void *userdata, struct _MSFilter *f, unsigned
}
case MS_QRCODE_READER_QRCODE_FOUND: {
LinphoneCore *lc = (LinphoneCore *)userdata;
if (linphone_core_cbs_get_qrcode_founded(linphone_core_get_current_callbacks(lc)) != NULL) {
if (linphone_core_cbs_get_qrcode_found(linphone_core_get_current_callbacks(lc)) != NULL) {
char* result = ms_strdup((const char*)arg);
linphone_core_notify_qrcode_founded(lc, result);
linphone_core_notify_qrcode_found(lc, result);
ms_free(result);
}
break;
@ -5053,7 +5053,7 @@ bool_t linphone_core_qrcode_video_preview_enabled(const LinphoneCore *lc) {
return lc->video_conf.qrcode_decoder;
}
void linphone_core_set_qrcode_decode_rect(LinphoneCore *lc, const unsigned int x, const unsigned int y, const unsigned int w, const unsigned int h) {
void linphone_core_set_qrcode_decode_rect(LinphoneCore *lc, const int x, const int y, const int w, const int h) {
if (lc) {
MSRect rect;
rect.x = x;

2
coreapi/private_functions.h
View file

@ -510,7 +510,7 @@ void linphone_core_notify_friend_list_removed(LinphoneCore *lc, LinphoneFriendLi
void linphone_core_notify_call_created(LinphoneCore *lc, LinphoneCall *call);
void linphone_core_notify_version_update_check_result_received(LinphoneCore *lc, LinphoneVersionUpdateCheckResult result, const char *version, const char *url);
void linphone_core_notify_chat_room_state_changed (LinphoneCore *lc, LinphoneChatRoom *cr, LinphoneChatRoomState state);
void linphone_core_notify_qrcode_founded(LinphoneCore *lc, const char *result);
void linphone_core_notify_qrcode_found(LinphoneCore *lc, const char *result);
void linphone_core_notify_ec_calibration_result(LinphoneCore *lc, LinphoneEcCalibratorStatus status, int delay_ms);
void linphone_core_notify_ec_calibration_audio_init(LinphoneCore *lc);
void linphone_core_notify_ec_calibration_audio_uninit(LinphoneCore *lc);

4
coreapi/vtables.c
View file

@ -298,8 +298,8 @@ void linphone_core_notify_chat_room_state_changed (LinphoneCore *lc, LinphoneCha
cleanup_dead_vtable_refs(lc);
}
void linphone_core_notify_qrcode_founded(LinphoneCore *lc, const char *result) {
NOTIFY_IF_EXIST(qrcode_founded, lc, result);
void linphone_core_notify_qrcode_found(LinphoneCore *lc, const char *result) {
NOTIFY_IF_EXIST(qrcode_found, lc, result);
cleanup_dead_vtable_refs(lc);
}

2
include/linphone/callbacks.h
View file

@ -410,7 +410,7 @@ typedef void (*LinphoneCoreCbsChatRoomStateChangedCb) (LinphoneCore *lc, Linphon
* @param[in] lc LinphoneCore object
* @param[in] result The result of the decoded qrcode
*/
typedef void (*LinphoneCoreCbsQrcodeFoundedCb)(LinphoneCore *lc, const char *result);
typedef void (*LinphoneCoreCbsQrcodeFoundCb)(LinphoneCore *lc, const char *result);
/**
* @}

10
include/linphone/core.h
View file

@ -201,7 +201,7 @@ typedef struct _LinphoneCoreVTable{
LinphoneCoreCbsCallCreatedCb call_created;
LinphoneCoreCbsVersionUpdateCheckResultReceivedCb version_update_check_result_received;
LinphoneCoreCbsChatRoomStateChangedCb chat_room_state_changed;
LinphoneCoreCbsQrcodeFoundedCb qrcode_founded;
LinphoneCoreCbsQrcodeFoundCb qrcode_found;
LinphoneCoreCbsEcCalibrationResultCb ec_calibration_result;
LinphoneCoreCbsEcCalibrationAudioInitCb ec_calibration_audio_init;
LinphoneCoreCbsEcCalibrationAudioUninitCb ec_calibration_audio_uninit;
@ -696,18 +696,18 @@ LINPHONE_PUBLIC LinphoneCoreCbsChatRoomStateChangedCb linphone_core_cbs_get_chat
LINPHONE_PUBLIC void linphone_core_cbs_set_chat_room_state_changed (LinphoneCoreCbs *cbs, LinphoneCoreCbsChatRoomStateChangedCb cb);
/**
* Get the qrcode founded callback.
* Get the qrcode found callback.
* @param[in] cbs LinphoneCoreCbs object
* @return The current callback
*/
LINPHONE_PUBLIC LinphoneCoreCbsQrcodeFoundedCb linphone_core_cbs_get_qrcode_founded(LinphoneCoreCbs *cbs);
LINPHONE_PUBLIC LinphoneCoreCbsQrcodeFoundCb linphone_core_cbs_get_qrcode_found(LinphoneCoreCbs *cbs);
/**
* Set the qrcode found callback.
* @param[in] cbs LinphoneCoreCbs object
* @param[in] cb The callback to use
**/
LINPHONE_PUBLIC void linphone_core_cbs_set_qrcode_founded(LinphoneCoreCbs *cbs, LinphoneCoreCbsQrcodeFoundedCb cb);
LINPHONE_PUBLIC void linphone_core_cbs_set_qrcode_found(LinphoneCoreCbs *cbs, LinphoneCoreCbsQrcodeFoundCb cb);
/**
* @brief Sets a callback to call each time the echo-canceler calibration is completed.
@ -3664,7 +3664,7 @@ LINPHONE_PUBLIC void linphone_core_enable_qrcode_video_preview(LinphoneCore *lc,
* @param[in] h height
* @ingroup media_parameters
*/
LINPHONE_PUBLIC void linphone_core_set_qrcode_decode_rect(LinphoneCore *lc, const unsigned int x, const unsigned int y, const unsigned int w, const unsigned int h);
LINPHONE_PUBLIC void linphone_core_set_qrcode_decode_rect(LinphoneCore *lc, const int x, const int y, const int w, const int h);
/**
* Tells whether QRCode is enabled in the preview.

2
tester/video_tester.c
View file

@ -102,7 +102,7 @@ static void _decode_qrcode(const char* image_path, image_rect *rect) {
linphone_core_enable_qrcode_video_preview(lcm->lc, TRUE);
cbs = linphone_core_get_current_callbacks(lcm->lc);
linphone_core_cbs_set_qrcode_founded(cbs, qrcode_found_cb);
linphone_core_cbs_set_qrcode_found(cbs, qrcode_found_cb);
linphone_core_cbs_set_user_data(cbs, &qrcode_data);
if (rect) {
linphone_core_set_qrcode_decode_rect(lcm->lc, rect->x, rect->y, rect->w, rect->h);