From aa54f7fb41b100308c6fd5d554d734d8ff189f0f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 20 Apr 2015 17:10:28 +0200
Subject: [PATCH] Move apple_rarch_exited to UI companion drivers

---
 frontend/drivers/platform_apple.m      | 13 +------------
 menu/menu_entries_cbs_representation.c | 17 +++++++++++++++++
 ui/drivers/ui_cocoa.m                  |  2 ++
 ui/drivers/ui_cocoatouch.m             |  2 ++
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/frontend/drivers/platform_apple.m b/frontend/drivers/platform_apple.m
index ef82b5c8ad..b8e1dfeab9 100644
--- a/frontend/drivers/platform_apple.m
+++ b/frontend/drivers/platform_apple.m
@@ -365,10 +365,6 @@ static void frontend_apple_get_environment_settings(int *argc, char *argv[],
    CFRelease(bundle_url);
 }
 
-#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
-extern void apple_rarch_exited(void);
-#endif
-
 static void frontend_apple_load_content(void)
 {
    driver_t          *driver = driver_get_ptr();
@@ -378,13 +374,6 @@ static void frontend_apple_load_content(void)
       ui->notify_content_loaded(driver->ui_companion_data);
 }
 
-static void frontend_apple_shutdown(bool unused)
-{
-#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
-   apple_rarch_exited();
-#endif
-}
-
 static int frontend_apple_get_rating(void)
 {
    char model[PATH_MAX_LENGTH];
@@ -531,7 +520,7 @@ const frontend_ctx_driver_t frontend_ctx_apple = {
    NULL,                         /* process_args */
    NULL,                         /* exec */
    NULL,                         /* set_fork */
-   frontend_apple_shutdown,
+   NULL,                         /* shutdown */
    frontend_apple_get_name,
    frontend_apple_get_os,
    frontend_apple_get_rating,
diff --git a/menu/menu_entries_cbs_representation.c b/menu/menu_entries_cbs_representation.c
index 96309d87a0..c480b7dd04 100644
--- a/menu/menu_entries_cbs_representation.c
+++ b/menu/menu_entries_cbs_representation.c
@@ -548,6 +548,19 @@ static void menu_action_setting_disp_set_label_menu_file_plain(
          path, "(FILE)", path_buf, path_buf_size);
 }
 
+static void menu_action_setting_disp_set_label_menu_file_image(
+      file_list_t* list,
+      unsigned *w, unsigned type, unsigned i,
+      const char *label,
+      char *type_str, size_t type_str_size,
+      const char *entry_label,
+      const char *path,
+      char *path_buf, size_t path_buf_size)
+{
+   menu_action_setting_generic_disp_set_label(w, type_str, type_str_size,
+         path, "(IMG)", path_buf, path_buf_size);
+}
+
 static void menu_action_setting_disp_set_label_menu_file_use_directory(
       file_list_t* list,
       unsigned *w, unsigned type, unsigned i,
@@ -832,6 +845,10 @@ void menu_entries_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *
             cbs->action_get_representation = 
                menu_action_setting_disp_set_label_menu_file_plain;
             break;
+         case MENU_FILE_IMAGE:
+            cbs->action_get_representation = 
+               menu_action_setting_disp_set_label_menu_file_image;
+            break;
          case MENU_FILE_USE_DIRECTORY:
             cbs->action_get_representation = 
                menu_action_setting_disp_set_label_menu_file_use_directory;
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index a28eab3c90..bc57686e56 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -49,6 +49,8 @@ static void ui_companion_cocoa_deinit(void *data)
 {
    ui_companion_cocoa_t *handle = (ui_companion_cocoa_t*)data;
 
+   apple_rarch_exited();
+
    if (handle)
       free(handle);
 }
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index b64830f81b..b5ac68ac5b 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -76,6 +76,8 @@ static void ui_companion_cocoatouch_deinit(void *data)
 {
    ui_companion_cocoatouch_t *handle = (ui_companion_cocoatouch_t*)data;
 
+   apple_rarch_exited();
+
    if (handle)
       free(handle);
 }