[gnome-games/wip/exalm/rebrand: 38/124] retro-platform: Merge into Platform




commit 05a7699114a460f3de0a798b8204a27d1993ebc4
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Mon Mar 29 20:18:14 2021 +0500

    retro-platform: Merge into Platform

 plugins/dreamcast/src/dreamcast-plugin.vala        |  4 +--
 plugins/game-cube/src/game-cube-plugin.vala        |  4 +--
 plugins/mame/src/mame-game-uri-adapter.vala        |  4 +--
 plugins/mame/src/mame-plugin.vala                  |  4 +--
 plugins/ms-dos/src/ms-dos-plugin.vala              |  4 +--
 plugins/nintendo-3ds/src/nintendo-3ds-plugin.vala  |  4 +--
 plugins/nintendo-64/src/nintendo-64-platform.vala  |  2 +-
 plugins/nintendo-64/src/nintendo-64-plugin.vala    |  2 +-
 plugins/nintendo-ds/src/nintendo-ds-platform.vala  |  2 +-
 .../playstation/src/playstation-game-factory.vala  |  4 +--
 plugins/playstation/src/playstation-plugin.vala    |  4 +--
 plugins/sega-cd/src/sega-cd-plugin.vala            | 10 +++---
 plugins/sega-saturn/src/sega-saturn-plugin.vala    |  4 +--
 .../turbografx-cd/src/turbografx-cd-plugin.vala    |  4 +--
 plugins/virtual-boy/src/virtual-boy-plugin.vala    |  4 +--
 plugins/wii/src/wii-plugin.vala                    |  4 +--
 src/core/migrator.vala                             | 11 ++----
 src/core/platform.vala                             | 39 ++++++++++++++++++----
 src/meson.build                                    |  1 -
 .../preferences-page-platforms-retro-row.vala      |  4 +--
 src/retro/retro-core-manager.vala                  |  8 ++---
 src/retro/retro-core-source.vala                   |  4 +--
 src/retro/retro-platform.vala                      | 39 ----------------------
 src/retro/retro-runner-factory.vala                |  4 +--
 src/retro/retro-simple-game-uri-adapter.vala       |  4 +--
 src/ui/application.vala                            |  2 +-
 26 files changed, 80 insertions(+), 100 deletions(-)
