[retro-gtk/wip/aplazas/0.13: 10/25] Port AnalogId to C



commit f35a77e69b5df81f557036919d19340feff14a40
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Tue Sep 5 14:40:23 2017 +0200

    Port AnalogId to C

 retro-gtk/Makefile.am       |    1 +
 retro-gtk/input/device.vala |    8 --------
 retro-gtk/retro-analog-id.h |   25 +++++++++++++++++++++++++
 retro-gtk/retro-gtk.h       |    1 +
 4 files changed, 27 insertions(+), 8 deletions(-)
---
diff --git a/retro-gtk/Makefile.am b/retro-gtk/Makefile.am
index 4c0e464..a795936 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-id.h \
        retro-analog-index.h \
        retro-device-type.h \
        retro-gtk.h \
diff --git a/retro-gtk/input/device.vala b/retro-gtk/input/device.vala
index c94dac8..bc98db7 100644
--- a/retro-gtk/input/device.vala
+++ b/retro-gtk/input/device.vala
@@ -3,14 +3,6 @@
 namespace Retro {
 
 /**
- * The axes of an analog stick.
- */
-public enum AnalogId {
-       X,
-       Y
-}
-
-/**
  * The input types of a mouse.
  */
 private enum MouseId {
diff --git a/retro-gtk/retro-analog-id.h b/retro-gtk/retro-analog-id.h
new file mode 100644
index 0000000..9ff1a00
--- /dev/null
+++ b/retro-gtk/retro-analog-id.h
@@ -0,0 +1,25 @@
+// This file is part of retro-gtk. License: GPL-3.0+.
+
+#ifndef RETRO_ANALOG_ID_H
+#define RETRO_ANALOG_ID_H
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+/**
+ * RetroAnalogId:
+ * @RETRO_ANALOG_ID_X: The X axis of an analog stick.
+ * @RETRO_ANALOG_ID_Y: The Y axis of an analog stick.
+ *
+ * Represents the axes of the analog sticks for the Libretro gamepad.
+ */
+typedef enum
+{
+  RETRO_ANALOG_ID_X,
+  RETRO_ANALOG_ID_Y,
+} RetroAnalogId;
+
+G_END_DECLS
+
+#endif /* RETRO_ANALOG_ID_H */
diff --git a/retro-gtk/retro-gtk.h b/retro-gtk/retro-gtk.h
index 3869067..a1de0f7 100644
--- a/retro-gtk/retro-gtk.h
+++ b/retro-gtk/retro-gtk.h
@@ -3,6 +3,7 @@
 #ifndef __RETRO_GTK_H__
 #define __RETRO_GTK_H__
 
+#include "retro-analog-id.h"
 #include "retro-analog-index.h"
 #include "retro-device-type.h"
 #include "retro-gtk-vala.h"


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