From 9a9989d6ace0a8949667a68dafdf5480dbc66f09 Mon Sep 17 00:00:00 2001
From: Vincent-FK <vincent.buso@funkey-project.com>
Date: Mon, 26 Apr 2021 08:15:14 +0200
Subject: [PATCH] use keymap rom and keymap default

Signed-off-by: Vincent-FK <vincent.buso@funkey-project.com>
---
 RetroFE/Source/Execute/Launcher.cpp | 45 +++++++++--------------------
 RetroFE/Source/Utility/Utils.h      |  4 +--
 2 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/RetroFE/Source/Execute/Launcher.cpp b/RetroFE/Source/Execute/Launcher.cpp
index 54e7e7f..c9628df 100755
--- a/RetroFE/Source/Execute/Launcher.cpp
+++ b/RetroFE/Source/Execute/Launcher.cpp
@@ -120,37 +120,16 @@ bool Launcher::run(std::string collection, Item *collectionItem)
                                         selectedItemsDirectory,
                                         collection);
 
-    /* Apply key mapping for selected item's directory if found */
-    std::string selectedItemDirnameKeyfile = Utils::getDirectory(selectedItemsPath) + "/default_config.key";
-    if (!access(selectedItemDirnameKeyfile.c_str(), R_OK)) {
+    /* Create shell cmd */
+    std::string cmd = SHELL_CMD_MAPPING_ROM;
+    cmd += " \"" + selectedItemsPath + "\"";
 
-        /* Create shell cmd */
-        std::string cmd = SHELL_CMD_MAPPING_SET;
-        cmd += " " + selectedItemDirnameKeyfile;
-
-        /* Log shell cmd */
-        Logger::write(Logger::ZONE_INFO, "Launcher", "Applying keymap file: " + selectedItemDirnameKeyfile);
-        printf("Applying keymap file cmd: \"%s\"\n", cmd.c_str());
+    /* Log shell cmd */
+    Logger::write(Logger::ZONE_INFO, "Launcher", "Applying keymap rom: " + selectedItemsPath);
+    printf("Applying keymap rom cmd: \"%s\"\n", cmd.c_str());
         
-        /* Launch shell cmd */
-        system(cmd.c_str());
-    }
-
-    /* Apply specific key mapping for selected item if found */
-    std::string selectedItemBasenameKeyfile = Utils::removeExtension(selectedItemsPath) + ".key";
-    if (!access(selectedItemBasenameKeyfile.c_str(), R_OK)) {
-
-        /* Create shell cmd */
-        std::string cmd = SHELL_CMD_MAPPING_SET;
-        cmd += " " + selectedItemBasenameKeyfile;
-
-        /* Log shell cmd */
-        Logger::write(Logger::ZONE_INFO, "Launcher", "Applying keymap file: " + selectedItemBasenameKeyfile);
-        printf("Applying keymap file cmd: \"%s\"\n", cmd.c_str());
-        
-        /* Launch shell cmd */
-        system(cmd.c_str());
-    }
+    /* Launch shell cmd */
+    system(cmd.c_str());
 
     /* Restart audio amp */
     system(SHELL_CMD_TURN_AMPLI_ON);
@@ -165,8 +144,12 @@ bool Launcher::run(std::string collection, Item *collectionItem)
     /* Stop audio amp */
     system(SHELL_CMD_TURN_AMPLI_OFF);
 
-    /* Reset default key mapping */
-    system(SHELL_CMD_MAPPING_RESET);
+    /* Log shell cmd */
+    Logger::write(Logger::ZONE_INFO, "Launcher", "Applying keymap default");
+    printf("Applying keymap default cmd: \"%s\"\n", SHELL_CMD_MAPPING_DEFAULT);
+
+    /* Restore default key mapping */
+    system(SHELL_CMD_MAPPING_DEFAULT);
 
     /* Restore stored PID */
     char shellCmd[20];
diff --git a/RetroFE/Source/Utility/Utils.h b/RetroFE/Source/Utility/Utils.h
index a1def8a..02c36f6 100755
--- a/RetroFE/Source/Utility/Utils.h
+++ b/RetroFE/Source/Utility/Utils.h
@@ -25,8 +25,8 @@
 #define SHELL_CMD_RECORD_PID            "record_pid"
 #define SHELL_CMD_TURN_AMPLI_ON         "start_audio_amp 1"
 #define SHELL_CMD_TURN_AMPLI_OFF        "start_audio_amp 0"
-#define SHELL_CMD_MAPPING_SET           "keymap"
-#define SHELL_CMD_MAPPING_RESET         "keymap reset"
+#define SHELL_CMD_MAPPING_ROM           "keymap rom"
+#define SHELL_CMD_MAPPING_DEFAULT       "keymap default"
 
 class Utils
 {