From 18d157aceaba9e78bf0f2a72d9dcc22c4da791e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= <jean.andre.santoni@gmail.com>
Date: Tue, 22 Sep 2015 22:50:58 +0200
Subject: [PATCH] Display OSD messages in cocoatouch

---
 ui/drivers/cocoa/cocoa_common.h    |  1 +
 ui/drivers/cocoa/cocoatouch_menu.m |  8 +++++++-
 ui/drivers/ui_cocoatouch.m         | 13 ++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ui/drivers/cocoa/cocoa_common.h b/ui/drivers/cocoa/cocoa_common.h
index d01f88f623..222866f5e0 100644
--- a/ui/drivers/cocoa/cocoa_common.h
+++ b/ui/drivers/cocoa/cocoa_common.h
@@ -42,6 +42,7 @@
 @property (nonatomic) NSMutableArray* sections;
 @property (nonatomic) BOOL hidesHeaders;
 @property (nonatomic) RAMenuBase* last_menu;
+@property (nonatomic) UILabel *osdmessage;
 
 - (id)initWithStyle:(UITableViewStyle)style;
 - (id)itemForIndexPath:(NSIndexPath*)indexPath;
diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m
index 3875eba9c4..2706433060 100644
--- a/ui/drivers/cocoa/cocoatouch_menu.m
+++ b/ui/drivers/cocoa/cocoatouch_menu.m
@@ -599,6 +599,13 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
     [message show];
 }
 
+
+-(void)msgQueuePush:(NSString *)msg
+{
+   self.osdmessage.text = msg;
+}
+
+
 - (void)alertView:(UIAlertView*)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
 {
     switch (buttonIndex)
@@ -612,7 +619,6 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 @end
 
 @interface RAMainMenu : RAMenuBase<RAMenuActioner>
-@property(nonatomic) UILabel *osdmessage;
 @end
 
 @implementation RAMainMenu
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index 9f7792dd6c..1e8c1b7250 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -567,6 +567,17 @@ static void ui_companion_cocoatouch_render_messagebox(const char *msg)
    }
 }
 
+static void ui_companion_cocoatouch_msg_queue_push(const char *msg,
+   unsigned priority, unsigned duration, bool flush)
+{
+   RetroArch_iOS *ap   = (RetroArch_iOS *)apple_platform;
+
+   if (ap && msg)
+   {
+      [ap.mainmenu msgQueuePush: [NSString stringWithUTF8String:msg]];
+   }
+}
+
 const ui_companion_driver_t ui_companion_cocoatouch = {
    ui_companion_cocoatouch_init,
    ui_companion_cocoatouch_deinit,
@@ -576,7 +587,7 @@ const ui_companion_driver_t ui_companion_cocoatouch = {
    ui_companion_cocoatouch_notify_content_loaded,
    ui_companion_cocoatouch_notify_list_pushed,
    ui_companion_cocoatouch_notify_refresh,
-   NULL,
+   ui_companion_cocoatouch_msg_queue_push,
    ui_companion_cocoatouch_render_messagebox,
    "cocoatouch",
 };