summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorsanikoyes <sanikoyes@163.com>2017-05-26 15:29:00 +0800
committersanikoyes <sanikoyes@163.com>2017-05-26 15:29:00 +0800
commit7d374b5974448680a81f18751a7ca456a850020f (patch)
tree65b2cd1b0637be962d2c6dbb0cedf8e28a2398ca /platform
parentef66f8451ca7b5b98628924231a92e558930c53e (diff)
Fixed audio can not resume if it is interrupted cause by an incoming phone call
Diffstat (limited to 'platform')
-rw-r--r--platform/iphone/app_delegate.mm5
-rw-r--r--platform/iphone/audio_driver_iphone.cpp5
2 files changed, 10 insertions, 0 deletions
diff --git a/platform/iphone/app_delegate.mm b/platform/iphone/app_delegate.mm
index 0d9750d701..576292b920 100644
--- a/platform/iphone/app_delegate.mm
+++ b/platform/iphone/app_delegate.mm
@@ -33,6 +33,7 @@
#import "gl_view.h"
#include "main/main.h"
#include "os_iphone.h"
+#include "audio_driver_iphone.h"
#ifdef MODULE_FACEBOOKSCORER_IOS_ENABLED
#include "modules/FacebookScorer_ios/FacebookScorer.h"
@@ -735,6 +736,10 @@ static int frame_count = 0;
if (OSIPhone::get_singleton()->native_video_is_playing()) {
OSIPhone::get_singleton()->native_video_unpause();
};
+
+ // Fixed audio can not resume if it is interrupted cause by an incoming phone call
+ if(AudioDriverIphone::get_singleton() != NULL)
+ AudioDriverIphone::get_singleton()->start();
}
- (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url {
diff --git a/platform/iphone/audio_driver_iphone.cpp b/platform/iphone/audio_driver_iphone.cpp
index dea1ce405d..57b6388016 100644
--- a/platform/iphone/audio_driver_iphone.cpp
+++ b/platform/iphone/audio_driver_iphone.cpp
@@ -148,6 +148,11 @@ OSStatus AudioDriverIphone::output_callback(void *inRefCon,
void AudioDriverIphone::start() {
active = true;
+ // Resume audio
+ // iOS audio-thread stoped if it is interrupted cause by an incoming phone call
+ // Use AudioOutputUnitStart to re-create audio-thread
+ OSStatus result = AudioOutputUnitStart(audio_unit);
+ ERR_FAIL_COND(result != noErr);
};
int AudioDriverIphone::get_mix_rate() const {