diff --git a/Classes/CallOutgoingView.m b/Classes/CallOutgoingView.m index e8afaa1dd..4d6d6958f 100644 --- a/Classes/CallOutgoingView.m +++ b/Classes/CallOutgoingView.m @@ -150,7 +150,9 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)bluetoothAvailabilityUpdateEvent:(NSNotification *)notif { bool available = [[notif.userInfo objectForKey:@"available"] intValue]; - [self hideSpeaker:available]; + dispatch_async(dispatch_get_main_queue(), ^{ + [self hideSpeaker:available]; + }); } @end diff --git a/Classes/LinphoneUI/UISpeakerButton.m b/Classes/LinphoneUI/UISpeakerButton.m index b845885fe..54985014d 100644 --- a/Classes/LinphoneUI/UISpeakerButton.m +++ b/Classes/LinphoneUI/UISpeakerButton.m @@ -42,7 +42,8 @@ INIT_WITH_COMMON_CF { #pragma mark - UIToggleButtonDelegate Functions - (void)audioRouteChangeListenerCallback:(NSNotification *)notif { - [self update]; + dispatch_async(dispatch_get_main_queue(), ^{ + [self update];}); } - (void)onOn { diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 1a7b1e87f..c0ef95cd5 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -4516,6 +4516,7 @@ LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; + OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\""; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone; PRODUCT_NAME = linphone; @@ -4613,6 +4614,7 @@ LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; + OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\""; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone; PRODUCT_NAME = linphone; @@ -4710,6 +4712,7 @@ LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; + OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\""; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone; PRODUCT_NAME = linphone; @@ -4807,6 +4810,7 @@ LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; + OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\""; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone; PRODUCT_NAME = linphone; diff --git a/submodules/linphone b/submodules/linphone index bbf8b49e0..d17635390 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bbf8b49e03b46a9ad6b1e7f32e6d48b0836aa6e3 +Subproject commit d1763539033ef552a491c227e03df2e6af5ba607 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 05fda93c2..f82450663 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 05fda93c22f364f3e88b29138aefd73bc44087c9 +Subproject commit f82450663f3d89aa6aa4dc4bae7d060b3a5be495