[gnome-games/wip/exalm/rebrand: 98/124] nintendo-ds: Move into the app

[Alexander Mikhaylenko <alexm src gnome org>]

commit 3f4ed9c5f08395d45312b88e126cb7b715f8b1f6
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Tue Mar 30 18:25:28 2021 +0500

    nintendo-ds: Move into the app

 meson_options.txt                                  |  1 -
 plugins/meson.build                                |  1 -
 plugins/nintendo-ds/data/meson.build               |  1 -
 plugins/nintendo-ds/data/nintendo-ds.plugin        |  6 -----
 plugins/nintendo-ds/meson.build                    |  2 --
 plugins/nintendo-ds/src/meson.build                | 31 ----------------------
 plugins/nintendo-ds/src/nintendo-ds-plugin.vala    | 26 ------------------
 plugins/nintendo-ds/src/nintendo-ds.gresource.xml  |  6 -----
 src/meson.build                                    |  7 +++++
 src/org.gnome.Games.gresource.xml                  |  2 ++
 .../platforms/nintendo-ds}/layout-overrides        |  0
 .../nintendo-ds}/nintendo-ds-icon-extract.c        |  0
 .../platforms/nintendo-ds}/nintendo-ds-icon.vala   |  0
 .../platforms/nintendo-ds}/nintendo-ds-layout.vala |  0
 .../platforms/nintendo-ds}/nintendo-ds-parser.vala |  0
 .../platforms/nintendo-ds}/nintendo-ds-runner.vala |  2 +-
 .../nintendo-ds}/nintendo-ds-snapshot.vala         |  0
 src/platforms/platform-register.vala               | 11 ++++++++
 18 files changed, 21 insertions(+), 75 deletions(-)
