diff --git a/ui/drivers/cocoa/cocoa_common.h b/ui/drivers/cocoa/cocoa_common.h index 9e7bb1824e..99cce0a6dd 100644 --- a/ui/drivers/cocoa/cocoa_common.h +++ b/ui/drivers/cocoa/cocoa_common.h @@ -25,7 +25,6 @@ #include "../../menu/menu.h" @protocol RetroArch_Platform -- (void)unloadingCore; @end #if defined(HAVE_COCOATOUCH) @@ -76,8 +75,6 @@ extern apple_frontend_settings_t apple_frontend_settings; - (void)showGameView; - (void)toggleUI; -- (void)unloadingCore; - - (void)refreshSystemConfig; @end @@ -110,8 +107,6 @@ void get_ios_version(int *major, int *minor); @property (nonatomic, retain) NSWindow IBOutlet* window; -- (void)unloadingCore; - @end #endif diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m index 3e412038e6..4e3685145e 100644 --- a/ui/drivers/ui_cocoatouch.m +++ b/ui/drivers/ui_cocoatouch.m @@ -37,6 +37,9 @@ static id apple_platform; static CFRunLoopObserverRef iterate_observer; +/* forward declaration */ +void apple_rarch_exited(void); + static void rarch_draw(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info) { @@ -61,14 +64,6 @@ static void rarch_draw(CFRunLoopObserverRef observer, CFRunLoopWakeUp(CFRunLoopGetMain()); } -void apple_rarch_exited(void) -{ - RetroArch_iOS *ap = (RetroArch_iOS *)apple_platform; - - if (ap) - [ap unloadingCore]; -} - apple_frontend_settings_t apple_frontend_settings; enum frontend_powerstate ios_get_powerstate(int *seconds, int *percent) @@ -421,12 +416,6 @@ enum } } -- (void)unloadingCore -{ - [self showPauseMenu:self]; - btpad_set_inquiry_state(true); -} - - (void)refreshSystemConfig { bool small_keyboard, is_icade, is_btstack; @@ -468,6 +457,16 @@ void apple_display_alert(const char *message, const char *title) [alert show]; } +void apple_rarch_exited(void) +{ + RetroArch_iOS *ap = (RetroArch_iOS *)apple_platform; + + if (!ap) + return; + [ap showPauseMenu:ap]; + btpad_set_inquiry_state(true); +} + typedef struct ui_companion_cocoatouch { void *empty;