[retro-gtk] retro-gobject: Move retro-environment-video.h into retro-environment.c

[Adrien Plazas <aplazas src gnome org>]

commit f119baddd4b3dfb8b5d14b541810bf5d1e7ce469
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Mon Aug 1 13:35:33 2016 +0200

    retro-gobject: Move retro-environment-video.h into retro-environment.c
    
    This helps making the code cleaner.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=769880

 retro-gobject/Makefile.am               |    1 -
 retro-gobject/retro-environment-video.h |   52 -------------------------------
 retro-gobject/retro-environment.c       |   48 ++++++++++++++++++++++++++++-
 3 files changed, 47 insertions(+), 54 deletions(-)
---
diff --git a/retro-gobject/Makefile.am b/retro-gobject/Makefile.am
index fd8900c..8041864 100644
--- a/retro-gobject/Makefile.am
+++ b/retro-gobject/Makefile.am
@@ -70,7 +70,6 @@ libretro_gobject_la_SOURCES = \
        retro-environment-input.h \
        retro-environment-interfaces.h \
        retro-environment-variables.h \
-       retro-environment-video.h \
        $(NULL)
 
 retro-core.c: retro-gobject-internal.h
diff --git a/retro-gobject/retro-environment.c b/retro-gobject/retro-environment.c
index bce17af..32e718e 100644
--- a/retro-gobject/retro-environment.c
+++ b/retro-gobject/retro-environment.c
@@ -3,7 +3,6 @@
 #include "retro-gobject-internal.h"
 #include "libretro-environment.h"
 
-#include "retro-environment-video.h"
 #include "retro-environment-input.h"
 #include "retro-environment-variables.h"
 #include "retro-environment-interfaces.h"
@@ -13,6 +12,12 @@ typedef struct {
        guint frames;
 } RetroMessage;
 
+static gboolean get_can_dupe (RetroVideo *self, gboolean *can_dupe) {
+       *can_dupe = retro_video_get_can_dupe (self);
+
+       return TRUE;
+}
+
 static gboolean get_content_directory (RetroCore *self, const gchar* *content_directory) {
        *(content_directory) = retro_core_get_content_directory (self);
 
@@ -25,6 +30,12 @@ static gboolean get_libretro_path (RetroCore *self, const gchar* *libretro_direc
        return TRUE;
 }
 
+static gboolean get_overscan (RetroVideo *self, gboolean *overcan) {
+       *overcan = retro_video_get_overscan (self);
+
+       return TRUE;
+}
+
 static gboolean get_save_directory (RetroCore *self, const gchar* *save_directory) {
        *(save_directory) = retro_core_get_save_directory (self);
 
@@ -74,6 +85,18 @@ static gboolean set_performance_level (RetroCore *self, RetroPerfLevel *performa
        return TRUE;
 }
 
+static gboolean set_pixel_format (RetroVideo *self, const RetroPixelFormat *pixel_format) {
+       retro_video_set_pixel_format (self, *pixel_format);
+
+       return TRUE;
+}
+
+static gboolean set_rotation (RetroVideo *self, const RetroRotation *rotation) {
+       retro_video_set_rotation (self, *rotation);
+
+       return TRUE;
+}
+
 static gboolean set_support_no_game (RetroCore *self, gboolean *support_no_game) {
        retro_core_set_support_no_game (self, *support_no_game);
 
@@ -149,6 +172,29 @@ static gboolean environment_core_command (RetroCore *self, unsigned cmd, gpointe
        }
 }
 
+static gboolean environment_video_command (RetroVideo *self, unsigned cmd, gpointer data) {
+       if (!self)
+               return FALSE;
+
+       switch (cmd) {
+       case RETRO_ENVIRONMENT_GET_CAN_DUPE:
+               return get_can_dupe (self, (gboolean *) data);
+
+       case RETRO_ENVIRONMENT_GET_OVERSCAN:
+               return get_overscan (self, (gboolean *) data);
+
+       case RETRO_ENVIRONMENT_SET_PIXEL_FORMAT:
+               return set_pixel_format (self, (RetroPixelFormat *) data);
+
+       case RETRO_ENVIRONMENT_SET_ROTATION:
+               return set_rotation (self, (RetroRotation *) data);
+
+       case RETRO_ENVIRONMENT_SET_HW_RENDER:
+       default:
+               return FALSE;
+       }
+}
+
 gpointer retro_core_get_module_environment_interface (RetroCore *self) {
        gboolean real_cb (unsigned cmd, gpointer data) {
                RetroCore *cb_data = retro_core_get_cb_data ();