---
diff --git a/meson_options.txt b/meson_options.txt
index 18fc03eb..29623095 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,7 +10,6 @@ option (
 
 # Plugins
 # This must mirror the list in plugins/meson.build
-option ('nintendo-ds-plugin',   description: 'Support for Nintendo DS games',   type: 'boolean')
 option ('playstation-plugin',   description: 'Support for PlayStation games',   type: 'boolean')
 option ('sega-cd-plugin',       description: 'Support for Sega CD games',       type: 'boolean')
 option ('sega-saturn-plugin',   description: 'Support for Sega Saturn games',   type: 'boolean')
diff --git a/plugins/meson.build b/plugins/meson.build
index 9e4f086d..4089dbc4 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -1,5 +1,4 @@
 plugins = [
-  'nintendo-ds',
   'playstation',
   'sega-cd',
   'sega-saturn',
diff --git a/src/meson.build b/src/meson.build
index b2503f9c..a863e14f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -104,6 +104,13 @@ vala_sources = [
   'platforms/nintendo-64/nintendo-64-runner.vala',
   'platforms/nintendo-64/nintendo-64-snapshot.vala',
 
+  'platforms/nintendo-ds/nintendo-ds-icon.vala',
+  'platforms/nintendo-ds/nintendo-ds-icon-extract.c',
+  'platforms/nintendo-ds/nintendo-ds-layout.vala',
+  'platforms/nintendo-ds/nintendo-ds-parser.vala',
+  'platforms/nintendo-ds/nintendo-ds-runner.vala',
+  'platforms/nintendo-ds/nintendo-ds-snapshot.vala',
+
   'platforms/platform.vala',
   'platforms/platform-model.vala',
   'platforms/platform-register.vala',
diff --git a/src/org.gnome.Games.gresource.xml b/src/org.gnome.Games.gresource.xml
index e9224f34..689cb99a 100644
--- a/src/org.gnome.Games.gresource.xml
+++ b/src/org.gnome.Games.gresource.xml
@@ -32,6 +32,8 @@
     <file preprocess="xml-stripblanks">platforms/nintendo-64/nintendo-64-pak-controller.ui</file>
     <file preprocess="xml-stripblanks">platforms/nintendo-64/nintendo-64-pak-switcher.ui</file>
 
+    <file>platforms/nintendo-ds/layout-overrides</file>
+
     <file preprocess="xml-stripblanks">preferences/preferences-page-controllers.ui</file>
     <file preprocess="xml-stripblanks">preferences/preferences-page-platforms.ui</file>
     <file preprocess="xml-stripblanks">preferences/preferences-page-video.ui</file>
diff --git a/plugins/nintendo-ds/src/layout-overrides b/src/platforms/nintendo-ds/layout-overrides
similarity index 100%
rename from plugins/nintendo-ds/src/layout-overrides
rename to src/platforms/nintendo-ds/layout-overrides
diff --git a/plugins/nintendo-ds/src/nintendo-ds-icon-extract.c 
b/src/platforms/nintendo-ds/nintendo-ds-icon-extract.c
similarity index 100%
rename from plugins/nintendo-ds/src/nintendo-ds-icon-extract.c
rename to src/platforms/nintendo-ds/nintendo-ds-icon-extract.c
diff --git a/plugins/nintendo-ds/src/nintendo-ds-icon.vala b/src/platforms/nintendo-ds/nintendo-ds-icon.vala
similarity index 100%
rename from plugins/nintendo-ds/src/nintendo-ds-icon.vala
rename to src/platforms/nintendo-ds/nintendo-ds-icon.vala
diff --git a/plugins/nintendo-ds/src/nintendo-ds-layout.vala 
b/src/platforms/nintendo-ds/nintendo-ds-layout.vala
similarity index 100%
rename from plugins/nintendo-ds/src/nintendo-ds-layout.vala
rename to src/platforms/nintendo-ds/nintendo-ds-layout.vala
diff --git a/plugins/nintendo-ds/src/nintendo-ds-parser.vala 
b/src/platforms/nintendo-ds/nintendo-ds-parser.vala
similarity index 100%
rename from plugins/nintendo-ds/src/nintendo-ds-parser.vala
rename to src/platforms/nintendo-ds/nintendo-ds-parser.vala
diff --git a/plugins/nintendo-ds/src/nintendo-ds-runner.vala 
b/src/platforms/nintendo-ds/nintendo-ds-runner.vala
similarity index 97%
rename from plugins/nintendo-ds/src/nintendo-ds-runner.vala
rename to src/platforms/nintendo-ds/nintendo-ds-runner.vala
index 756b7df2..9eaef9df 100644
--- a/plugins/nintendo-ds/src/nintendo-ds-runner.vala
+++ b/src/platforms/nintendo-ds/nintendo-ds-runner.vala
@@ -42,7 +42,7 @@ private class Games.NintendoDsRunner : Runner {
                gap_overrides = new HashTable<string, string> (str_hash, str_equal);
 
                try {
-                       var bytes = resources_lookup_data 
("/org/gnome/Games/plugins/nintendo-ds/layout-overrides", ResourceLookupFlags.NONE);
+                       var bytes = resources_lookup_data 
("/org/gnome/Games/platforms/nintendo-ds/layout-overrides", ResourceLookupFlags.NONE);
                        var text = (string) bytes.get_data ();
                        var lines = text.split ("\n");
 
diff --git a/plugins/nintendo-ds/src/nintendo-ds-snapshot.vala 
b/src/platforms/nintendo-ds/nintendo-ds-snapshot.vala
similarity index 100%
rename from plugins/nintendo-ds/src/nintendo-ds-snapshot.vala
rename to src/platforms/nintendo-ds/nintendo-ds-snapshot.vala
diff --git a/src/platforms/platform-register.vala b/src/platforms/platform-register.vala
index 727990cf..fac5b640 100644
--- a/src/platforms/platform-register.vala
+++ b/src/platforms/platform-register.vala
@@ -210,6 +210,17 @@ private class Games.PlatformRegister : Object {
                platform.runner_type = typeof (Nintendo64Runner);
                add_platform (platform);
 
+               platform = new Platform (
+                       "NintendoDS",
+                       _("Nintendo DS"),
+                       "application/x-nintendo-ds-rom",
+                       "nintendo-ds"
+               );
+               platform.snapshot_type = typeof (NintendoDsSnapshot);
+               platform.runner_type = typeof (NintendoDsRunner);
+               platform.parser_type = typeof (NintendoDsParser);
+               add_platform (platform);
+
                platform = new Platform (
                        "NintendoEntertainmentSystem",
                        /* translators: known as "Famicom" in eastern Asia */