# Changes:

- Move to Palladium
- Remove FastLang as lookup table of Lang Sys is fast enough
- Remoev rd7tf theme

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "RenderD7"]
-	path = RenderD7
-	url = https://dev.npid7.de/tobid7/RenderD7.git
 [submodule "D7-Menu-Core"]
 	path = D7-Menu-Core
 	url = https://github.com/NPI-D7/D7-Menu-Core.git
+[submodule "palladium"]
+	path = palladium
+	url = https://github.com/tobid7/palladium

.vscode/c_cpp_properties.json

@@ -4,18 +4,14 @@
             "name": "3DS",
             "includePath": [
                 "${workspaceFolder}/**",
-                "C:/devkitpro/devkitARM/include/**",
-                "C:/devkitpro/devkitARM/arm-none-eabi/include/**",
+                "${workspaceFolder}/palladium/include/**",
                 "C:/devkitpro/libctru/include/**",
                 "C:/devkitpro/portlibs/3ds/include/**",
-                "/opt/devkitpro/devkitARM/include/**",
-                "/opt/devkitpro/devkitARM/arm-none-eabi/include/**",
                 "/opt/devkitpro/libctru/include/**",
                 "/opt/devkitpro/portlibs/3ds/include/**"
             ],
             "cStandard": "c17",
-            "cppStandard": "c++20",
-            "intelliSenseMode": "linux-gcc-x64"
+            "cppStandard": "c++20"
         }
     ],
     "version": 4

Makefile

@@ -65,9 +65,9 @@ VERSION_STRING := $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)
 #---------------------------------------------------------------------------------
 TARGET		:=	BCSTM-Player
 BUILD		:=	build
-SOURCES		:=	source RenderD7/source D7-Menu-Core source/scenes
+SOURCES		:=	source palladium/source palladium/source/base D7-Menu-Core source/scenes
 DATA		:=	data
-INCLUDES	:=	source RenderD7/include D7-Menu-Core source/scenes
+INCLUDES	:=	source palladium/include D7-Menu-Core source/scenes
 GRAPHICS	:=	gfx
 #GFXBUILD	:=	$(BUILD)
 ROMFS		:=	romfs

romfs/lang/de/app.json

@@ -11,7 +11,7 @@
         "HEAD_SETTINGS": "BCSTM-Player -> Einstellungen",
         "HEAD_TITLES": "BCSTM-Player -> Titles",
         "BGB": "Drücke \uE001 um zurückzugehen!",
-        "TPWMR": "Dieses Projekt wurde mit RenderD7 erstellt.",
+        "TPWMR": "Dieses Projekt wurde mit Palladium erstellt.",
         "BROWSE": "Durchsuchen",
         "LANGUAGE": "Sprache: ",
         "SETTINGS": "Einstellungen",

romfs/lang/en/app.json

@@ -11,7 +11,7 @@
         "HEAD_SETTINGS": "BCSTM-Player -> Settings",
         "HEAD_TITLES": "BCSTM-Player -> Titles",
         "BGB": "Press \uE001 to go back!",
-        "TPWMR": "This Project was made with RenderD7.",
+        "TPWMR": "This Project was made with Palladium.",
         "BROWSE": "Browse",
         "LANGUAGE": "Language: ",
         "SETTINGS": "Settings",

