diff options
Diffstat (limited to 'src/citra')
-rw-r--r-- | src/citra/config.cpp | 7 | ||||
-rw-r--r-- | src/citra/config.h | 1 | ||||
-rw-r--r-- | src/citra/default_ini.h | 4 | ||||
-rw-r--r-- | src/citra/emu_window/emu_window_glfw.h | 8 |
4 files changed, 16 insertions, 4 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 65edcfc9..f45d09fc 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -7,6 +7,7 @@ #include "citra/default_ini.h" #include "common/file_util.h" #include "core/settings.h" +#include "core/core.h" #include "config.h" @@ -55,6 +56,11 @@ void Config::ReadControls() { Settings::values.pad_sright_key = glfw_config->GetInteger("Controls", "pad_sright", GLFW_KEY_RIGHT); } +void Config::ReadCore() { + Settings::values.cpu_core = glfw_config->GetInteger("Core", "cpu_core", Core::CPU_Interpreter); + Settings::values.gpu_refresh_rate = glfw_config->GetInteger("Core", "gpu_refresh_rate", 60); +} + void Config::ReadData() { Settings::values.use_virtual_sd = glfw_config->GetBoolean("Data Storage", "use_virtual_sd", true); } @@ -66,6 +72,7 @@ void Config::ReadMiscellaneous() { void Config::Reload() { LoadINI(glfw_config, glfw_config_loc.c_str(), DefaultINI::glfw_config_file); ReadControls(); + ReadCore(); ReadData(); ReadMiscellaneous(); } diff --git a/src/citra/config.h b/src/citra/config.h index 63b5978e..19bb8370 100644 --- a/src/citra/config.h +++ b/src/citra/config.h @@ -16,6 +16,7 @@ class Config { bool LoadINI(INIReader* config, const char* location, const std::string& default_contents="", bool retry=true); void ReadControls(); + void ReadCore(); void ReadData(); void ReadMiscellaneous(); public: diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index 1f0b6cad..f1f626ee 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -26,6 +26,10 @@ pad_sdown = pad_sleft = pad_sright = +[Core] +cpu_core = ## 0: Interpreter (default), 1: FastInterpreter (experimental) +gpu_refresh_rate = ## 60 (default) + [Data Storage] use_virtual_sd = diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h index 638e026e..7c307214 100644 --- a/src/citra/emu_window/emu_window_glfw.h +++ b/src/citra/emu_window/emu_window_glfw.h @@ -14,16 +14,16 @@ public: ~EmuWindow_GLFW(); /// Swap buffers to display the next frame - void SwapBuffers(); + void SwapBuffers() override; /// Polls window events - void PollEvents(); + void PollEvents() override; /// Makes the graphics context current for the caller thread - void MakeCurrent(); + void MakeCurrent() override; /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread - void DoneCurrent(); + void DoneCurrent() override; static void OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods); |