From 6ca58a4d6e9865ae3eef67b477b6931e29d1c3fd Mon Sep 17 00:00:00 2001 From: Phillip Ponson Date: Sun, 17 Jan 2016 19:51:28 -0600 Subject: [PATCH] iOS: Refactoring support for background Music.app. --- gfx/drivers_context/cocoa_gl_ctx.m | 4 +--- ui/drivers/ui_cocoatouch.m | 12 +++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m index b8d44633d2..4775f2693e 100644 --- a/gfx/drivers_context/cocoa_gl_ctx.m +++ b/gfx/drivers_context/cocoa_gl_ctx.m @@ -124,9 +124,7 @@ void cocoagl_bind_game_view_fbo(void) { #ifdef HAVE_AVFOUNDATION /* Implicitly initializes your audio session */ - AVAudioSession *audioSession = [AVAudioSession sharedInstance]; - [audioSession setCategory: AVAudioSessionCategoryAmbient error: nil]; - [audioSession setActive:YES error:nil]; + [[RetroArch_iOS get] supportOtherAudioSessions]; #endif if (g_context) [g_view bindDrawable]; diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m index 16ce06f2dc..b0b0e59ff2 100644 --- a/ui/drivers/ui_cocoatouch.m +++ b/ui/drivers/ui_cocoatouch.m @@ -47,9 +47,7 @@ void apple_rarch_exited(void); static void rarch_enable_ui(void) { #ifdef HAVE_AVFOUNDATION - AVAudioSession *audioSession = [AVAudioSession sharedInstance]; - [audioSession setCategory: AVAudioSessionCategoryAmbient error: nil]; - [audioSession setActive:YES error:nil]; + [[RetroArch_iOS get] supportOtherAudioSessions]; #endif bool boolean = true; @@ -71,9 +69,7 @@ static void rarch_disable_ui(void) runloop_ctl(RUNLOOP_CTL_SET_IDLE, &boolean); rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL); #ifdef HAVE_AVFOUNDATION - AVAudioSession *audioSession = [AVAudioSession sharedInstance]; - [audioSession setCategory: AVAudioSessionCategoryAmbient error: nil]; - [audioSession setActive:YES error:nil]; + [[RetroArch_iOS get] supportOtherAudioSessions]; #endif } @@ -329,9 +325,7 @@ enum { #ifdef HAVE_AVFOUNDATION /* Implicitly initializes your audio session. */ - AVAudioSession *audioSession = [AVAudioSession sharedInstance]; - [audioSession setCategory: AVAudioSessionCategoryAmbient error: nil]; - [audioSession setActive:YES error:nil]; + [(RetroArch_iOS*)[[UIApplication sharedApplication] delegate] supportOtherAudioSessions]; #endif return (RetroArch_iOS*)[[UIApplication sharedApplication] delegate]; }