source/bcstm.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <rd7.hpp>
+#include <fstream>
+#include <pd.hpp>
 
 namespace D7 {
 class BCSTM {
@@ -77,10 +78,10 @@ class BCSTM {
 
   unsigned int active_channels = 0;
   unsigned short channel[2];
+
   ndspWaveBuf wave_buf[2][buffer_count];
   ndspAdpcmData adpcm_data[2][2];
-
-  std::vector<unsigned char, RD7::LinearAllocator<unsigned char>>
+  std::vector<unsigned char, PD::LinearAllocator<unsigned char>>
       buffer_data[2][buffer_count];
 };
 }  // namespace D7

source/common.cpp

@@ -36,7 +36,7 @@ std::string Clock() {
 void CheckForUpdate() {
   // Dont create infinite tasks
   if (checking_for_update) return;
-  RenderD7::Tasks::Create([&]() {
+  PD::Tasks::Create([&]() {
     checking_for_update = true;
     update_info = Update();
     update_info.nightly = config.GetBool("use_nightly");
@@ -47,7 +47,7 @@ void CheckForUpdate() {
       url = "https://api.github.com/repos/NPI-D7/BCSTM-Player/releases/latest";
     }
     nlohmann::json js;
-    auto ret = RD7::Net::JsonApiRequest(url, js);
+    auto ret = PD::Net::JsonApiRequest(url, js);
     if (ret) {
       update_info = Update();
       checking_for_update = false;
@@ -59,8 +59,7 @@ void CheckForUpdate() {
       update_info.text = js[0]["commit"]["message"];
       update_info.valid = true;
       if (update_info.version.compare(N_STRING) != 0) {
-        RenderD7::PushMessage(RD7::Lang::Get("UPDATER"),
-                              RD7::Lang::Get("UPTFND"));
+        PD::PushMessage(PD::Lang::Get("UPDATER"), PD::Lang::Get("UPTFND"));
       }
     } else {
       update_info.version = js["tag_name"];
@@ -72,128 +71,10 @@ void CheckForUpdate() {
       update_info.text = js["body"];
       update_info.valid = true;
       if (update_info.version.substr(1).compare(V_STRING) > 0) {
-        RenderD7::PushMessage(RD7::Lang::Get("UPDATER"),
-                              RD7::Lang::Get("UPTFND"));
+        PD::PushMessage(PD::Lang::Get("UPDATER"), PD::Lang::Get("UPTFND"));
       }
     }
     checking_for_update = false;
   });
 }
-namespace Lang {
-void Update() {
-  RD7::Ftrace::ScopedTrace st("app", "lang_reload");
-  HEAD_FILEMANAGER = RD7::Lang::Get("HEAD_FILEMANAGER");
-  NDSP_STATUS = RD7::Lang::Get("NDSP_STATUS");
-  HEAD_MAINMENU = RD7::Lang::Get("HEAD_MAINMENU");
-  HEAD_SETTINGS = RD7::Lang::Get("HEAD_SETTINGS");
-  HEAD_TITLES = RD7::Lang::Get("HEAD_TITLES");
-  BGB = RD7::Lang::Get("BGB");
-  TPWMR = RD7::Lang::Get("TPWMR");
-  BROWSE = RD7::Lang::Get("BROWSE");
-  LANGUAGE = RD7::Lang::Get("LANGUAGE");
-  SETTINGS = RD7::Lang::Get("SETTINGS");
-  CONTROLCENTER = RD7::Lang::Get("CONTROLCENTER");
-  CREDITSL = RD7::Lang::Get("CREDITSL");
-  VERSION = RD7::Lang::Get("VERSION");
-  INFO = RD7::Lang::Get("INFO");
-  NOTHING = RD7::Lang::Get("NOTHING");
-  PLAYING = RD7::Lang::Get("PLAYING");
-  DIRENTRYS = RD7::Lang::Get("DIRENTRYS");
-  LOADED = RD7::Lang::Get("LOADED");
-  LOOP = RD7::Lang::Get("LOOP");
-  LOOPSTART = RD7::Lang::Get("LOOPSTART");
-  LOOPEND = RD7::Lang::Get("LOOPEND");
-  CURRENT = RD7::Lang::Get("CURRENT");
-  TOTAL = RD7::Lang::Get("TOTAL");
-  CHANNELS = RD7::Lang::Get("CHANNELS");
-  SRATE = RD7::Lang::Get("SRATE");
-  ERROR = RD7::Lang::Get("ERROR");
-  YES = RD7::Lang::Get("YES");
-  NO = RD7::Lang::Get("NO");
-  PLAY = RD7::Lang::Get("PLAY");
-  PAUSE = RD7::Lang::Get("PAUSE");
-  STOP = RD7::Lang::Get("STOP");
-  NFP = RD7::Lang::Get("NFP");
-  EXIT = RD7::Lang::Get("EXIT");
-  TITLES = RD7::Lang::Get("TITLES");
-  AUTHOR = RD7::Lang::Get("AUTHOR");
-  TRANSISIONS = RD7::Lang::Get("TRANSISIONS");
-  NEXT = RD7::Lang::Get("NEXT");
-  RD7TF_THEME = RD7::Lang::Get("RD7TF_THEME");
-  CLOCK = RD7::Lang::Get("CLOCK");
-  i24HRS = RD7::Lang::Get("24HRS");
-  SHOWSECONDS = RD7::Lang::Get("SHOWSECONDS");
-  APPEARANCE = RD7::Lang::Get("APPEARANCE");
-  DEVELOPER = RD7::Lang::Get("DEVELOPER");
-  SHOWTITLEOPT = RD7::Lang::Get("SHOWTITLEOPT");
-  UPDATER = RD7::Lang::Get("UPDATER");
-  AUTOSEARCHUPDATE = RD7::Lang::Get("AUTOSEARCHUPDATE");
-  USENIGHTLY = RD7::Lang::Get("USENIGHTLY");
-  CHECK = RD7::Lang::Get("CHECK");
-  UPDATE = RD7::Lang::Get("UPDATE");
-  DOWNLOAD = RD7::Lang::Get("DOWNLOAD");
-  UPDFAILED = RD7::Lang::Get("UPDFAILED");
-  UPDDONE = RD7::Lang::Get("UPDDONE");
-  INSTERR = RD7::Lang::Get("INSTERR");
-  INSTALLING = RD7::Lang::Get("INSTALLING");
-  EXECMODE = RD7::Lang::Get("EXECMODE");
-  UPTFND = RD7::Lang::Get("UPTFND");
-}
-std::string HEAD_FILEMANAGER;
-std::string NDSP_STATUS;
-std::string HEAD_MAINMENU;
-std::string HEAD_SETTINGS;
-std::string HEAD_TITLES;
-std::string BGB;
-std::string TPWMR;
-std::string BROWSE;
-std::string LANGUAGE;
-std::string SETTINGS;
-std::string CONTROLCENTER;
-std::string CREDITSL;
-std::string VERSION;
-std::string INFO;
-std::string NOTHING;
-std::string PLAYING;
-std::string DIRENTRYS;
-std::string LOADED;
-std::string LOOP;
-std::string LOOPSTART;
-std::string LOOPEND;
-std::string CURRENT;
-std::string TOTAL;
-std::string CHANNELS;
-std::string SRATE;
-std::string ERROR;
-std::string YES;
-std::string NO;
-std::string PLAY;
-std::string PAUSE;
-std::string STOP;
-std::string NFP;
-std::string EXIT;
-std::string TITLES;
-std::string AUTHOR;
-std::string TRANSISIONS;
-std::string NEXT;
-std::string RD7TF_THEME;
-std::string CLOCK;
-std::string i24HRS;
-std::string SHOWSECONDS;
-std::string APPEARANCE;
-std::string DEVELOPER;
-std::string SHOWTITLEOPT;
-std::string UPDATER;
-std::string AUTOSEARCHUPDATE;
-std::string USENIGHTLY;
-std::string CHECK;
-std::string UPDATE;
-std::string DOWNLOAD;
-std::string UPDFAILED;
-std::string UPDDONE;
-std::string INSTERR;
-std::string INSTALLING;
-std::string EXECMODE;
-std::string UPTFND;
-}  // namespace Lang
 }  // namespace BP