[retro-gtk] retro-gobject: Remove unused keyboard callback interface
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [retro-gtk] retro-gobject: Remove unused keyboard callback interface
- Date: Fri, 20 Jan 2017 09:44:57 +0000 (UTC)
commit e0133b89b943f75056c0834155ff5ace64d7acc6
Author: Adrien Plazas <kekun plazas laposte net>
Date: Thu Jan 19 09:59:01 2017 +0100
retro-gobject: Remove unused keyboard callback interface
https://bugzilla.gnome.org/show_bug.cgi?id=777482
retro-gobject/core.vala | 12 +-----------
retro-gobject/input/input.vala | 7 -------
retro-gobject/retro-environment.c | 10 +---------
3 files changed, 2 insertions(+), 27 deletions(-)
---
diff --git a/retro-gobject/core.vala b/retro-gobject/core.vala
index aef6f17..9f9c6aa 100644
--- a/retro-gobject/core.vala
+++ b/retro-gobject/core.vala
@@ -168,13 +168,6 @@ public class Core : Object {
public AvInfo av_info { internal set; get; }
/**
- * The keyboard callback interface.
- *
- * The Core can set it to let the frontend notify of keyboard input.
- */
- internal KeyboardCallback? keyboard_callback { set; get; }
-
- /**
* The disk controlling interface.
*
* The Core can set it to let the frontend insert and eject disks images.
@@ -678,10 +671,7 @@ public class Core : Object {
if (!is_initiated)
return;
- if (keyboard_callback == null)
- return;
-
- keyboard_callback.callback (down, keycode, character, key_modifiers);
+ // TODO Handle the key event.
}
}
diff --git a/retro-gobject/input/input.vala b/retro-gobject/input/input.vala
index 7ea22f6..ae98f50 100644
--- a/retro-gobject/input/input.vala
+++ b/retro-gobject/input/input.vala
@@ -56,11 +56,4 @@ public interface Input : Object {
}
-[CCode (has_target = false)]
-private delegate void KeyboardCallbackCallback (bool down, KeyboardKey keycode, uint32 character,
KeyboardModifierKey key_modifiers);
-
-private struct KeyboardCallback {
- KeyboardCallbackCallback callback;
-}
-
}
diff --git a/retro-gobject/retro-environment.c b/retro-gobject/retro-environment.c
index ca1153a..e562393 100644
--- a/retro-gobject/retro-environment.c
+++ b/retro-gobject/retro-environment.c
@@ -497,12 +497,6 @@ static gboolean set_input_descriptors (RetroInput *self, RetroInputDescriptor *d
return TRUE;
}
-static gboolean set_keyboard_callback (RetroCore *self, RetroKeyboardCallback *callback) {
- retro_core_set_keyboard_callback (self, callback);
-
- return TRUE;
-}
-
static gboolean set_message (RetroCore *self, const RetroMessage *message) {
gboolean result = FALSE;
g_signal_emit_by_name (self, "message", message->msg, message->frames, &result);
@@ -581,9 +575,6 @@ static gboolean environment_core_command (RetroCore *self, unsigned cmd, gpointe
case RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK:
return set_frame_time_callback (self, (RetroCoreFrameTimeCallback *) data);
- case RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK:
- return set_keyboard_callback (self, (RetroKeyboardCallback *) data);
-
case RETRO_ENVIRONMENT_SET_MESSAGE:
return set_message (self, (RetroMessage *) data);
@@ -603,6 +594,7 @@ static gboolean environment_core_command (RetroCore *self, unsigned cmd, gpointe
case RETRO_ENVIRONMENT_GET_USERNAME:
case RETRO_ENVIRONMENT_SET_CONTROLLER_INFO:
case RETRO_ENVIRONMENT_SET_GEOMETRY:
+ case RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK:
case RETRO_ENVIRONMENT_SET_MEMORY_MAPS:
case RETRO_ENVIRONMENT_SET_PROC_ADDRESS_CALLBACK:
case RETRO_ENVIRONMENT_SET_SUBSYSTEM_INFO:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]