GNOME.org
 

[retro-gtk/mkenums: 3/3] Drop custom enum GType funcs in favor of mk-enum

commit 24c4ac540a39ab13cd82edde39a1a855800fcea8
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Mon Apr 13 17:11:17 2020 +0200

    Drop custom enum GType funcs in favor of mk-enum
    
    This makes the code simpler.

 retro-gtk/meson.build                |   1 +
 retro-gtk/retro-gtk-enums.c.in       |   5 ++
 retro-gtk/retro-video-filter.c       |  23 -----
 retro-runner/retro-runner-enums.c.in |   4 +
 shared/meson.build                   |   6 +-
 shared/retro-controller-codes.c      | 159 -----------------------------------
 shared/retro-controller-type.c       |  28 ------
 shared/retro-memory-type.c           |  26 ------
 shared/retro-rumble-effect.c         |  25 ------
 9 files changed, 14 insertions(+), 263 deletions(-)
---
diff --git a/retro-gtk/meson.build b/retro-gtk/meson.build
index c09dbcf..ceb1dc7 100644
--- a/retro-gtk/meson.build
+++ b/retro-gtk/meson.build
@@ -2,6 +2,7 @@ retro_gtk_include_dir = get_option('includedir') / 'retro-gtk'
 
 retro_gtk_enum_headers = [
   shared_enum_headers,
+  'retro-video-filter.h',
 ]
 
 retro_gtk_resources = gnome.compile_resources(
diff --git a/retro-gtk/retro-gtk-enums.c.in b/retro-gtk/retro-gtk-enums.c.in
index 9a42d78..6269396 100644
--- a/retro-gtk/retro-gtk-enums.c.in
+++ b/retro-gtk/retro-gtk-enums.c.in
@@ -1,5 +1,10 @@
 /*** BEGIN file-header ***/
 
+#include "retro-controller-codes.h"
+#include "retro-controller-type.h"
+#include "retro-memory-type.h"
+#include "retro-rumble-effect.h"
+#include "retro-video-filter.h"
 
 /*** END file-header ***/
 
diff --git a/retro-gtk/retro-video-filter.c b/retro-gtk/retro-video-filter.c
index dc86d7f..b115910 100644
--- a/retro-gtk/retro-video-filter.c
+++ b/retro-gtk/retro-video-filter.c
@@ -31,26 +31,3 @@ retro_video_filter_from_string (const gchar *filter)
 
   return result;
 }
-
-GType
-retro_video_filter_get_type (void)
-{
-  static volatile gsize retro_video_filter_type = 0;
-
-  if (g_once_init_enter (&retro_video_filter_type)) {
-    static const GEnumValue values[] = {
-      { RETRO_VIDEO_FILTER_SMOOTH, "RETRO_VIDEO_FILTER_SMOOTH", "smooth" },
-      { RETRO_VIDEO_FILTER_SHARP, "RETRO_VIDEO_FILTER_SHARP", "sharp" },
-      { RETRO_VIDEO_FILTER_CRT, "RETRO_VIDEO_FILTER_CRT", "crt" },
-      { RETRO_VIDEO_FILTER_COUNT, "RETRO_VIDEO_FILTER_COUNT", "count" },
-      { 0, NULL, NULL },
-    };
-    GType type;
-
-    type = g_enum_register_static ("RetroVideoFilter", values);
-
-    g_once_init_leave (&retro_video_filter_type, type);
-  }
-
-  return retro_video_filter_type;
-}
diff --git a/retro-runner/retro-runner-enums.c.in b/retro-runner/retro-runner-enums.c.in
index 9a42d78..6643d46 100644
--- a/retro-runner/retro-runner-enums.c.in
+++ b/retro-runner/retro-runner-enums.c.in
@@ -1,5 +1,9 @@
 /*** BEGIN file-header ***/
 
+#include "retro-controller-codes.h"
+#include "retro-controller-type.h"
+#include "retro-memory-type.h"
+#include "retro-rumble-effect.h"
 
 /*** END file-header ***/
 
