From 4cc71c0574bbb9c7a356e885afb6cff36e640f99 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 5 Aug 2015 13:56:59 +0200
Subject: [PATCH] Refactor ui_companion_is_on_foreground

---
 runloop.c                  |  1 -
 runloop.h                  |  3 ---
 ui/drivers/ui_cocoatouch.m | 12 +++---------
 ui/ui_companion_driver.c   | 14 ++++++++++++++
 ui/ui_companion_driver.h   |  4 ++++
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/runloop.c b/runloop.c
index c19e939d31..3cb36486bf 100644
--- a/runloop.c
+++ b/runloop.c
@@ -871,7 +871,6 @@ void rarch_main_state_free(void)
    main_is_idle                           = false;
    main_is_paused                         = false;
    main_is_slowmotion                     = false;
-   g_extern.ui_companion_is_on_foreground = false;
    g_extern.frames.limit.minimum_time     = 0.0;
    g_extern.frames.limit.last_time        = 0.0;
    g_extern.max_frames                    = 0;
diff --git a/runloop.h b/runloop.h
index e7bfb779b9..2ee96196b3 100644
--- a/runloop.h
+++ b/runloop.h
@@ -42,9 +42,6 @@ typedef struct rarch_resolution
 
 typedef struct global
 {
-   /* Lifecycle state checks. */
-   bool ui_companion_is_on_foreground;
-
    struct
    {
       struct
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index 5c10bfc9e5..ce373cb2d2 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -44,18 +44,14 @@ void apple_rarch_exited(void);
 
 static void rarch_enable_ui(void)
 {
-   global_t *global   = global_get_ptr();
-
-   global->ui_companion_is_on_foreground = true;
+   ui_companion_set_foreground(true);
    rarch_main_set_pause(true);
    rarch_main_set_idle(true);
 }
 
 static void rarch_disable_ui(void)
 {
-   global_t *global   = global_get_ptr();
-
-   global->ui_companion_is_on_foreground = false;
+   ui_companion_set_foreground(false);
    rarch_main_set_pause(false);
    rarch_main_set_idle(false);
 }
@@ -430,9 +426,7 @@ void apple_stop_iterate_timer(void)
 
 - (void)toggleUI
 {
-   global_t  *global  = global_get_ptr();
-
-   if (global->ui_companion_is_on_foreground)
+   if (ui_companion_is_on_foreground())
    {
       [self showGameView];
    }
diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c
index 382308f101..e5ffd18a69 100644
--- a/ui/ui_companion_driver.c
+++ b/ui/ui_companion_driver.c
@@ -17,10 +17,14 @@
 #include "../driver.h"
 #include <string.h>
 
+#include <boolean.h>
+
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
 
+static bool main_ui_companion_is_on_foreground;
+
 static const ui_companion_driver_t *ui_companion_drivers[] = {
 #ifdef HAVE_COCOA
    &ui_companion_cocoa,
@@ -56,6 +60,16 @@ const ui_companion_driver_t *ui_companion_find_driver(const char *ident)
    return NULL;
 }
 
+void ui_companion_set_foreground(unsigned enable)
+{
+   main_ui_companion_is_on_foreground = enable;
+}
+
+bool ui_companion_is_on_foreground(void)
+{
+   return main_ui_companion_is_on_foreground;
+}
+
 /**
  * ui_companion_init_first:
  *
diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h
index 6176c14e91..17f08ec4c9 100644
--- a/ui/ui_companion_driver.h
+++ b/ui/ui_companion_driver.h
@@ -70,6 +70,10 @@ const ui_companion_driver_t *ui_companion_get_ptr(void);
  **/
 const ui_companion_driver_t *ui_companion_init_first(void);
 
+bool ui_companion_is_on_foreground(void);
+
+void ui_companion_set_foreground(unsigned enable);
+
 void ui_companion_event_command(enum event_command action);
 
 #ifdef __cplusplus