[gnome-games/wip/exalm/rebrand: 17/102] retro-core: Merge into Core




commit c519e8feb493feb84cb77f8a5052bc73226c8ee7
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Mon Mar 29 18:32:19 2021 +0500

    retro-core: Merge into Core

 src/core/core.vala               | 18 ++++++++++++++++--
 src/meson.build                  |  1 -
 src/retro/retro-core-source.vala |  2 +-
 src/retro/retro-core.vala        | 19 -------------------
 4 files changed, 17 insertions(+), 23 deletions(-)
---
diff --git a/src/core/core.vala b/src/core/core.vala
index 6c706519..a2b6acb6 100644
--- a/src/core/core.vala
+++ b/src/core/core.vala
@@ -1,5 +1,19 @@
 // This file is part of GNOME Games. License: GPL-3.0+
 
-public interface Games.Core : Object {
-       public abstract Firmware[] get_all_firmware (Platform platform) throws Error;
+public class Games.Core : Object {
+       private Retro.CoreDescriptor core_descriptor;
+
+       public Core (Retro.CoreDescriptor core_descriptor) {
+               this.core_descriptor = core_descriptor;
+       }
+
+       public Firmware[] get_all_firmware (Platform platform) throws Error {
+               var platform_id = platform.get_id ();
+               Firmware[] firmware_list = {};
+               if (core_descriptor.has_firmwares (platform_id))
+                       foreach (var firmware in core_descriptor.get_firmwares (platform_id))
+                               firmware_list += new RetroFirmware (firmware, core_descriptor);
+
+               return firmware_list;
+       }
 }
diff --git a/src/meson.build b/src/meson.build
index d92775e5..a01e803b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -98,7 +98,6 @@ vala_sources = [
   'preferences/preferences-subpage-keyboard.vala',
   'preferences/preferences-window.vala',
 
-  'retro/retro-core.vala',
   'retro/retro-core-manager.vala',
   'retro/retro-core-source.vala',
   'retro/retro-error.vala',
diff --git a/src/retro/retro-core-source.vala b/src/retro/retro-core-source.vala
index 8fe8af81..57770495 100644
--- a/src/retro/retro-core-source.vala
+++ b/src/retro/retro-core-source.vala
@@ -44,7 +44,7 @@ public class Games.RetroCoreSource : Object {
                        throw new RetroError.MODULE_NOT_FOUND ("No module found for platform “%s” and MIME 
types [ “%s” ].", platform_id, string.joinv ("”, “", mime_types));
                }
 
-               var core = new RetroCore (core_descriptor);
+               var core = new Core (core_descriptor);
 
                firmware_manager.is_all_firmware_valid (core, platform);
        }


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