mirror of
https://github.com/libretro/RetroArch.git
synced 2024-11-28 02:30:35 +00:00
(RARCH_CONSOLE) Combine frontend_console.c with frontend.c - hope
and pray this doesn't break hard
This commit is contained in:
twinaphex
parent
e8a3151440
commit
328ce6ad31
@ -18,8 +18,10 @@
|
||||
#include "../conf/config_file.h"
|
||||
#include "../file.h"
|
||||
|
||||
#ifdef HAVE_RGUI
|
||||
#include "../frontend/menu/rgui.h"
|
||||
#if defined(HAVE_RGUI)
|
||||
#include "menu/rgui.h"
|
||||
#elif defined(HAVE_RMENU)
|
||||
#include "menu/rmenu.h"
|
||||
#endif
|
||||
|
||||
#if defined(__APPLE__) && !defined(OSX)
|
||||
@ -29,6 +31,19 @@
|
||||
// We want to use -mconsole in Win32, so we need main().
|
||||
#elif defined(__QNX__)
|
||||
#include <bps/bps.h>
|
||||
#elif defined(__CELLOS_LV2__)
|
||||
#include "platform/platform_ps3_exec.c"
|
||||
#include "platform/platform_ps3.c"
|
||||
#elif defined(GEKKO)
|
||||
#ifdef HW_RVL
|
||||
#include "platform/platform_gx_exec.c"
|
||||
#endif
|
||||
#include "platform/platform_gx.c"
|
||||
#elif defined(_XBOX)
|
||||
#include "platform/platform_xdk_exec.c"
|
||||
#include "platform/platform_xdk.c"
|
||||
#elif defined(PSP)
|
||||
#include "platform/platform_psp.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI)
|
||||
@ -37,12 +52,76 @@
|
||||
#undef HAVE_MENU
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef RARCH_CONSOLE
|
||||
#include "../config.def.h"
|
||||
#include "frontend_console.h"
|
||||
|
||||
default_paths_t default_paths;
|
||||
|
||||
// Rename core filename executable to a more sane name.
|
||||
static bool libretro_install_core(const char *path_prefix,
|
||||
const char *core_exe_path)
|
||||
{
|
||||
char old_path[PATH_MAX], new_path[PATH_MAX];
|
||||
|
||||
libretro_get_current_core_pathname(old_path, sizeof(old_path));
|
||||
|
||||
strlcat(old_path, DEFAULT_EXE_EXT, sizeof(old_path));
|
||||
snprintf(new_path, sizeof(new_path), "%s%s", path_prefix, old_path);
|
||||
|
||||
/* If core already exists, we are upgrading the core -
|
||||
* delete existing file first. */
|
||||
if (path_file_exists(new_path))
|
||||
{
|
||||
RARCH_LOG("Removing temporary ROM file: %s.\n", new_path);
|
||||
if (remove(new_path) < 0)
|
||||
RARCH_ERR("Failed to remove file: %s.\n", new_path);
|
||||
}
|
||||
|
||||
/* Now attempt the renaming of the core. */
|
||||
RARCH_LOG("Renaming core to: %s.\n", new_path);
|
||||
if (rename(core_exe_path, new_path) < 0)
|
||||
{
|
||||
RARCH_ERR("Failed to rename core.\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
strlcpy(g_settings.libretro, new_path,
|
||||
sizeof(g_settings.libretro));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
#define MAKE_DIR(x, name) { \
|
||||
RARCH_LOG("Checking directory name %s [%s]\n", name, x); \
|
||||
if (strlen(x) > 0) \
|
||||
{ \
|
||||
if (!path_is_directory((x)) )\
|
||||
{ \
|
||||
RARCH_WARN("Directory \"%s\" does not exists, creating\n", (x)); \
|
||||
if (mkdir((x), 0777) != 0) \
|
||||
{ \
|
||||
RARCH_ERR("Could not create directory \"%s\"\n", (x)); \
|
||||
} \
|
||||
} \
|
||||
} \
|
||||
}
|
||||
#endif
|
||||
|
||||
static void rarch_preinit(void)
|
||||
{
|
||||
#if defined(__QNX__) && !defined(HAVE_BB10)
|
||||
//Initialize BPS libraries
|
||||
bps_initialize();
|
||||
rarch_main_clear_state();
|
||||
#elif defined(RARCH_CONSOLE)
|
||||
system_init();
|
||||
#endif
|
||||
}
|
||||
|
||||
static void rarch_get_environment(int argc, char *argv[])
|
||||
{
|
||||
#if defined(__QNX__) && !defined(HAVE_BB10)
|
||||
strlcpy(g_settings.libretro, "app/native/lib", sizeof(g_settings.libretro));
|
||||
strlcpy(g_extern.config_path, "app/native/retroarch.cfg", sizeof(g_extern.config_path));
|
||||
strlcpy(g_settings.video.shader_dir, "app/native/shaders_glsl", sizeof(g_settings.video.shader_dir));
|
||||
@ -50,6 +129,63 @@ static void rarch_preinit(void)
|
||||
config_load();
|
||||
|
||||
g_extern.verbose = true;
|
||||
#elif defined(RARCH_CONSOLE)
|
||||
#if defined(HAVE_LOGGER)
|
||||
g_extern.verbose = true;
|
||||
logger_init();
|
||||
#elif defined(HAVE_FILE_LOGGER)
|
||||
g_extern.verbose = true;
|
||||
g_extern.log_file = fopen("/retroarch-log.txt", "w");
|
||||
#endif
|
||||
g_extern.verbose = true;
|
||||
|
||||
get_environment_settings(argc, argv);
|
||||
|
||||
MAKE_DIR(default_paths.port_dir, "port_dir");
|
||||
MAKE_DIR(default_paths.system_dir, "system_dir");
|
||||
MAKE_DIR(default_paths.savestate_dir, "savestate_dir");
|
||||
MAKE_DIR(default_paths.sram_dir, "sram_dir");
|
||||
MAKE_DIR(default_paths.input_presets_dir, "input_presets_dir");
|
||||
|
||||
config_load();
|
||||
|
||||
/* FIXME - when dummy loading becomes possible perhaps change this param */
|
||||
init_libretro_sym(false);
|
||||
rarch_init_system_info();
|
||||
|
||||
global_init_drivers();
|
||||
|
||||
#ifdef HAVE_LIBRETRO_MANAGEMENT
|
||||
char path_prefix[PATH_MAX];
|
||||
#if defined(_WIN32)
|
||||
char slash = '\\';
|
||||
#else
|
||||
char slash = '/';
|
||||
#endif
|
||||
|
||||
snprintf(path_prefix, sizeof(path_prefix), "%s%c", default_paths.core_dir, slash);
|
||||
|
||||
char core_exe_path[256];
|
||||
snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, DEFAULT_EXE_EXT);
|
||||
|
||||
// Save new libretro core path to config file and exit
|
||||
if (path_file_exists(core_exe_path))
|
||||
if (libretro_install_core(path_prefix, core_exe_path))
|
||||
#ifdef _XBOX
|
||||
g_extern.system.shutdown = g_extern.system.shutdown;
|
||||
#else
|
||||
g_extern.system.shutdown = true;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef GEKKO
|
||||
/* Per-core input config loading */
|
||||
char core_name[64];
|
||||
|
||||
libretro_get_current_core_pathname(core_name, sizeof(core_name));
|
||||
snprintf(g_extern.input_config_path, sizeof(g_extern.input_config_path), "%s/%s.cfg", default_paths.input_presets_dir, core_name);
|
||||
config_read_keybinds(g_extern.input_config_path);
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -58,6 +194,8 @@ int rarch_main(int argc, char *argv[])
|
||||
rarch_preinit();
|
||||
|
||||
rarch_main_clear_state();
|
||||
|
||||
rarch_get_environment(argc, argv);
|
||||
rarch_init_msg_queue();
|
||||
|
||||
int init_ret;
|
||||
@ -65,6 +203,9 @@ int rarch_main(int argc, char *argv[])
|
||||
|
||||
#ifdef HAVE_MENU
|
||||
menu_init();
|
||||
#ifdef RARCH_CONSOLE
|
||||
system_process_args(argc, argv);
|
||||
#endif
|
||||
g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME;
|
||||
|
||||
// If we started a ROM directly from command line,
|
||||
@ -96,6 +237,13 @@ int rarch_main(int argc, char *argv[])
|
||||
}
|
||||
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_GAME))
|
||||
{
|
||||
#ifdef RARCH_CONSOLE
|
||||
driver.input->poll(NULL);
|
||||
|
||||
if (driver.video_poke->set_aspect_ratio)
|
||||
driver.video_poke->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
|
||||
#endif
|
||||
|
||||
while ((g_extern.is_paused && !g_extern.is_oneshot) ? rarch_main_idle_iterate() : rarch_main_iterate());
|
||||
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME);
|
||||
}
|
||||
@ -108,7 +256,7 @@ int rarch_main(int argc, char *argv[])
|
||||
if (driver.audio_data)
|
||||
audio_stop_func();
|
||||
|
||||
while (menu_iterate());
|
||||
while (!g_extern.system.shutdown && menu_iterate());
|
||||
|
||||
driver_set_nonblock_state(driver.nonblock_state);
|
||||
|
||||
@ -130,8 +278,17 @@ int rarch_main(int argc, char *argv[])
|
||||
if (g_extern.config_save_on_exit && *g_extern.config_path)
|
||||
config_save_file(g_extern.config_path);
|
||||
|
||||
#ifdef GEKKO
|
||||
/* Per-core input config saving */
|
||||
config_save_keybinds(g_extern.input_config_path);
|
||||
#endif
|
||||
|
||||
if (g_extern.main_is_init)
|
||||
rarch_main_deinit();
|
||||
|
||||
#ifdef RARCH_CONSOLE
|
||||
global_uninit_drivers();
|
||||
#endif
|
||||
#else
|
||||
while ((g_extern.is_paused && !g_extern.is_oneshot) ? rarch_main_idle_iterate() : rarch_main_iterate());
|
||||
rarch_main_deinit();
|
||||
@ -143,12 +300,27 @@ int rarch_main(int argc, char *argv[])
|
||||
rarch_perf_log();
|
||||
#endif
|
||||
|
||||
#ifdef RARCH_CONSOLE
|
||||
#if defined(HAVE_LOGGER)
|
||||
logger_shutdown();
|
||||
#elif defined(HAVE_FILE_LOGGER)
|
||||
if (g_extern.log_file)
|
||||
fclose(g_extern.log_file);
|
||||
g_extern.log_file = NULL;
|
||||
#endif
|
||||
system_deinit();
|
||||
|
||||
if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXITSPAWN))
|
||||
system_exitspawn();
|
||||
#endif
|
||||
|
||||
rarch_main_clear_state();
|
||||
|
||||
#ifdef __QNX__
|
||||
bps_shutdown();
|
||||
#endif
|
||||
|
||||
// FIXME - should this be 1 for RARCH_CONSOLE?
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -1,259 +0,0 @@
|
||||
/* RetroArch - A frontend for libretro.
|
||||
* Copyright (C) 2010-2013 - Hans-Kristian Arntzen
|
||||
* Copyright (C) 2011-2013 - Daniel De Matteis
|
||||
*
|
||||
* RetroArch is free software: you can redistribute it and/or modify it under the terms
|
||||
* of the GNU General Public License as published by the Free Software Found-
|
||||
* ation, either version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
* PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with RetroArch.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
#include "../boolean.h"
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "../config.def.h"
|
||||
#include "frontend_console.h"
|
||||
#include "menu/rmenu.h"
|
||||
|
||||
#if defined(__CELLOS_LV2__)
|
||||
#include "platform/platform_ps3_exec.c"
|
||||
#include "platform/platform_ps3.c"
|
||||
#elif defined(GEKKO)
|
||||
#ifdef HW_RVL
|
||||
#include "platform/platform_gx_exec.c"
|
||||
#endif
|
||||
#include "platform/platform_gx.c"
|
||||
#elif defined(_XBOX)
|
||||
#include "platform/platform_xdk_exec.c"
|
||||
#include "platform/platform_xdk.c"
|
||||
#elif defined(PSP)
|
||||
#include "platform/platform_psp.c"
|
||||
#endif
|
||||
|
||||
#undef main
|
||||
|
||||
default_paths_t default_paths;
|
||||
|
||||
// Rename core filename executable to a more sane name.
|
||||
|
||||
#ifdef HAVE_LIBRETRO_MANAGEMENT
|
||||
static bool libretro_install_core(const char *path_prefix,
|
||||
const char *core_exe_path)
|
||||
{
|
||||
char old_path[PATH_MAX], new_path[PATH_MAX];
|
||||
|
||||
libretro_get_current_core_pathname(old_path, sizeof(old_path));
|
||||
|
||||
strlcat(old_path, DEFAULT_EXE_EXT, sizeof(old_path));
|
||||
snprintf(new_path, sizeof(new_path), "%s%s", path_prefix, old_path);
|
||||
|
||||
/* If core already exists, we are upgrading the core -
|
||||
* delete existing file first. */
|
||||
if (path_file_exists(new_path))
|
||||
{
|
||||
RARCH_LOG("Removing temporary ROM file: %s.\n", new_path);
|
||||
if (remove(new_path) < 0)
|
||||
RARCH_ERR("Failed to remove file: %s.\n", new_path);
|
||||
}
|
||||
|
||||
/* Now attempt the renaming of the core. */
|
||||
RARCH_LOG("Renaming core to: %s.\n", new_path);
|
||||
if (rename(core_exe_path, new_path) < 0)
|
||||
{
|
||||
RARCH_ERR("Failed to rename core.\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
strlcpy(g_settings.libretro, new_path,
|
||||
sizeof(g_settings.libretro));
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
#define MAKE_DIR(x, name) { \
|
||||
RARCH_LOG("Checking directory name %s [%s]\n", name, x); \
|
||||
if (strlen(x) > 0) \
|
||||
{ \
|
||||
if (!path_is_directory((x)) )\
|
||||
{ \
|
||||
RARCH_WARN("Directory \"%s\" does not exists, creating\n", (x)); \
|
||||
if (mkdir((x), 0777) != 0) \
|
||||
{ \
|
||||
RARCH_ERR("Could not create directory \"%s\"\n", (x)); \
|
||||
} \
|
||||
} \
|
||||
} \
|
||||
}
|
||||
|
||||
int rarch_main(int argc, char *argv[])
|
||||
{
|
||||
system_init();
|
||||
#if defined(HAVE_LOGGER)
|
||||
g_extern.verbose = true;
|
||||
logger_init();
|
||||
#elif defined(HAVE_FILE_LOGGER)
|
||||
g_extern.verbose = true;
|
||||
g_extern.log_file = fopen("/retroarch-log.txt", "w");
|
||||
#endif
|
||||
|
||||
rarch_main_clear_state();
|
||||
|
||||
g_extern.verbose = true;
|
||||
|
||||
get_environment_settings(argc, argv);
|
||||
|
||||
MAKE_DIR(default_paths.port_dir, "port_dir");
|
||||
MAKE_DIR(default_paths.system_dir, "system_dir");
|
||||
MAKE_DIR(default_paths.savestate_dir, "savestate_dir");
|
||||
MAKE_DIR(default_paths.sram_dir, "sram_dir");
|
||||
MAKE_DIR(default_paths.input_presets_dir, "input_presets_dir");
|
||||
|
||||
config_load();
|
||||
|
||||
/* FIXME - when dummy loading becomes possible perhaps change this param */
|
||||
init_libretro_sym(false);
|
||||
rarch_init_system_info();
|
||||
|
||||
global_init_drivers();
|
||||
|
||||
#ifdef HAVE_LIBRETRO_MANAGEMENT
|
||||
char path_prefix[PATH_MAX];
|
||||
#if defined(_WIN32)
|
||||
char slash = '\\';
|
||||
#else
|
||||
char slash = '/';
|
||||
#endif
|
||||
|
||||
snprintf(path_prefix, sizeof(path_prefix), "%s%c", default_paths.core_dir, slash);
|
||||
|
||||
char core_exe_path[256];
|
||||
snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, DEFAULT_EXE_EXT);
|
||||
|
||||
// Save new libretro core path to config file and exit
|
||||
if (path_file_exists(core_exe_path))
|
||||
if (libretro_install_core(path_prefix, core_exe_path))
|
||||
#ifdef _XBOX
|
||||
g_extern.system.shutdown = g_extern.system.shutdown;
|
||||
#else
|
||||
g_extern.system.shutdown = true;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef GEKKO
|
||||
/* Per-core input config loading */
|
||||
char core_name[64];
|
||||
|
||||
libretro_get_current_core_pathname(core_name, sizeof(core_name));
|
||||
snprintf(g_extern.input_config_path, sizeof(g_extern.input_config_path), "%s/%s.cfg", default_paths.input_presets_dir, core_name);
|
||||
config_read_keybinds(g_extern.input_config_path);
|
||||
#endif
|
||||
|
||||
menu_init();
|
||||
|
||||
system_process_args(argc, argv);
|
||||
|
||||
g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME);
|
||||
|
||||
for (;;)
|
||||
{
|
||||
if (g_extern.system.shutdown)
|
||||
break;
|
||||
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME))
|
||||
{
|
||||
load_menu_game_prepare();
|
||||
|
||||
// If ROM load fails, we exit RetroArch. On console it might make more sense to go back to menu though ...
|
||||
if (load_menu_game())
|
||||
g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
|
||||
else
|
||||
{
|
||||
#ifdef RARCH_CONSOLE
|
||||
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU);
|
||||
#else
|
||||
return 1;
|
||||
#endif
|
||||
}
|
||||
|
||||
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME);
|
||||
}
|
||||
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_GAME))
|
||||
{
|
||||
driver.input->poll(NULL);
|
||||
|
||||
if (driver.video_poke->set_aspect_ratio)
|
||||
driver.video_poke->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
|
||||
|
||||
while(rarch_main_iterate());
|
||||
|
||||
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME);
|
||||
}
|
||||
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU))
|
||||
{
|
||||
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_PREINIT);
|
||||
// Menu should always run with vsync on
|
||||
video_set_nonblock_state_func(false);
|
||||
|
||||
if (driver.audio_data)
|
||||
audio_stop_func();
|
||||
|
||||
while (!g_extern.system.shutdown && menu_iterate());
|
||||
|
||||
driver_set_nonblock_state(driver.nonblock_state);
|
||||
|
||||
if (driver.audio_data && !audio_start_func())
|
||||
{
|
||||
RARCH_ERR("Failed to resume audio driver. Will continue without audio.\n");
|
||||
g_extern.audio_active = false;
|
||||
}
|
||||
|
||||
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU);
|
||||
}
|
||||
else
|
||||
break;
|
||||
}
|
||||
|
||||
g_extern.system.shutdown = false;
|
||||
|
||||
menu_free();
|
||||
|
||||
if (g_extern.config_save_on_exit && *g_extern.config_path)
|
||||
config_save_file(g_extern.config_path);
|
||||
|
||||
#ifdef GEKKO
|
||||
/* Per-core input config saving */
|
||||
config_save_keybinds(g_extern.input_config_path);
|
||||
#endif
|
||||
|
||||
if (g_extern.main_is_init)
|
||||
rarch_main_deinit();
|
||||
|
||||
global_uninit_drivers();
|
||||
|
||||
#ifdef PERF_TEST
|
||||
rarch_perf_log();
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_LOGGER)
|
||||
logger_shutdown();
|
||||
#elif defined(HAVE_FILE_LOGGER)
|
||||
if (g_extern.log_file)
|
||||
fclose(g_extern.log_file);
|
||||
g_extern.log_file = NULL;
|
||||
#endif
|
||||
|
||||
system_deinit();
|
||||
|
||||
if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXITSPAWN))
|
||||
system_exitspawn();
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -774,6 +774,7 @@ static uint64_t rgui_input(void)
|
||||
|
||||
bool menu_iterate(void)
|
||||
{
|
||||
rarch_time_t time, delta, target_msec, sleep_msec;
|
||||
static bool initial_held = true;
|
||||
static bool first_held = false;
|
||||
uint64_t input_state = 0;
|
||||
@ -832,10 +833,10 @@ bool menu_iterate(void)
|
||||
rarch_render_cached_frame();
|
||||
|
||||
// Throttle in case VSync is broken (avoid 1000+ FPS RGUI).
|
||||
rarch_time_t time = rarch_get_time_usec();
|
||||
rarch_time_t delta = (time - rgui->last_time) / 1000;
|
||||
rarch_time_t target_msec = 1000 / g_settings.video.refresh_rate;
|
||||
rarch_time_t sleep_msec = target_msec - delta;
|
||||
time = rarch_get_time_usec();
|
||||
delta = (time - rgui->last_time) / 1000;
|
||||
target_msec = 1000 / g_settings.video.refresh_rate;
|
||||
sleep_msec = target_msec - delta;
|
||||
if (sleep_msec > 0)
|
||||
rarch_sleep(sleep_msec);
|
||||
rgui->last_time = rarch_get_time_usec();
|
||||
|
||||
@ -445,15 +445,11 @@ MAIN
|
||||
============================================================ */
|
||||
#if defined(XENON)
|
||||
#include "../frontend/frontend_xenon.c"
|
||||
#elif defined(RARCH_CONSOLE) || defined(PSP)
|
||||
#include "../frontend/frontend_console.c"
|
||||
#elif defined(ANDROID)
|
||||
#include "../frontend/frontend_android.c"
|
||||
#elif defined(IOS) || defined(OSX)
|
||||
#include "../frontend/frontend_objc.c"
|
||||
#endif
|
||||
|
||||
#if defined(RARCH_CONSOLE) || defined(__QNX__) || defined(PANDORA)
|
||||
#else
|
||||
#include "../frontend/frontend.c"
|
||||
#endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user