[gnome-games] retro: Adapt to changes in retro-gtk

[Adrien Plazas <aplazas src gnome org>]

commit afacd249df158b0c1b065fcaf0e438692dd9f44b
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Mon Feb 13 14:27:00 2017 +0100

    retro: Adapt to changes in retro-gtk
    
    Replace usage of the dropped namespace RetroGtk by Retro, drop usage of
    dropped library retro-gobject and bump retro-gtk version to 0.10.

 configure.ac                       |    3 +--
 src/Makefile.am                    |    4 +---
 src/retro/retro-input-manager.vala |    8 ++++----
 src/retro/retro-runner.vala        |    8 ++++----
 4 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cc33fb8..5dca3dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,8 +54,7 @@ PKG_CHECK_MODULES(GNOME_GAMES, [
        gtk+-3.0
        libsoup-2.4
        libxml-2.0
-       retro-gobject-0.8
-       retro-gtk-0.8
+       retro-gtk-0.10
        tracker-sparql-1.0
 ])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5405dd5..288b6b3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,8 +171,7 @@ gnome_games_VALAFLAGS = \
        --pkg libsoup-2.4 \
        --pkg libxml-2.0 \
        --pkg tracker-sparql-1.0 \
-       --pkg retro-gobject-0.8 \
-       --pkg retro-gtk-0.8 \
+       --pkg retro-gtk-0.10 \
        --pkg linux \
        --pkg posix \
        --gresources $(gresource_file) \
@@ -204,7 +203,6 @@ gnome_games_CFLAGS = \
        $(NULL)
 
 gnome_games_CPPFLAGS = \
-       -DRETRO_GOBJECT_USE_UNSTABLE_API \
        -DRETRO_GTK_USE_UNSTABLE_API \
        $(NULL)
 
diff --git a/src/retro/retro-input-manager.vala b/src/retro/retro-input-manager.vala
index ecba4ac..0a22eb9 100644
--- a/src/retro/retro-input-manager.vala
+++ b/src/retro/retro-input-manager.vala
@@ -1,7 +1,7 @@
 // This file is part of GNOME Games. License: GPLv3
 
-private class Games.RetroInputManager : RetroGtk.InputDeviceManager, Retro.Rumble {
-       private RetroGtk.VirtualGamepad keyboard;
+private class Games.RetroInputManager : Retro.InputDeviceManager, Retro.Rumble {
+       private Retro.VirtualGamepad keyboard;
        private GamepadMonitor gamepad_monitor;
        private bool[] is_port_plugged;
        private Gamepad?[] gamepads;
@@ -11,10 +11,10 @@ private class Games.RetroInputManager : RetroGtk.InputDeviceManager, Retro.Rumbl
        public RetroInputManager (Gtk.Widget widget, bool present_analog_sticks) {
                this.present_analog_sticks = present_analog_sticks;
 
-               keyboard = new RetroGtk.VirtualGamepad (widget);
+               keyboard = new Retro.VirtualGamepad (widget);
                gamepad_monitor = GamepadMonitor.get_instance ();
 
-               set_keyboard (new RetroGtk.Keyboard (widget));
+               set_keyboard (new Retro.Keyboard (widget));
 
                gamepad_monitor.foreach_gamepad ((gamepad) => {
                        var port = is_port_plugged.length;
diff --git a/src/retro/retro-runner.vala b/src/retro/retro-runner.vala
index eea4898..c63960d 100644
--- a/src/retro/retro-runner.vala
+++ b/src/retro/retro-runner.vala
@@ -35,8 +35,8 @@ public class Games.RetroRunner : Object, Runner {
        }
 
        private Retro.Core core;
-       private RetroGtk.CairoDisplay video;
-       private RetroGtk.PaPlayer audio;
+       private Retro.CairoDisplay video;
+       private Retro.PaPlayer audio;
        private RetroInputManager input_manager;
        private Retro.MainLoop loop;
 
@@ -156,7 +156,7 @@ public class Games.RetroRunner : Object, Runner {
                if (is_initialized)
                        return;
 
-               video = new RetroGtk.CairoDisplay ();
+               video = new Retro.CairoDisplay ();
 
                widget = new Gtk.EventBox ();
                widget.add (video);
@@ -201,7 +201,7 @@ public class Games.RetroRunner : Object, Runner {
        private void prepare_core (string uri) throws Error {
                var module_path = core_source.get_module_path ();
                core = new Retro.Core (module_path);
-               audio = new RetroGtk.PaPlayer ();
+               audio = new Retro.PaPlayer ();
 
                var platforms_dir = Application.get_platforms_dir ();
                var platform = core_source.get_platform ();