[gnome-games/wip/aplazas/libmanette: 14/15] gamepad: Port GamepadDPad to Vala



commit e3aab93b52f7a9f003a4a6d62366f22a90d6b4f3
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Wed Nov 8 19:31:11 2017 +0100

    gamepad: Port GamepadDPad to Vala

 src/Makefile.am                                    |    5 +--
 src/gamepad/gamepad-dpad.c                         |   36 --------------------
 src/gamepad/gamepad-dpad.h                         |   24 -------------
 .../{gamepad-dpad.vapi => gamepad-dpad.vala}       |    3 +-
 4 files changed, 2 insertions(+), 66 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index aec07a2..735a737 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,8 +25,6 @@ EXTRA_DIST = \
        $(gresource_file) \
        gamepad/event-codes.vapi \
        gamepad/linux/input-event-codes.h \
-       gamepad/gamepad-dpad.h \
-       gamepad/gamepad-dpad.vapi \
        gamepad/gamepad-input.h \
        gamepad/gamepad-input.vapi \
        $(NULL)
@@ -80,7 +78,7 @@ gnome_games_SOURCES = \
        gameinfo/gameinfo-disc-id-game-title.vala \
        gameinfo/gameinfo-disc-id-input-capabilities.vala \
        \
-       gamepad/gamepad-dpad.c \
+       gamepad/gamepad-dpad.vala \
        gamepad/gamepad-input.c \
        gamepad/gamepad-mapping-builder.vala \
        \
@@ -184,7 +182,6 @@ gnome_games_VALAFLAGS = \
        --pkg linux \
        --pkg posix \
        --pkg event-codes \
-       --pkg gamepad-dpad \
        --pkg gamepad-input \
        --gresources $(gresource_file) \
        --vapi $(vapi_file) \
diff --git a/src/gamepad/gamepad-dpad.vapi b/src/gamepad/gamepad-dpad.vala
similarity index 60%
rename from src/gamepad/gamepad-dpad.vapi
rename to src/gamepad/gamepad-dpad.vala
index 04be6f2..f572f62 100644
--- a/src/gamepad/gamepad-dpad.vapi
+++ b/src/gamepad/gamepad-dpad.vala
@@ -1,7 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-[CCode (cheader_filename = "gamepad-dpad.h")]
 private struct Games.GamepadDPad {
-       Games.GamepadInput inputs[4];
+       GamepadInput inputs[4];
        int32 axis_values[2];
 }


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