[retro-gtk/wip/aplazas/0.13: 4/14] Port AnalogIndex to C



commit 509ae47dfbc561ee210a6b623cba646cf2eef918
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Tue Sep 5 14:37:31 2017 +0200

    Port AnalogIndex to C

 retro-gtk/Makefile.am          |    3 +++
 retro-gtk/input/device.vala    |    8 --------
 retro-gtk/retro-analog-index.h |   25 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/retro-gtk/Makefile.am b/retro-gtk/Makefile.am
index 070d5fa..352c5c5 100644
--- a/retro-gtk/Makefile.am
+++ b/retro-gtk/Makefile.am
@@ -106,6 +106,7 @@ libretro_gtk_la_LIBADD = $(RETRO_GTK_LIBS)
 
 retro_gtkincludedir = $(includedir)/retro-gtk-0.12
 retro_gtkinclude_HEADERS = \
+       retro-analog-index.h \
        retro-device-type.h \
        retro-gtk.h \
        retro-joypad-id.h \
@@ -138,6 +139,7 @@ Retro-0.12.gir: $(INTROSPECTION_SCANNER) libretro-gtk.la
 Retro_0_12_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0 Gtk-3.0 cairo-1.0
 Retro_0_12_gir_SCANNERFLAGS = \
        --c-include=retro-gtk.h \
+       --c-include=retro-analog-index.h \
        --c-include=retro-device-type.h \
        --c-include=retro-joypad-id.h \
        --pkg-export=retro-gtk-0.12 \
@@ -168,6 +170,7 @@ pkgconfig_DATA = retro-gtk-0.12.pc
 
 EXTRA_DIST = \
        input/retro-keyboard-key.h \
+       retro-analog-index.h \
        retro-core.h \
        retro-core-view-input-device.h \
        retro-device-type.h \
diff --git a/retro-gtk/input/device.vala b/retro-gtk/input/device.vala
index 180630b..c94dac8 100644
--- a/retro-gtk/input/device.vala
+++ b/retro-gtk/input/device.vala
@@ -3,14 +3,6 @@
 namespace Retro {
 
 /**
- * The analog sticks of an analog joypad.
- */
-public enum AnalogIndex {
-       LEFT,
-       RIGHT
-}
-
-/**
  * The axes of an analog stick.
  */
 public enum AnalogId {
diff --git a/retro-gtk/retro-analog-index.h b/retro-gtk/retro-analog-index.h
new file mode 100644
index 0000000..efdd07a
--- /dev/null
+++ b/retro-gtk/retro-analog-index.h
@@ -0,0 +1,25 @@
+// This file is part of retro-gtk. License: GPL-3.0+.
+
+#ifndef RETRO_ANALOG_INDEX_H
+#define RETRO_ANALOG_INDEX_H
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+/**
+ * RetroAnalogIndex:
+ * @RETRO_ANALOG_INDEX_LEFT: The left analog stick.
+ * @RETRO_ANALOG_INDEX_RIGHT: The right analog stick.
+ *
+ * Represents the analog sticks for the Libretro gamepad.
+ */
+typedef enum
+{
+  RETRO_ANALOG_INDEX_LEFT,
+  RETRO_ANALOG_INDEX_RIGHT,
+} RetroAnalogIndex;
+
+G_END_DECLS
+
+#endif /* RETRO_ANALOG_INDEX_H */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]