diff --git a/shared/meson.build b/shared/meson.build
index c23e3ad..c35e28b 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -12,9 +12,7 @@ shared_sources = files([
   'retro-framebuffer.c',
   'retro-input.c',
   'retro-memfd.c',
-  'retro-memory-type.c',
   'retro-pixel-format.c',
-  'retro-rumble-effect.c',
 ])
 
 shared_headers = files([
@@ -26,4 +24,8 @@ shared_headers = files([
 ])
 
 shared_enum_headers = files([
+  'retro-controller-codes.h',
+  'retro-controller-type.h',
+  'retro-memory-type.h',
+  'retro-rumble-effect.h',
 ])
diff --git a/shared/retro-controller-codes.c b/shared/retro-controller-codes.c
index 65769a3..0efde0e 100644
--- a/shared/retro-controller-codes.c
+++ b/shared/retro-controller-codes.c
@@ -52,162 +52,3 @@ retro_joypad_id_from_button_code (guint16 button_code)
 
   return RETRO_JOYPAD_ID_COUNT;
 }
-
-GType
-retro_joypad_id_get_type (void)
-{
-  static volatile gsize retro_joypad_id_type = 0;
-
-  if (g_once_init_enter (&retro_joypad_id_type)) {
-    static const GEnumValue values[] = {
-      { RETRO_JOYPAD_ID_B, "RETRO_JOYPAD_ID_B", "b" },
-      { RETRO_JOYPAD_ID_Y, "RETRO_JOYPAD_ID_Y", "y" },
-      { RETRO_JOYPAD_ID_SELECT, "RETRO_JOYPAD_ID_SELECT", "select" },
-      { RETRO_JOYPAD_ID_START, "RETRO_JOYPAD_ID_START", "start" },
-      { RETRO_JOYPAD_ID_UP, "RETRO_JOYPAD_ID_UP", "up" },
-      { RETRO_JOYPAD_ID_DOWN, "RETRO_JOYPAD_ID_DOWN", "down" },
-      { RETRO_JOYPAD_ID_LEFT, "RETRO_JOYPAD_ID_LEFT", "left" },
-      { RETRO_JOYPAD_ID_RIGHT, "RETRO_JOYPAD_ID_RIGHT", "right" },
-      { RETRO_JOYPAD_ID_A, "RETRO_JOYPAD_ID_A", "a" },
-      { RETRO_JOYPAD_ID_X, "RETRO_JOYPAD_ID_X", "x" },
-      { RETRO_JOYPAD_ID_L, "RETRO_JOYPAD_ID_L", "l" },
-      { RETRO_JOYPAD_ID_R, "RETRO_JOYPAD_ID_R", "r" },
-      { RETRO_JOYPAD_ID_L2, "RETRO_JOYPAD_ID_L2", "l2" },
-      { RETRO_JOYPAD_ID_R2, "RETRO_JOYPAD_ID_R2", "r2" },
-      { RETRO_JOYPAD_ID_L3, "RETRO_JOYPAD_ID_L3", "l3" },
-      { RETRO_JOYPAD_ID_R3, "RETRO_JOYPAD_ID_R3", "r3" },
-      { RETRO_JOYPAD_ID_COUNT, "RETRO_JOYPAD_ID_COUNT", "count" },
-      { 0, NULL, NULL },
-    };
-    GType type;
-
-    type = g_enum_register_static ("RetroJoypadId", values);
-
-    g_once_init_leave (&retro_joypad_id_type, type);
-  }
-
-  return retro_joypad_id_type;
-}
-
-GType
-retro_mouse_id_get_type (void)
-{
-  static volatile gsize retro_mouse_id_type = 0;
-
-  if (g_once_init_enter (&retro_mouse_id_type)) {
-    static const GEnumValue values[] = {
-      { RETRO_MOUSE_ID_X, "RETRO_MOUSE_ID_X", "x" },
-      { RETRO_MOUSE_ID_Y, "RETRO_MOUSE_ID_Y", "y" },
-      { RETRO_MOUSE_ID_LEFT, "RETRO_MOUSE_ID_LEFT", "left" },
-      { RETRO_MOUSE_ID_RIGHT, "RETRO_MOUSE_ID_RIGHT", "right" },
-      { RETRO_MOUSE_ID_WHEELUP, "RETRO_MOUSE_ID_WHEELUP", "wheelup" },
-      { RETRO_MOUSE_ID_WHEELDOWN, "RETRO_MOUSE_ID_WHEELDOWN", "wheeldown" },
-      { RETRO_MOUSE_ID_MIDDLE, "RETRO_MOUSE_ID_MIDDLE", "middle" },
-      { RETRO_MOUSE_ID_HORIZ_WHEELUP, "RETRO_MOUSE_ID_HORIZ_WHEELUP", "horiz-wheelup" },
-      { RETRO_MOUSE_ID_HORIZ_WHEELDOWN, "RETRO_MOUSE_ID_HORIZ_WHEELDOWN", "horiz-wheeldown" },
-      { RETRO_MOUSE_ID_COUNT, "RETRO_MOUSE_ID_COUNT", "count" },
-      { 0, NULL, NULL },
-    };
-    GType type;
-
-    type = g_enum_register_static ("RetroMouseId", values);
-
-    g_once_init_leave (&retro_mouse_id_type, type);
-  }
-
-  return retro_mouse_id_type;
-}
-
-GType
-retro_lightgun_id_get_type (void)
-{
-  static volatile gsize retro_lightgun_id_type = 0;
-
-  if (g_once_init_enter (&retro_lightgun_id_type)) {
-    static const GEnumValue values[] = {
-      { RETRO_LIGHTGUN_ID_X, "RETRO_LIGHTGUN_ID_X", "x" },
-      { RETRO_LIGHTGUN_ID_Y, "RETRO_LIGHTGUN_ID_Y", "y" },
-      { RETRO_LIGHTGUN_ID_TRIGGER, "RETRO_LIGHTGUN_ID_TRIGGER", "trigger" },
-      { RETRO_LIGHTGUN_ID_CURSOR, "RETRO_LIGHTGUN_ID_CURSOR", "cursor" },
-      { RETRO_LIGHTGUN_ID_TURBO, "RETRO_LIGHTGUN_ID_TURBO", "turbo" },
-      { RETRO_LIGHTGUN_ID_PAUSE, "RETRO_LIGHTGUN_ID_PAUSE", "pause" },
-      { RETRO_LIGHTGUN_ID_START, "RETRO_LIGHTGUN_ID_START", "start" },
-      { RETRO_LIGHTGUN_ID_COUNT, "RETRO_LIGHTGUN_ID_COUNT", "count" },
-      { 0, NULL, NULL },
-    };
-    GType type;
-
-    type = g_enum_register_static ("RetroLightgunId", values);
-
-    g_once_init_leave (&retro_lightgun_id_type, type);
-  }
-
-  return retro_lightgun_id_type;
-}
-
-GType
-retro_analog_id_get_type (void)
-{
-  static volatile gsize retro_analog_id_type = 0;
-
-  if (g_once_init_enter (&retro_analog_id_type)) {
-    static const GEnumValue values[] = {
-      { RETRO_ANALOG_ID_X, "RETRO_ANALOG_ID_X", "x" },
-      { RETRO_ANALOG_ID_Y, "RETRO_ANALOG_ID_Y", "y" },
-      { RETRO_ANALOG_ID_COUNT, "RETRO_ANALOG_ID_COUNT", "count" },
-      { 0, NULL, NULL },
-    };
-    GType type;
-
-    type = g_enum_register_static ("RetroAnalogId", values);
-
-    g_once_init_leave (&retro_analog_id_type, type);
-  }
-
-  return retro_analog_id_type;
-}
-
-GType
-retro_analog_index_get_type (void)
-{
-  static volatile gsize retro_analog_index_type = 0;
-
-  if (g_once_init_enter (&retro_analog_index_type)) {
-    static const GEnumValue values[] = {
-      { RETRO_ANALOG_INDEX_LEFT, "RETRO_ANALOG_INDEX_LEFT", "left" },
-      { RETRO_ANALOG_INDEX_RIGHT, "RETRO_ANALOG_INDEX_RIGHT", "right" },
-      { RETRO_ANALOG_INDEX_COUNT, "RETRO_ANALOG_INDEX_COUNT", "count" },
-      { 0, NULL, NULL },
-    };
-    GType type;
-
-    type = g_enum_register_static ("RetroAnalogIndex", values);
-
-    g_once_init_leave (&retro_analog_index_type, type);
-  }
-
-  return retro_analog_index_type;
-}
-
-GType
-retro_pointer_id_get_type (void)
-{
-  static volatile gsize retro_pointer_id_type = 0;
-
-  if (g_once_init_enter (&retro_pointer_id_type)) {
-    static const GEnumValue values[] = {
-      { RETRO_POINTER_ID_X, "RETRO_POINTER_ID_X", "x" },
-      { RETRO_POINTER_ID_Y, "RETRO_POINTER_ID_Y", "y" },
-      { RETRO_POINTER_ID_PRESSED, "RETRO_POINTER_ID_PRESSED", "pressed" },
-      { RETRO_POINTER_ID_COUNT, "RETRO_POINTER_ID_COUNT", "count" },
-      { 0, NULL, NULL },
-    };
-    GType type;
-
-    type = g_enum_register_static ("RetroPointerId", values);
-
-    g_once_init_leave (&retro_pointer_id_type, type);
-  }
-
-  return retro_pointer_id_type;
-}
diff --git a/shared/retro-controller-type.c b/shared/retro-controller-type.c
index 22f48ac..9a1ded5 100644
--- a/shared/retro-controller-type.c
+++ b/shared/retro-controller-type.c
@@ -5,34 +5,6 @@
 #include "retro-controller-codes.h"
 #include "retro-keyboard-key-private.h"
 
-GType
-retro_controller_type_get_type (void)
-{
-  static volatile gsize retro_controller_type_type = 0;
-
-  if (g_once_init_enter (&retro_controller_type_type)) {
-    static const GEnumValue values[] = {
-      { RETRO_CONTROLLER_TYPE_NONE, "RETRO_CONTROLLER_TYPE_NONE", "none" },
-      { RETRO_CONTROLLER_TYPE_JOYPAD, "RETRO_CONTROLLER_TYPE_JOYPAD", "joypad" },
-      { RETRO_CONTROLLER_TYPE_MOUSE, "RETRO_CONTROLLER_TYPE_MOUSE", "mouse" },
-      { RETRO_CONTROLLER_TYPE_KEYBOARD, "RETRO_CONTROLLER_TYPE_KEYBOARD", "keyboard" },
-      { RETRO_CONTROLLER_TYPE_LIGHTGUN, "RETRO_CONTROLLER_TYPE_LIGHTGUN", "lightgun" },
-      { RETRO_CONTROLLER_TYPE_ANALOG, "RETRO_CONTROLLER_TYPE_ANALOG", "analog" },
-      { RETRO_CONTROLLER_TYPE_POINTER, "RETRO_CONTROLLER_TYPE_POINTER", "pointer" },
-      { RETRO_CONTROLLER_TYPE_COUNT, "RETRO_CONTROLLER_TYPE_COUNT", "count" },
-      { RETRO_CONTROLLER_TYPE_TYPE_MASK, "RETRO_CONTROLLER_TYPE_TYPE_MASK", "type-mask" },
-      { 0, NULL, NULL },
-    };
-    GType type;
-
-    type = g_enum_register_static ("RetroControllerType", values);
-
-    g_once_init_leave (&retro_controller_type_type, type);
-  }
-
-  return retro_controller_type_type;
-}
-
 int
 retro_controller_type_get_id_count (RetroControllerType type)
 {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]