From 218db02a1ab4590d31032b4cbce25b5c34d508e7 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 6 Jan 2016 15:10:32 +0100 Subject: [PATCH] submodules: update ms2 to fix music pause on iOS --- coreapi/message_storage.c | 11 +++++++---- mediastreamer2 | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c index d3c1f6338..ed535367a 100644 --- a/coreapi/message_storage.c +++ b/coreapi/message_storage.c @@ -469,10 +469,13 @@ MSList *linphone_chat_room_get_history_range(LinphoneChatRoom *cr, int startm, i buf = buf2; } - begin=ortp_get_cur_time_ms(); - linphone_sql_request_message(lc->db,buf,cr); - end=ortp_get_cur_time_ms(); - ms_message("%s(): completed in %i ms",__FUNCTION__, (int)(end-begin)); + if (endm+1-startm > 1) { + //display message only if at least 2 messages are loaded + begin=ortp_get_cur_time_ms(); + linphone_sql_request_message(lc->db,buf,cr); + end=ortp_get_cur_time_ms(); + ms_message("%s(): completed in %i ms",__FUNCTION__, (int)(end-begin)); + } ms_free(buf); ret=cr->messages_hist; cr->messages_hist=NULL; diff --git a/mediastreamer2 b/mediastreamer2 index 3cc2db89e..8472cad77 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 3cc2db89e51a6a44e19c12ecb85c34360497e158 +Subproject commit 8472cad77bcc4b0ef3b0a02d2aa962d54f873d1a