---
diff --git a/plugins/dreamcast/src/dreamcast-plugin.vala b/plugins/dreamcast/src/dreamcast-plugin.vala
index c3aacae1..1923bbcf 100644
--- a/plugins/dreamcast/src/dreamcast-plugin.vala
+++ b/plugins/dreamcast/src/dreamcast-plugin.vala
@@ -9,10 +9,10 @@ private class Games.DreamcastPlugin : Object, Plugin {
        private const string PLATFORM_UID_PREFIX = "dreamcast";
        private const string[] MIME_TYPES = { GDI_MIME_TYPE, CDI_MIME_TYPE };
 
-       private static RetroPlatform platform;
+       private static Platform platform;
 
        static construct {
-               platform = new RetroPlatform (PLATFORM_ID, PLATFORM_NAME, MIME_TYPES, PLATFORM_UID_PREFIX);
+               platform = new Platform (PLATFORM_ID, PLATFORM_NAME, MIME_TYPES, PLATFORM_UID_PREFIX);
        }
 
        public Platform[] get_platforms () {
diff --git a/plugins/game-cube/src/game-cube-plugin.vala b/plugins/game-cube/src/game-cube-plugin.vala
index 425d4cc5..e64f8715 100644
--- a/plugins/game-cube/src/game-cube-plugin.vala
+++ b/plugins/game-cube/src/game-cube-plugin.vala
@@ -6,10 +6,10 @@ private class Games.GameCubePlugin : Object, Plugin {
        private const string PLATFORM_NAME = _("Nintendo GameCube");
        private const string PLATFORM_UID_PREFIX = "game-cube";
 
-       private static RetroPlatform platform;
+       private static Platform platform;
 
        static construct {
-               platform = new RetroPlatform (PLATFORM_ID, PLATFORM_NAME, { MIME_TYPE }, PLATFORM_UID_PREFIX);
+               platform = new Platform (PLATFORM_ID, PLATFORM_NAME, { MIME_TYPE }, PLATFORM_UID_PREFIX);
        }
 
        public Platform[] get_platforms () {
diff --git a/plugins/mame/src/mame-game-uri-adapter.vala b/plugins/mame/src/mame-game-uri-adapter.vala
index e89bbe69..4e04dc60 100644
--- a/plugins/mame/src/mame-game-uri-adapter.vala
+++ b/plugins/mame/src/mame-game-uri-adapter.vala
@@ -1,9 +1,9 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
 private class Games.MameGameUriAdapter : GameUriAdapter, Object {
-       private RetroPlatform platform;
+       private Platform platform;
 
-       public MameGameUriAdapter (RetroPlatform platform) {
+       public MameGameUriAdapter (Platform platform) {
                this.platform = platform;
        }
 
diff --git a/plugins/mame/src/mame-plugin.vala b/plugins/mame/src/mame-plugin.vala
index 4661dcab..def219c9 100644
--- a/plugins/mame/src/mame-plugin.vala
+++ b/plugins/mame/src/mame-plugin.vala
@@ -7,11 +7,11 @@ private class Games.MamePlugin : Object, Plugin {
        private const string PLATFORM_NAME = _("Arcade");
        private const string PLATFORM_UID_PREFIX = "mame";
 
-       private static RetroPlatform platform;
+       private static Platform platform;
 
        static construct {
                string[] mime_types = { SEARCHED_MIME_TYPE };
-               platform = new RetroPlatform (PLATFORM_ID, PLATFORM_NAME, mime_types, PLATFORM_UID_PREFIX);
+               platform = new Platform (PLATFORM_ID, PLATFORM_NAME, mime_types, PLATFORM_UID_PREFIX);
        }
 
        public Platform[] get_platforms () {
diff --git a/plugins/ms-dos/src/ms-dos-plugin.vala b/plugins/ms-dos/src/ms-dos-plugin.vala
index a0249a5f..118dccfe 100644
--- a/plugins/ms-dos/src/ms-dos-plugin.vala
+++ b/plugins/ms-dos/src/ms-dos-plugin.vala
@@ -6,10 +6,10 @@ private class Games.MsDosPlugin : Object, Plugin {
        private const string PLATFORM_NAME = _("MS-DOS");
        private const string PLATFORM_UID_PREFIX = "ms-dos";
 
-       private static RetroPlatform platform;
+       private static Platform platform;
 
        static construct {
-               platform = new RetroPlatform (PLATFORM_ID, PLATFORM_NAME, { MIME_TYPE }, PLATFORM_UID_PREFIX);
+               platform = new Platform (PLATFORM_ID, PLATFORM_NAME, { MIME_TYPE }, PLATFORM_UID_PREFIX);
        }
 
        public Platform[] get_platforms () {
diff --git a/plugins/nintendo-3ds/src/nintendo-3ds-plugin.vala 
b/plugins/nintendo-3ds/src/nintendo-3ds-plugin.vala
index da868a24..6854d719 100644
--- a/plugins/nintendo-3ds/src/nintendo-3ds-plugin.vala
+++ b/plugins/nintendo-3ds/src/nintendo-3ds-plugin.vala
@@ -8,10 +8,10 @@ private class Games.Nintendo3DsPlugin : Object, Plugin {
        private const string PLATFORM_UID_PREFIX = "nintendo-3ds";
        private const string[] MIME_TYPES = { 3DS_MIME_TYPE, 3DSX_MIME_TYPE };
 
-       private static RetroPlatform platform;
+       private static Platform platform;
 
        static construct {
-               platform = new RetroPlatform (PLATFORM_ID, PLATFORM_NAME, MIME_TYPES, PLATFORM_UID_PREFIX);
+               platform = new Platform (PLATFORM_ID, PLATFORM_NAME, MIME_TYPES, PLATFORM_UID_PREFIX);
        }
 
        public Platform[] get_platforms () {
diff --git a/plugins/nintendo-64/src/nintendo-64-platform.vala 
b/plugins/nintendo-64/src/nintendo-64-platform.vala
index 9ca1f6ff..c6775f13 100644
--- a/plugins/nintendo-64/src/nintendo-64-platform.vala
+++ b/plugins/nintendo-64/src/nintendo-64-platform.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-public class Games.Nintendo64Platform : RetroPlatform {
+public class Games.Nintendo64Platform : Platform {
        public Nintendo64Platform (string id, string name, string[] mime_types, string prefix) {
                base (id, name, mime_types, prefix);
        }
diff --git a/plugins/nintendo-64/src/nintendo-64-plugin.vala b/plugins/nintendo-64/src/nintendo-64-plugin.vala
index da9eecc5..d8bb996b 100644
--- a/plugins/nintendo-64/src/nintendo-64-plugin.vala
+++ b/plugins/nintendo-64/src/nintendo-64-plugin.vala
@@ -6,7 +6,7 @@ private class Games.Nintendo64Plugin : Object, Plugin {
        private const string PLATFORM_NAME = _("Nintendo 64");
        private const string PLATFORM_UID_PREFIX = "nintendo-64";
 
-       private static RetroPlatform platform;
+       private static Platform platform;
 
        static construct {
                platform = new Nintendo64Platform (PLATFORM_ID, PLATFORM_NAME, { MIME_TYPE }, 
PLATFORM_UID_PREFIX);
diff --git a/plugins/nintendo-ds/src/nintendo-ds-platform.vala 
b/plugins/nintendo-ds/src/nintendo-ds-platform.vala
index 1629987f..5a926124 100644
--- a/plugins/nintendo-ds/src/nintendo-ds-platform.vala
+++ b/plugins/nintendo-ds/src/nintendo-ds-platform.vala
@@ -1,6 +1,6 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-public class Games.NintendoDsPlatform : RetroPlatform {
+public class Games.NintendoDsPlatform : Platform {
        public NintendoDsPlatform (string id, string name, string[] mime_types, string prefix) {
                base (id, name, mime_types, prefix);
        }
diff --git a/plugins/playstation/src/playstation-game-factory.vala 
b/plugins/playstation/src/playstation-game-factory.vala
index 3f7164fe..ed3d635d 100644
--- a/plugins/playstation/src/playstation-game-factory.vala
+++ b/plugins/playstation/src/playstation-game-factory.vala
@@ -13,10 +13,10 @@ public class Games.PlayStationGameFactory : Object, UriGameFactory {
        private HashTable<Uri, Game> game_for_uri;
        private HashTable<string, Game> game_for_disc_set_id;
        private GenericSet<Game> games;
-       private RetroPlatform platform;
+       private Platform platform;
        private unowned GameCallback game_added_callback;
 
-       public PlayStationGameFactory (RetroPlatform platform) {
+       public PlayStationGameFactory (Platform platform) {
                media_for_disc_id = new HashTable<string, Media> (str_hash, str_equal);
                game_for_uri = new HashTable<Uri, Game> (Uri.hash, Uri.equal);
                game_for_disc_set_id = new HashTable<string, Game> (GLib.str_hash, GLib.str_equal);
diff --git a/plugins/playstation/src/playstation-plugin.vala b/plugins/playstation/src/playstation-plugin.vala
index dfc90612..b994f85d 100644
--- a/plugins/playstation/src/playstation-plugin.vala
+++ b/plugins/playstation/src/playstation-plugin.vala
@@ -7,11 +7,11 @@ private class Games.PlayStation : Object, Plugin {
        private const string PLATFORM_NAME = _("PlayStation");
        private const string PLATFORM_UID_PREFIX = "playstation";
 
-       private static RetroPlatform platform;
+       private static Platform platform;
 
        static construct {
                string[] mime_types = { CUE_MIME_TYPE, PHONY_MIME_TYPE };
-               platform = new RetroPlatform (PLATFORM_ID, PLATFORM_NAME, mime_types, PLATFORM_UID_PREFIX);
+               platform = new Platform (PLATFORM_ID, PLATFORM_NAME, mime_types, PLATFORM_UID_PREFIX);
        }
 
        public Platform[] get_platforms () {
diff --git a/plugins/sega-cd/src/sega-cd-plugin.vala b/plugins/sega-cd/src/sega-cd-plugin.vala
index b25329a8..5c69d164 100644
--- a/plugins/sega-cd/src/sega-cd-plugin.vala
+++ b/plugins/sega-cd/src/sega-cd-plugin.vala
@@ -14,14 +14,14 @@ private class Games.SegaCDPlugin : Object, Plugin {
        /* translators: known as "Mega-CD 32X" in most of the world */
        private const string SEGA_CD_32X_PLATFORM_NAME = _("Sega CD 32X");
 
-       private static RetroPlatform platform_sega_cd;
-       private static RetroPlatform platform_sega_cd_32x;
+       private static Platform platform_sega_cd;
+       private static Platform platform_sega_cd_32x;
 
        static construct {
                string[] mime_types = { CUE_MIME_TYPE, SEGA_CD_MIME_TYPE };
                string[] mime_types_32x = { CUE_MIME_TYPE, SEGA_CD_MIME_TYPE, 32X_MIME_TYPE };
-               platform_sega_cd = new RetroPlatform (SEGA_CD_PLATFORM_ID, SEGA_CD_PLATFORM_NAME, mime_types, 
SEGA_CD_UID_PREFIX);
-               platform_sega_cd_32x = new RetroPlatform (SEGA_CD_32X_PLATFORM_ID, SEGA_CD_32X_PLATFORM_NAME, 
mime_types_32x, SEGA_CD_32X_UID_PREFIX);
+               platform_sega_cd = new Platform (SEGA_CD_PLATFORM_ID, SEGA_CD_PLATFORM_NAME, mime_types, 
SEGA_CD_UID_PREFIX);
+               platform_sega_cd_32x = new Platform (SEGA_CD_32X_PLATFORM_ID, SEGA_CD_32X_PLATFORM_NAME, 
mime_types_32x, SEGA_CD_32X_UID_PREFIX);
        }
 
        public Platform[] get_platforms () {
@@ -71,7 +71,7 @@ private class Games.SegaCDPlugin : Object, Plugin {
                var header = new SegaCDHeader (bin_file);
                header.check_validity ();
 
-               RetroPlatform platform;
+               Platform platform;
                if (header.is_sega_cd ())
                        platform = platform_sega_cd;
                else if (header.is_sega_cd_32x ())
diff --git a/plugins/sega-saturn/src/sega-saturn-plugin.vala b/plugins/sega-saturn/src/sega-saturn-plugin.vala
index 4895db2a..9aa2a543 100644
--- a/plugins/sega-saturn/src/sega-saturn-plugin.vala
+++ b/plugins/sega-saturn/src/sega-saturn-plugin.vala
@@ -7,11 +7,11 @@ private class Games.SegaSaturnPlugin : Object, Plugin {
        private const string PLATFORM_NAME = _("Sega Saturn");
        private const string PLATFORM_UID_PREFIX = "sega-saturn";
 
-       private static RetroPlatform platform;
+       private static Platform platform;
 
        static construct {
                string[] mime_types = { CUE_MIME_TYPE, SEGA_SATURN_MIME_TYPE };
-               platform = new RetroPlatform (PLATFORM_ID, PLATFORM_NAME, mime_types, PLATFORM_UID_PREFIX);
+               platform = new Platform (PLATFORM_ID, PLATFORM_NAME, mime_types, PLATFORM_UID_PREFIX);
        }
 
        public Platform[] get_platforms () {
diff --git a/plugins/turbografx-cd/src/turbografx-cd-plugin.vala 
b/plugins/turbografx-cd/src/turbografx-cd-plugin.vala
index 0bdc9472..731cbbee 100644
--- a/plugins/turbografx-cd/src/turbografx-cd-plugin.vala
+++ b/plugins/turbografx-cd/src/turbografx-cd-plugin.vala
@@ -9,11 +9,11 @@ private class Games.TurboGrafxCDPlugin : Object, Plugin {
        private const string PLATFORM_NAME = _("TurboGrafx-CD");
        private const string PLATFORM_UID_PREFIX = "pc-engine";
 
-       private static RetroPlatform platform;
+       private static Platform platform;
 
        static construct {
                string[] mime_types = { CUE_MIME_TYPE, PHONY_MIME_TYPE };
-               platform = new RetroPlatform (PLATFORM_ID, PLATFORM_NAME, mime_types, PLATFORM_UID_PREFIX);
+               platform = new Platform (PLATFORM_ID, PLATFORM_NAME, mime_types, PLATFORM_UID_PREFIX);
        }
 
        public Platform[] get_platforms () {
diff --git a/plugins/virtual-boy/src/virtual-boy-plugin.vala b/plugins/virtual-boy/src/virtual-boy-plugin.vala
index 729632e9..c102dcbe 100644
--- a/plugins/virtual-boy/src/virtual-boy-plugin.vala
+++ b/plugins/virtual-boy/src/virtual-boy-plugin.vala
@@ -6,10 +6,10 @@ private class Games.VirtualBoyPlugin : Object, Plugin {
        private const string PLATFORM_NAME = _("Virtual Boy");
        private const string PLATFORM_UID_PREFIX = "virtual-boy";
 
-       private static RetroPlatform platform;
+       private static Platform platform;
 
        static construct {
-               platform = new RetroPlatform (PLATFORM_ID, PLATFORM_NAME, { MIME_TYPE }, PLATFORM_UID_PREFIX);
+               platform = new Platform (PLATFORM_ID, PLATFORM_NAME, { MIME_TYPE }, PLATFORM_UID_PREFIX);
        }
 
        public Platform[] get_platforms () {
diff --git a/plugins/wii/src/wii-plugin.vala b/plugins/wii/src/wii-plugin.vala
index c1ff2697..93441bd5 100644
--- a/plugins/wii/src/wii-plugin.vala
+++ b/plugins/wii/src/wii-plugin.vala
@@ -6,10 +6,10 @@ private class Games.WiiPlugin : Object, Plugin {
        private const string PLATFORM_NAME = _("Wii");
        private const string PLATFORM_UID_PREFIX = "wii";
 
-       private static RetroPlatform platform;
+       private static Platform platform;
 
        static construct {
-               platform = new RetroPlatform (PLATFORM_ID, PLATFORM_NAME, { MIME_TYPE }, PLATFORM_UID_PREFIX);
+               platform = new Platform (PLATFORM_ID, PLATFORM_NAME, { MIME_TYPE }, PLATFORM_UID_PREFIX);
        }
 
        public Platform[] get_platforms () {
diff --git a/src/core/migrator.vala b/src/core/migrator.vala
index c1bdd356..81ffa3ad 100644
--- a/src/core/migrator.vala
+++ b/src/core/migrator.vala
@@ -277,27 +277,22 @@ class Games.Migrator : Object {
        }
 
 
-       private static RetroPlatform platform_from_game_uid (string game_uid) {
+       private static Platform platform_from_game_uid (string game_uid) {
                // [game_uid] is currently formed as "[platform]-[hash]"
                // So we can use the game_uid to get the platform
                var platforms_register = PlatformRegister.get_register ();
                var platforms = platforms_register.get_all_platforms ();
 
                string best_match = null;
-               RetroPlatform result_platform = null;
+               Platform result_platform = null;
 
                foreach (var platform in platforms) {
-                       var retro_platform = platform as RetroPlatform;
-
-                       if (retro_platform == null)
-                               continue; // not a RetroPlatform
-
                        var platform_uid_prefix = platform.get_uid_prefix ();
 
                        if (game_uid.contains (platform_uid_prefix)) {
                                if (best_match == null || platform_uid_prefix.length > best_match.length) {
                                        best_match = platform_uid_prefix;
-                                       result_platform = retro_platform;
+                                       result_platform = platform;
                                }
                        }
                }
diff --git a/src/core/platform.vala b/src/core/platform.vala
index 1a438de1..bf38a421 100644
--- a/src/core/platform.vala
+++ b/src/core/platform.vala
@@ -1,15 +1,41 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
-public interface Games.Platform : Object {
-       public abstract string get_id ();
+public class Games.Platform : Object {
+       private string name;
+       private string id;
+       private string[] mime_types;
+       private string prefix;
+
+       public Platform (string id, string name, string[] mime_types, string prefix) {
+               this.id = id;
+               this.name = name;
+               this.mime_types = mime_types;
+               this.prefix = prefix;
+       }
+
+       public string get_id () {
+               return id;
+       }
+
+       public string get_name () {
+               return name;
+       }
 
-       public abstract string get_name ();
+       public string get_uid_prefix () {
+               return prefix;
+       }
 
-       public abstract string get_uid_prefix ();
+       public string[] get_mime_types () {
+               return mime_types;
+       }
 
-       public abstract Gtk.ListBoxRow get_row ();
+       public Gtk.ListBoxRow get_row () {
+               return new PreferencesPagePlatformsRetroRow (this);
+       }
 
-       public abstract Type get_snapshot_type ();
+       public virtual Type get_snapshot_type () {
+               return typeof (Snapshot);
+       }
 
        public static uint hash (Platform platform) {
                return str_hash (platform.get_id ());
@@ -29,5 +55,4 @@ public interface Games.Platform : Object {
 
                return @"$platforms_dir/$id/system";
        }
-
 }
diff --git a/src/meson.build b/src/meson.build
index 56ee66af..3f175b83 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -104,7 +104,6 @@ vala_sources = [
   'retro/retro-gamepad.vala',
   'retro/retro-input-manager.vala',
   'retro/retro-options.vala',
-  'retro/retro-platform.vala',
   'retro/retro-runner.vala',
   'retro/retro-runner-factory.vala',
   'retro/retro-simple-game-uri-adapter.vala',
diff --git a/src/preferences/preferences-page-platforms-retro-row.vala 
b/src/preferences/preferences-page-platforms-retro-row.vala
index b7ba6c29..8f5ecc28 100644
--- a/src/preferences/preferences-page-platforms-retro-row.vala
+++ b/src/preferences/preferences-page-platforms-retro-row.vala
@@ -1,11 +1,11 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
 private class Games.PreferencesPagePlatformsRetroRow : Hdy.ComboRow {
-       public RetroPlatform platform { get; construct; }
+       public Platform platform { get; construct; }
 
        private ListStore model;
 
-       public PreferencesPagePlatformsRetroRow (RetroPlatform platform) {
+       public PreferencesPagePlatformsRetroRow (Platform platform) {
                Object (platform: platform);
        }
 
diff --git a/src/retro/retro-core-manager.vala b/src/retro/retro-core-manager.vala
index 0e6a793a..0e9a0821 100644
--- a/src/retro/retro-core-manager.vala
+++ b/src/retro/retro-core-manager.vala
@@ -46,16 +46,16 @@ public class Games.RetroCoreManager : Object {
                return core_descriptor_ids[id];
        }
 
-       private Settings get_settings (RetroPlatform platform) {
+       private Settings get_settings (Platform platform) {
                var path = "/org/gnome/Games/platforms/%s/".printf (platform.get_id ());
                return new Settings.with_path ("org.gnome.Games.platforms", path);
        }
 
-       public void set_preferred_core (RetroPlatform platform, Retro.CoreDescriptor core_descriptor) {
+       public void set_preferred_core (Platform platform, Retro.CoreDescriptor core_descriptor) {
                get_settings (platform).set_string ("preferred-core", core_descriptor.get_id ());
        }
 
-       public Retro.CoreDescriptor? get_preferred_core (RetroPlatform platform) {
+       public Retro.CoreDescriptor? get_preferred_core (Platform platform) {
                if (!searched) {
                        searched = true;
                        search_modules ();
@@ -76,7 +76,7 @@ public class Games.RetroCoreManager : Object {
                return core_descriptor;
        }
 
-       public Retro.CoreDescriptor[] get_cores_for_platform (RetroPlatform platform) {
+       public Retro.CoreDescriptor[] get_cores_for_platform (Platform platform) {
                if (!searched) {
                        searched = true;
                        search_modules ();
diff --git a/src/retro/retro-core-source.vala b/src/retro/retro-core-source.vala
index 57770495..e1f5a267 100644
--- a/src/retro/retro-core-source.vala
+++ b/src/retro/retro-core-source.vala
@@ -1,11 +1,11 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
 public class Games.RetroCoreSource : Object {
-       private RetroPlatform platform;
+       private Platform platform;
 
        private Retro.CoreDescriptor core_descriptor;
 
-       public RetroCoreSource (RetroPlatform platform) {
+       public RetroCoreSource (Platform platform) {
                this.platform = platform;
        }
 
diff --git a/src/retro/retro-runner-factory.vala b/src/retro/retro-runner-factory.vala
index 48ba89b8..3fa2dd9a 100644
--- a/src/retro/retro-runner-factory.vala
+++ b/src/retro/retro-runner-factory.vala
@@ -1,9 +1,9 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
 public class Games.RetroRunnerFactory : Object, RunnerFactory {
-       private RetroPlatform platform;
+       private Platform platform;
 
-       public RetroRunnerFactory (RetroPlatform platform) {
+       public RetroRunnerFactory (Platform platform) {
                this.platform = platform;
        }
 
diff --git a/src/retro/retro-simple-game-uri-adapter.vala b/src/retro/retro-simple-game-uri-adapter.vala
index 73aaf4c2..ca383334 100644
--- a/src/retro/retro-simple-game-uri-adapter.vala
+++ b/src/retro/retro-simple-game-uri-adapter.vala
@@ -2,9 +2,9 @@
 
 private class Games.RetroSimpleGameUriAdapter : GameUriAdapter, Object {
        private RetroSimpleType simple_type;
-       private RetroPlatform platform;
+       private Platform platform;
 
-       public RetroSimpleGameUriAdapter (RetroSimpleType simple_type, RetroPlatform platform) {
+       public RetroSimpleGameUriAdapter (RetroSimpleType simple_type, Platform platform) {
                this.simple_type = simple_type;
                this.platform = platform;
        }
diff --git a/src/ui/application.vala b/src/ui/application.vala
index 4a1aee06..74c05af6 100644
--- a/src/ui/application.vala
+++ b/src/ui/application.vala
@@ -460,7 +460,7 @@ public class Games.Application : Gtk.Application {
                        }
 
                        var platform_name = simple_type.get_platform_name ();
-                       var platform = new RetroPlatform (simple_type.platform, platform_name, { 
simple_type.mime_type }, simple_type.prefix);
+                       var platform = new Platform (simple_type.platform, platform_name, { 
simple_type.mime_type }, simple_type.prefix);
                        platform_register.add_platform (platform);
 
                        var game_uri_adapter = new RetroSimpleGameUriAdapter (simple_type, platform);


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