[retro-gtk] retro-gobject: Remove the logging interface

[Adrien Plazas <aplazas src gnome org>]

commit 8449612cd81e38b1b47027e519b948ad09695df0
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Wed Jan 25 14:15:46 2017 +0100

    retro-gobject: Remove the logging interface
    
    Directly handles the logs sent by the Libretro core.
    
    This simplifies the public API.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=777489

 retro-gobject/core.vala           |    8 -------
 retro-gobject/retro-environment.c |   39 ++++++++++++++++++++++--------------
 2 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/retro-gobject/core.vala b/retro-gobject/core.vala
index 6c90660..f882553 100644
--- a/retro-gobject/core.vala
+++ b/retro-gobject/core.vala
@@ -200,14 +200,6 @@ public class Core : Object {
        public Rumble rumble_interface { set; get; }
 
        /**
-        * The logging interface.
-        *
-        * Optional.
-        * If set, it must be set before {@link init} is called.
-        */
-       public Log log_interface { set; get; }
-
-       /**
         * Asks the frontend to shut down.
         */
        public signal bool shutdown ();
diff --git a/retro-gobject/retro-environment.c b/retro-gobject/retro-environment.c
index d92ca88..3f70e5a 100644
--- a/retro-gobject/retro-environment.c
+++ b/retro-gobject/retro-environment.c
@@ -30,21 +30,34 @@ static gboolean rumble_callback_set_rumble_state (guint port, RetroRumbleEffect
        return RETRO_RUMBLE_GET_INTERFACE (interface)->set_rumble_state (interface, port, effect, strength);
 }
 
-static void log_callback_log (guint level, const char *format, ...) {
-       RetroCore *cb_data = retro_core_get_cb_data ();
-       if (!cb_data)
-               g_return_if_reached ();
-
-       RetroLog *interface = retro_core_get_log_interface (cb_data);
-       if (!interface)
-               g_return_if_reached ();
+static void on_log (guint level, const gchar *format, ...) {
+       gchar *message;
 
        // Get the arguments, set up the formatted message,
        // pass it to the logging method and free it.
        va_list args;
        va_start (args, format);
-       char *message = g_strdup_vprintf (format, args);
-       RETRO_LOG_GET_INTERFACE (interface)->log (interface, level, message);
+       message = g_strdup_vprintf (format, args);
+
+       switch (level) {
+       case RETRO_LOG_LEVEL_DEBUG:
+               g_debug (message);
+
+               break;
+       case RETRO_LOG_LEVEL_INFO:
+               g_info (message);
+
+               break;
+       case RETRO_LOG_LEVEL_WARN:
+               g_warning (message);
+
+               break;
+       case RETRO_LOG_LEVEL_ERROR:
+               g_critical (message);
+
+               break;
+       }
+
        g_free (message);
 }
 
@@ -79,11 +92,7 @@ static gboolean get_libretro_path (RetroCore *self, const gchar* *libretro_direc
 }
 
 static gboolean get_log_callback (RetroCore *self, RetroLogCallback *cb) {
-       void *interface_exists = retro_core_get_log_interface (self);
-       if (!interface_exists)
-               return FALSE;
-
-       cb->log = log_callback_log;
+       cb->log = on_log;
 
        return TRUE;
 }