From 03ec8459779f5d33beaf6f5bbf4ce2ac2fb75949 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 24 Feb 2014 18:23:12 +0100
Subject: [PATCH] (Salamander) frontend_context.h gets new member function
 'salamander_init'

---
 frontend/frontend_context.h      | 3 +++
 frontend/frontend_salamander.c   | 9 +++++++--
 frontend/platform/platform_gx.c  | 5 ++++-
 frontend/platform/platform_ps3.c | 5 ++++-
 frontend/platform/platform_psp.c | 3 +++
 frontend/platform/platform_xdk.c | 5 ++++-
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/frontend/frontend_context.h b/frontend/frontend_context.h
index bebb385d25..f6074bd268 100644
--- a/frontend/frontend_context.h
+++ b/frontend/frontend_context.h
@@ -39,6 +39,9 @@ typedef struct frontend_ctx_driver
 
    // Human readable string.
    const char *ident;
+#ifdef IS_SALAMANDER
+   void (*salamander_init)(void);
+#endif
 } frontend_ctx_driver_t;
 
 extern const frontend_ctx_driver_t frontend_ctx_gx;
diff --git a/frontend/frontend_salamander.c b/frontend/frontend_salamander.c
index e25469af7c..aee8805827 100644
--- a/frontend/frontend_salamander.c
+++ b/frontend/frontend_salamander.c
@@ -96,11 +96,16 @@ int main(int argc, char *argv[])
 
    if (frontend_ctx && frontend_ctx->init)
       frontend_ctx->init(args);
-   get_environment_settings(argc, argv, args);
-   salamander_init_settings();
+
+   if (frontend_ctx && frontend_ctx->environment_get)
+      frontend_ctx->environment_get(argc, argv, args);
+
+   if (frontend_ctx && frontend_ctx->salamander_init)
+      frontend_ctx->salamander_init();
 
    if (frontend_ctx && frontend_ctx->deinit)
       frontend_ctx->deinit(args);
+
    if (frontend_ctx && frontend_ctx->exitspawn)
       frontend_ctx->exitspawn();
 
diff --git a/frontend/platform/platform_gx.c b/frontend/platform/platform_gx.c
index 0386d11251..1fa6354f63 100644
--- a/frontend/platform/platform_gx.c
+++ b/frontend/platform/platform_gx.c
@@ -67,7 +67,7 @@ static void find_and_set_first_file(void)
       RARCH_ERR("Failed last fallback - RetroArch Salamander will exit.\n");
 }
 
-static void salamander_init_settings(void)
+static void salamander_init(void)
 {
    char tmp_str[512] = {0};
    bool config_file_exists;
@@ -376,4 +376,7 @@ const frontend_ctx_driver_t frontend_ctx_gx = {
    system_exec,                     /* exec */
    NULL,                            /* shutdown */
    "gx",
+#ifdef IS_SALAMANDER
+   salamander_init,
+#endif
 };
diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c
index 26c53a09fd..521added65 100644
--- a/frontend/platform/platform_ps3.c
+++ b/frontend/platform/platform_ps3.c
@@ -69,7 +69,7 @@ static void find_and_set_first_file(void)
       RARCH_ERR("Failed last fallback - RetroArch Salamander will exit.\n");
 }
 
-static void salamander_init_settings(void)
+static void salamander_init(void)
 {
    CellPadData pad_data;
    cellPadInit(7);
@@ -462,4 +462,7 @@ const frontend_ctx_driver_t frontend_ctx_ps3 = {
    system_exec,                  /* exec */
    NULL,                         /* shutdown */
    "ps3",
+#ifdef IS_SALAMANDER
+   salamander_init,
+#endif
 };
diff --git a/frontend/platform/platform_psp.c b/frontend/platform/platform_psp.c
index d8057bc182..9016fab378 100644
--- a/frontend/platform/platform_psp.c
+++ b/frontend/platform/platform_psp.c
@@ -132,4 +132,7 @@ const frontend_ctx_driver_t frontend_ctx_psp = {
    NULL,                  	      /* exec */
    NULL,                         /* shutdown */
    "psp",
+#ifdef IS_SALAMANDER
+   NULL,
+#endif
 };
diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c
index e9215f1964..aa9676fdf6 100644
--- a/frontend/platform/platform_xdk.c
+++ b/frontend/platform/platform_xdk.c
@@ -60,7 +60,7 @@ static void find_and_set_first_file(void)
       RARCH_ERR("Failed last fallback - RetroArch Salamander will exit.\n");
 }
 
-static void salamander_init_settings(void)
+static void salamander_init(void)
 {
    XINPUT_STATE state;
    (void)state;
@@ -365,4 +365,7 @@ const frontend_ctx_driver_t frontend_ctx_xdk = {
    system_exec,                  /* exec */
    NULL,                         /* shutdown */
    "xdk",
+#ifdef IS_SALAMANDER
+   salamander_init,
+#endif
 };