[gnome-games/wip/exalm/rebrand: 118/124] retro-input-manager: Move to core/runner/




commit eff8ec148f78eea0e5293a72cbd23644c2b14579
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Wed Mar 31 01:10:57 2021 +0500

    retro-input-manager: Move to core/runner/

 .../retro-input-manager.vala => core/runner/input-manager.vala}     | 6 +++---
 src/core/runner/runner.vala                                         | 6 +++---
 src/meson.build                                                     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/retro/retro-input-manager.vala b/src/core/runner/input-manager.vala
similarity index 97%
rename from src/retro/retro-input-manager.vala
rename to src/core/runner/input-manager.vala
index cfe3f885..cf647d05 100644
--- a/src/retro/retro-input-manager.vala
+++ b/src/core/runner/input-manager.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-private class Games.RetroInputManager : Object {
+private class Games.InputManager : Object {
        public signal void controllers_changed ();
 
        private Retro.Core core;
@@ -34,7 +34,7 @@ private class Games.RetroInputManager : Object {
        private Retro.Controller?[] controllers;
        private int core_view_joypad_port;
 
-       public RetroInputManager (Retro.Core core, Retro.CoreView view) {
+       public InputManager (Retro.Core core, Retro.CoreView view) {
                this.core = core;
                this.view = view;
 
@@ -67,7 +67,7 @@ private class Games.RetroInputManager : Object {
                input_mode = InputMode.GAMEPAD;
        }
 
-       ~RetroInputManager () {
+       ~InputManager () {
                // Break the reference cycle between the core and its view by unsetting
                // all the references of the view we gave to the core.
                core.set_keyboard (null);
diff --git a/src/core/runner/runner.vala b/src/core/runner/runner.vala
index 254137d1..7e5dbf6c 100644
--- a/src/core/runner/runner.vala
+++ b/src/core/runner/runner.vala
@@ -35,7 +35,7 @@ public class Games.Runner : Object {
 
        private Retro.Core core;
        private Retro.CoreView view;
-       private RetroInputManager input_manager;
+       private InputManager input_manager;
        private InputMode _input_mode;
        public InputMode input_mode {
                get { return _input_mode; }
@@ -187,12 +187,12 @@ public class Games.Runner : Object {
                if (medias_uris.length > 0)
                        core.set_current_media (media_set.selected_media_number);
 
-               input_manager = new RetroInputManager (core, view);
+               input_manager = new InputManager (core, view);
                input_manager.controllers_changed.connect (() => {
                        controllers_changed ();
                });
 
-               // Keep the internal values of input_mode in sync between RetroRunner and RetroInputManager
+               // Keep the internal values of input_mode in sync between Runner and InputManager
                input_mode = get_available_input_modes ()[0];
 
                core_loaded = true;
diff --git a/src/meson.build b/src/meson.build
index b399bef1..437e387a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -19,6 +19,7 @@ vala_sources = [
   'collection/recently-played-collection.vala',
   'collection/user-collection.vala',
 
+  'core/runner/input-manager.vala',
   'core/runner/runner.vala',
   'core/runner/runner-error.vala',
 
@@ -143,7 +144,6 @@ vala_sources = [
   'preferences/preferences-window.vala',
 
   'retro/retro-error.vala',
-  'retro/retro-input-manager.vala',
   'retro/retro-options.vala',
 
   'screen-layout/screen-layout.vala',


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