diff --git a/src/core/host_interface.cpp b/src/core/host_interface.cpp index 00ae595c..954974ac 100644 --- a/src/core/host_interface.cpp +++ b/src/core/host_interface.cpp @@ -428,159 +428,6 @@ std::string HostInterface::GetShaderCacheBasePath() const return GetUserDirectoryRelativePath("cache/"); } -void HostInterface::SetDefaultSettings(SettingsInterface& si) -{ - si.SetStringValue("Console", "Region", Settings::GetConsoleRegionName(Settings::DEFAULT_CONSOLE_REGION)); - si.SetBoolValue("Console", "Enable8MBRAM", false); - - si.SetFloatValue("Main", "EmulationSpeed", 1.0f); - si.SetFloatValue("Main", "FastForwardSpeed", 0.0f); - si.SetFloatValue("Main", "TurboSpeed", 0.0f); - si.SetBoolValue("Main", "SyncToHostRefreshRate", false); - si.SetBoolValue("Main", "IncreaseTimerResolution", true); - si.SetBoolValue("Main", "InhibitScreensaver", true); - si.SetBoolValue("Main", "StartPaused", false); - si.SetBoolValue("Main", "StartFullscreen", false); - si.SetBoolValue("Main", "PauseOnFocusLoss", false); - si.SetBoolValue("Main", "PauseOnMenu", true); - si.SetBoolValue("Main", "SaveStateOnExit", true); - si.SetBoolValue("Main", "ConfirmPowerOff", true); - si.SetBoolValue("Main", "LoadDevicesFromSaveStates", false); - si.SetBoolValue("Main", "ApplyGameSettings", true); - si.SetBoolValue("Main", "AutoLoadCheats", true); - si.SetBoolValue("Main", "DisableAllEnhancements", false); - si.SetBoolValue("Main", "RewindEnable", false); - si.SetFloatValue("Main", "RewindFrequency", 10.0f); - si.SetIntValue("Main", "RewindSaveSlots", 10); - si.SetFloatValue("Main", "RunaheadFrameCount", 0); - - si.SetStringValue("CPU", "ExecutionMode", Settings::GetCPUExecutionModeName(Settings::DEFAULT_CPU_EXECUTION_MODE)); - si.SetIntValue("CPU", "OverclockNumerator", 1); - si.SetIntValue("CPU", "OverclockDenominator", 1); - si.SetBoolValue("CPU", "OverclockEnable", false); - si.SetBoolValue("CPU", "RecompilerMemoryExceptions", false); - si.SetBoolValue("CPU", "RecompilerBlockLinking", true); - si.SetBoolValue("CPU", "ICache", false); - si.SetBoolValue("CPU", "FastmemMode", Settings::GetCPUFastmemModeName(Settings::DEFAULT_CPU_FASTMEM_MODE)); - si.SetBoolValue("CPU", "FastmemRewrite", false); - - si.SetStringValue("GPU", "Renderer", Settings::GetRendererName(Settings::DEFAULT_GPU_RENDERER)); - si.SetIntValue("GPU", "ResolutionScale", 1); - si.SetIntValue("GPU", "Multisamples", 1); - si.SetBoolValue("GPU", "UseDebugDevice", false); - si.SetBoolValue("GPU", "UseSoftwareRendererForReadbacks", false); - si.SetBoolValue("GPU", "PerSampleShading", false); - si.SetBoolValue("GPU", "UseThread", true); - si.SetBoolValue("GPU", "ThreadedPresentation", true); - si.SetBoolValue("GPU", "TrueColor", false); - si.SetBoolValue("GPU", "ScaledDithering", true); - si.SetStringValue("GPU", "TextureFilter", Settings::GetTextureFilterName(Settings::DEFAULT_GPU_TEXTURE_FILTER)); - si.SetStringValue("GPU", "DownsampleMode", Settings::GetDownsampleModeName(Settings::DEFAULT_GPU_DOWNSAMPLE_MODE)); - si.SetBoolValue("GPU", "DisableInterlacing", true); - si.SetBoolValue("GPU", "ForceNTSCTimings", false); - si.SetBoolValue("GPU", "WidescreenHack", false); - si.SetBoolValue("GPU", "ChromaSmoothing24Bit", false); - si.SetBoolValue("GPU", "PGXPEnable", false); - si.SetBoolValue("GPU", "PGXPCulling", true); - si.SetBoolValue("GPU", "PGXPTextureCorrection", true); - si.SetBoolValue("GPU", "PGXPVertexCache", false); - si.SetBoolValue("GPU", "PGXPCPU", false); - si.SetBoolValue("GPU", "PGXPPreserveProjFP", false); - si.SetFloatValue("GPU", "PGXPTolerance", -1.0f); - si.SetBoolValue("GPU", "PGXPDepthBuffer", false); - si.SetFloatValue("GPU", "PGXPDepthClearThreshold", Settings::DEFAULT_GPU_PGXP_DEPTH_THRESHOLD); - - si.SetStringValue("Display", "CropMode", Settings::GetDisplayCropModeName(Settings::DEFAULT_DISPLAY_CROP_MODE)); - si.SetIntValue("Display", "ActiveStartOffset", 0); - si.SetIntValue("Display", "ActiveEndOffset", 0); - si.SetIntValue("Display", "LineStartOffset", 0); - si.SetIntValue("Display", "LineEndOffset", 0); - si.SetStringValue("Display", "AspectRatio", - Settings::GetDisplayAspectRatioName(Settings::DEFAULT_DISPLAY_ASPECT_RATIO)); - si.SetIntValue("Display", "CustomAspectRatioNumerator", 4); - si.GetIntValue("Display", "CustomAspectRatioDenominator", 3); - si.SetBoolValue("Display", "Force4_3For24Bit", false); - si.SetBoolValue("Display", "LinearFiltering", true); - si.SetBoolValue("Display", "IntegerScaling", false); - si.SetBoolValue("Display", "Stretch", false); - si.SetBoolValue("Display", "PostProcessing", false); - si.SetBoolValue("Display", "ShowOSDMessages", true); - si.SetBoolValue("Display", "ShowFPS", false); - si.SetBoolValue("Display", "ShowVPS", false); - si.SetBoolValue("Display", "ShowSpeed", false); - si.SetBoolValue("Display", "ShowResolution", false); - si.SetBoolValue("Display", "ShowStatusIndicators", true); - si.SetBoolValue("Display", "ShowEnhancements", false); - si.SetBoolValue("Display", "Fullscreen", false); - si.SetBoolValue("Display", "VSync", Settings::DEFAULT_VSYNC_VALUE); - si.SetBoolValue("Display", "DisplayAllFrames", false); - si.SetStringValue("Display", "PostProcessChain", ""); - si.SetFloatValue("Display", "MaxFPS", Settings::DEFAULT_DISPLAY_MAX_FPS); - - si.SetIntValue("CDROM", "ReadaheadSectors", Settings::DEFAULT_CDROM_READAHEAD_SECTORS); - si.SetBoolValue("CDROM", "RegionCheck", false); - si.SetBoolValue("CDROM", "LoadImageToRAM", false); - si.SetBoolValue("CDROM", "PreCacheCHD", false); - si.SetBoolValue("CDROM", "MuteCDAudio", false); - si.SetIntValue("CDROM", "ReadSpeedup", 1); - si.SetIntValue("CDROM", "SeekSpeedup", 1); - - si.SetStringValue("Audio", "Backend", Settings::GetAudioBackendName(Settings::DEFAULT_AUDIO_BACKEND)); - si.SetIntValue("Audio", "OutputVolume", 100); - si.SetIntValue("Audio", "FastForwardVolume", 100); - si.SetIntValue("Audio", "BufferSize", DEFAULT_AUDIO_BUFFER_SIZE); - si.SetBoolValue("Audio", "Resampling", true); - si.SetIntValue("Audio", "OutputMuted", false); - si.SetBoolValue("Audio", "Sync", true); - si.SetBoolValue("Audio", "DumpOnBoot", false); - - si.SetStringValue("BIOS", "SearchDirectory", ""); - si.SetStringValue("BIOS", "PathNTSCU", ""); - si.SetStringValue("BIOS", "PathNTSCJ", ""); - si.SetStringValue("BIOS", "PathPAL", ""); - si.SetBoolValue("BIOS", "PatchTTYEnable", false); - si.SetBoolValue("BIOS", "PatchFastBoot", Settings::DEFAULT_FAST_BOOT_VALUE); - - si.SetStringValue("Controller1", "Type", Settings::GetControllerTypeName(Settings::DEFAULT_CONTROLLER_1_TYPE)); - - for (u32 i = 1; i < NUM_CONTROLLER_AND_CARD_PORTS; i++) - { - si.SetStringValue(TinyString::FromFormat("Controller%u", i + 1u), "Type", - Settings::GetControllerTypeName(Settings::DEFAULT_CONTROLLER_2_TYPE)); - } - - si.SetStringValue("MemoryCards", "Card1Type", Settings::GetMemoryCardTypeName(Settings::DEFAULT_MEMORY_CARD_1_TYPE)); - si.SetStringValue("MemoryCards", "Card2Type", Settings::GetMemoryCardTypeName(Settings::DEFAULT_MEMORY_CARD_2_TYPE)); - si.DeleteValue("MemoryCards", "Card1Path"); - si.DeleteValue("MemoryCards", "Card2Path"); - si.DeleteValue("MemoryCards", "Directory"); - si.SetBoolValue("MemoryCards", "UsePlaylistTitle", true); - - si.SetStringValue("ControllerPorts", "MultitapMode", Settings::GetMultitapModeName(Settings::DEFAULT_MULTITAP_MODE)); - - si.SetStringValue("Logging", "LogLevel", Settings::GetLogLevelName(Settings::DEFAULT_LOG_LEVEL)); - si.SetStringValue("Logging", "LogFilter", ""); - si.SetBoolValue("Logging", "LogToConsole", Settings::DEFAULT_LOG_TO_CONSOLE); - si.SetBoolValue("Logging", "LogToDebug", false); - si.SetBoolValue("Logging", "LogToWindow", false); - si.SetBoolValue("Logging", "LogToFile", false); - - si.SetBoolValue("Debug", "ShowVRAM", false); - si.SetBoolValue("Debug", "DumpCPUToVRAMCopies", false); - si.SetBoolValue("Debug", "DumpVRAMToCPUCopies", false); - si.SetBoolValue("Debug", "ShowGPUState", false); - si.SetBoolValue("Debug", "ShowCDROMState", false); - si.SetBoolValue("Debug", "ShowSPUState", false); - si.SetBoolValue("Debug", "ShowTimersState", false); - si.SetBoolValue("Debug", "ShowMDECState", false); - si.SetBoolValue("Debug", "ShowDMAState", false); - - si.SetIntValue("Hacks", "DMAMaxSliceTicks", static_cast(Settings::DEFAULT_DMA_MAX_SLICE_TICKS)); - si.SetIntValue("Hacks", "DMAHaltTicks", static_cast(Settings::DEFAULT_DMA_HALT_TICKS)); - si.SetIntValue("Hacks", "GPUFIFOSize", static_cast(Settings::DEFAULT_GPU_FIFO_SIZE)); - si.SetIntValue("Hacks", "GPUMaxRunAhead", static_cast(Settings::DEFAULT_GPU_MAX_RUN_AHEAD)); -} - void HostInterface::LoadSettings(SettingsInterface& si) { g_settings.Load(si); @@ -655,11 +502,6 @@ void HostInterface::FixIncompatibleSettings(bool display_osd_messages) #endif } -void HostInterface::SaveSettings(SettingsInterface& si) -{ - g_settings.Save(si); -} - void HostInterface::CheckForSettingsChanges(const Settings& old_settings) { if (System::IsValid() && (g_settings.gpu_renderer != old_settings.gpu_renderer || diff --git a/src/core/host_interface.h b/src/core/host_interface.h index 1f1db6a2..8c1e1e83 100644 --- a/src/core/host_interface.h +++ b/src/core/host_interface.h @@ -161,15 +161,9 @@ protected: virtual void OnSystemDestroyed() = 0; virtual void OnControllerTypeChanged(u32 slot) = 0; - /// Restores all settings to defaults. - virtual void SetDefaultSettings(SettingsInterface& si); - /// Loads settings to m_settings and any frontend-specific parameters. virtual void LoadSettings(SettingsInterface& si); - /// Saves current settings variables to ini. - virtual void SaveSettings(SettingsInterface& si); - /// Checks and fixes up any incompatible settings. virtual void FixIncompatibleSettings(bool display_osd_messages); diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 83be07e2..2d2c27f6 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -334,176 +334,6 @@ void Settings::Load(SettingsInterface& si) si.GetIntValue("TextureReplacements", "DumpVRAMWriteHeightThreshold", 128); } -void Settings::Save(SettingsInterface& si) const -{ - si.SetStringValue("Console", "Region", GetConsoleRegionName(region)); - si.SetBoolValue("Console", "Enable8MBRAM", enable_8mb_ram); - - si.SetFloatValue("Main", "EmulationSpeed", emulation_speed); - si.SetFloatValue("Main", "FastForwardSpeed", fast_forward_speed); - si.SetFloatValue("Main", "TurboSpeed", turbo_speed); - si.SetBoolValue("Main", "SyncToHostRefreshRate", sync_to_host_refresh_rate); - si.SetBoolValue("Main", "IncreaseTimerResolution", increase_timer_resolution); - si.SetBoolValue("Main", "InhibitScreensaver", inhibit_screensaver); - si.SetBoolValue("Main", "StartPaused", start_paused); - si.SetBoolValue("Main", "StartFullscreen", start_fullscreen); - si.SetBoolValue("Main", "PauseOnFocusLoss", pause_on_focus_loss); - si.SetBoolValue("Main", "PauseOnMenu", pause_on_menu); - si.SetBoolValue("Main", "SaveStateOnExit", save_state_on_exit); - si.SetBoolValue("Main", "ConfirmPowerOff", confim_power_off); - si.SetBoolValue("Main", "LoadDevicesFromSaveStates", load_devices_from_save_states); - si.SetBoolValue("Main", "ApplyGameSettings", apply_game_settings); - si.SetBoolValue("Main", "AutoLoadCheats", auto_load_cheats); - si.SetBoolValue("Main", "DisableAllEnhancements", disable_all_enhancements); - si.SetBoolValue("Main", "RewindEnable", rewind_enable); - si.SetFloatValue("Main", "RewindFrequency", rewind_save_frequency); - si.SetIntValue("Main", "RewindSaveSlots", rewind_save_slots); - si.SetIntValue("Main", "RunaheadFrameCount", runahead_frames); - - si.SetStringValue("CPU", "ExecutionMode", GetCPUExecutionModeName(cpu_execution_mode)); - si.SetBoolValue("CPU", "OverclockEnable", cpu_overclock_enable); - si.SetIntValue("CPU", "OverclockNumerator", cpu_overclock_numerator); - si.SetIntValue("CPU", "OverclockDenominator", cpu_overclock_denominator); - si.SetBoolValue("CPU", "RecompilerMemoryExceptions", cpu_recompiler_memory_exceptions); - si.SetBoolValue("CPU", "RecompilerBlockLinking", cpu_recompiler_block_linking); - si.SetBoolValue("CPU", "RecompilerICache", cpu_recompiler_icache); - si.SetStringValue("CPU", "FastmemMode", GetCPUFastmemModeName(cpu_fastmem_mode)); - si.SetBoolValue("CPU", "FastmemRewrite", cpu_fastmem_rewrite); - - si.SetStringValue("GPU", "Renderer", GetRendererName(gpu_renderer)); - si.SetStringValue("GPU", "Adapter", gpu_adapter.c_str()); - si.SetIntValue("GPU", "ResolutionScale", static_cast(gpu_resolution_scale)); - si.SetIntValue("GPU", "Multisamples", static_cast(gpu_multisamples)); - si.SetBoolValue("GPU", "UseDebugDevice", gpu_use_debug_device); - si.SetBoolValue("GPU", "PerSampleShading", gpu_per_sample_shading); - si.SetBoolValue("GPU", "UseThread", gpu_use_thread); - si.SetBoolValue("GPU", "ThreadedPresentation", gpu_threaded_presentation); - si.SetBoolValue("GPU", "UseSoftwareRendererForReadbacks", gpu_use_software_renderer_for_readbacks); - si.SetBoolValue("GPU", "TrueColor", gpu_true_color); - si.SetBoolValue("GPU", "ScaledDithering", gpu_scaled_dithering); - si.SetStringValue("GPU", "TextureFilter", GetTextureFilterName(gpu_texture_filter)); - si.SetStringValue("GPU", "DownsampleMode", GetDownsampleModeName(gpu_downsample_mode)); - si.SetBoolValue("GPU", "DisableInterlacing", gpu_disable_interlacing); - si.SetBoolValue("GPU", "ForceNTSCTimings", gpu_force_ntsc_timings); - si.SetBoolValue("GPU", "WidescreenHack", gpu_widescreen_hack); - si.SetBoolValue("GPU", "ChromaSmoothing24Bit", gpu_24bit_chroma_smoothing); - si.SetBoolValue("GPU", "PGXPEnable", gpu_pgxp_enable); - si.SetBoolValue("GPU", "PGXPCulling", gpu_pgxp_culling); - si.SetBoolValue("GPU", "PGXPTextureCorrection", gpu_pgxp_texture_correction); - si.SetBoolValue("GPU", "PGXPVertexCache", gpu_pgxp_vertex_cache); - si.SetBoolValue("GPU", "PGXPCPU", gpu_pgxp_cpu); - si.SetBoolValue("GPU", "PGXPPreserveProjFP", gpu_pgxp_preserve_proj_fp); - si.SetFloatValue("GPU", "PGXPTolerance", gpu_pgxp_tolerance); - si.SetBoolValue("GPU", "PGXPDepthBuffer", gpu_pgxp_depth_buffer); - si.SetFloatValue("GPU", "PGXPDepthClearThreshold", GetPGXPDepthClearThreshold()); - - si.SetStringValue("Display", "CropMode", GetDisplayCropModeName(display_crop_mode)); - si.SetIntValue("Display", "ActiveStartOffset", display_active_start_offset); - si.SetIntValue("Display", "ActiveEndOffset", display_active_end_offset); - si.SetIntValue("Display", "LineStartOffset", display_line_start_offset); - si.SetIntValue("Display", "LineEndOffset", display_line_end_offset); - si.SetBoolValue("Display", "Force4_3For24Bit", display_force_4_3_for_24bit); - si.SetStringValue("Display", "AspectRatio", GetDisplayAspectRatioName(display_aspect_ratio)); - si.SetIntValue("Display", "CustomAspectRatioNumerator", display_aspect_ratio_custom_numerator); - si.GetIntValue("Display", "CustomAspectRatioDenominator", display_aspect_ratio_custom_denominator); - si.SetBoolValue("Display", "LinearFiltering", display_linear_filtering); - si.SetBoolValue("Display", "IntegerScaling", display_integer_scaling); - si.SetBoolValue("Display", "Stretch", display_stretch); - si.SetBoolValue("Display", "PostProcessing", display_post_processing); - si.SetBoolValue("Display", "ShowOSDMessages", display_show_osd_messages); - si.SetBoolValue("Display", "ShowVPS", display_show_vps); - si.SetBoolValue("Display", "ShowSpeed", display_show_speed); - si.SetBoolValue("Display", "ShowResolution", display_show_resolution); - si.SetBoolValue("Display", "ShowStatusIndicators", display_show_status_indicators); - si.SetBoolValue("Display", "ShowEnhancements", display_show_enhancements); - si.SetBoolValue("Display", "DisplayAllFrames", display_all_frames); - si.SetBoolValue("Display", "VSync", video_sync_enabled); - if (display_post_process_chain.empty()) - si.DeleteValue("Display", "PostProcessChain"); - else - si.SetStringValue("Display", "PostProcessChain", display_post_process_chain.c_str()); - si.SetFloatValue("Display", "MaxFPS", display_max_fps); - - si.SetIntValue("CDROM", "ReadaheadSectors", cdrom_readahead_sectors); - si.SetBoolValue("CDROM", "RegionCheck", cdrom_region_check); - si.SetBoolValue("CDROM", "LoadImageToRAM", cdrom_load_image_to_ram); - si.SetBoolValue("CDROM", "PreCacheCHD", cdrom_precache_chd); - si.SetBoolValue("CDROM", "MuteCDAudio", cdrom_mute_cd_audio); - si.SetIntValue("CDROM", "ReadSpeedup", cdrom_read_speedup); - si.SetIntValue("CDROM", "SeekSpeedup", cdrom_seek_speedup); - - si.SetStringValue("Audio", "Backend", GetAudioBackendName(audio_backend)); - si.SetIntValue("Audio", "OutputVolume", audio_output_volume); - si.SetIntValue("Audio", "FastForwardVolume", audio_fast_forward_volume); - si.SetIntValue("Audio", "BufferSize", audio_buffer_size); - si.SetBoolValue("Audio", "Resampling", audio_resampling); - si.SetBoolValue("Audio", "OutputMuted", audio_output_muted); - si.SetBoolValue("Audio", "Sync", audio_sync_enabled); - si.SetBoolValue("Audio", "DumpOnBoot", audio_dump_on_boot); - - si.SetIntValue("Hacks", "DMAMaxSliceTicks", dma_max_slice_ticks); - si.SetIntValue("Hacks", "DMAHaltTicks", dma_halt_ticks); - si.SetIntValue("Hacks", "GPUFIFOSize", gpu_fifo_size); - si.SetIntValue("Hacks", "GPUMaxRunAhead", gpu_max_run_ahead); - - si.SetBoolValue("BIOS", "PatchTTYEnable", bios_patch_tty_enable); - si.SetBoolValue("BIOS", "PatchFastBoot", bios_patch_fast_boot); - - for (u32 i = 0; i < NUM_CONTROLLER_AND_CARD_PORTS; i++) - { - si.SetStringValue(TinyString::FromFormat("Controller%u", i + 1u), "Type", - GetControllerTypeName(controller_types[i])); - } - - si.SetStringValue("MemoryCards", "Card1Type", GetMemoryCardTypeName(memory_card_types[0])); - si.SetStringValue("MemoryCards", "Card2Type", GetMemoryCardTypeName(memory_card_types[1])); - if (!memory_card_paths[0].empty()) - si.SetStringValue("MemoryCards", "Card1Path", memory_card_paths[0].c_str()); - else - si.DeleteValue("MemoryCards", "Card1Path"); - - if (!memory_card_paths[1].empty()) - si.SetStringValue("MemoryCards", "Card2Path", memory_card_paths[1].c_str()); - else - si.DeleteValue("MemoryCards", "Card2Path"); - - if (!memory_card_directory.empty()) - si.SetStringValue("MemoryCards", "Directory", memory_card_directory.c_str()); - else - si.DeleteValue("MemoryCards", "Directory"); - si.SetBoolValue("MemoryCards", "UsePlaylistTitle", memory_card_use_playlist_title); - - si.SetStringValue("ControllerPorts", "MultitapMode", GetMultitapModeName(multitap_mode)); - - si.SetStringValue("Logging", "LogLevel", GetLogLevelName(log_level)); - si.SetStringValue("Logging", "LogFilter", log_filter.c_str()); - si.SetBoolValue("Logging", "LogToConsole", log_to_console); - si.SetBoolValue("Logging", "LogToDebug", log_to_debug); - si.SetBoolValue("Logging", "LogToWindow", log_to_window); - si.SetBoolValue("Logging", "LogToFile", log_to_file); - - si.SetBoolValue("Debug", "ShowVRAM", debugging.show_vram); - si.SetBoolValue("Debug", "DumpCPUToVRAMCopies", debugging.dump_cpu_to_vram_copies); - si.SetBoolValue("Debug", "DumpVRAMToCPUCopies", debugging.dump_vram_to_cpu_copies); - si.SetBoolValue("Debug", "ShowGPUState", debugging.show_gpu_state); - si.SetBoolValue("Debug", "ShowCDROMState", debugging.show_cdrom_state); - si.SetBoolValue("Debug", "ShowSPUState", debugging.show_spu_state); - si.SetBoolValue("Debug", "ShowTimersState", debugging.show_timers_state); - si.SetBoolValue("Debug", "ShowMDECState", debugging.show_mdec_state); - si.SetBoolValue("Debug", "ShowDMAState", debugging.show_dma_state); - - si.SetBoolValue("TextureReplacements", "EnableVRAMWriteReplacements", - texture_replacements.enable_vram_write_replacements); - si.SetBoolValue("TextureReplacements", "PreloadTextures", texture_replacements.preload_textures); - si.SetBoolValue("TextureReplacements", "DumpVRAMWrites", texture_replacements.dump_vram_writes); - si.SetBoolValue("TextureReplacements", "DumpVRAMWriteForceAlphaChannel", - texture_replacements.dump_vram_write_force_alpha_channel); - si.SetIntValue("TextureReplacements", "DumpVRAMWriteWidthThreshold", - texture_replacements.dump_vram_write_width_threshold); - si.SetIntValue("TextureReplacements", "DumpVRAMWriteHeightThreshold", - texture_replacements.dump_vram_write_height_threshold); -} - static std::array s_log_level_names = { {"None", "Error", "Warning", "Perf", "Info", "Verbose", "Dev", "Profile", "Debug", "Trace"}}; static std::array s_log_level_display_names = { diff --git a/src/core/settings.h b/src/core/settings.h index 98c05fb1..39f54361 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -12,26 +12,12 @@ class SettingsInterface public: virtual ~SettingsInterface(); - virtual bool Save() = 0; - virtual void Clear() = 0; - virtual int GetIntValue(const char* section, const char* key, int default_value = 0) = 0; virtual float GetFloatValue(const char* section, const char* key, float default_value = 0.0f) = 0; virtual bool GetBoolValue(const char* section, const char* key, bool default_value = false) = 0; virtual std::string GetStringValue(const char* section, const char* key, const char* default_value = "") = 0; - virtual void SetIntValue(const char* section, const char* key, int value) = 0; - virtual void SetFloatValue(const char* section, const char* key, float value) = 0; - virtual void SetBoolValue(const char* section, const char* key, bool value) = 0; - virtual void SetStringValue(const char* section, const char* key, const char* value) = 0; - virtual std::vector GetStringList(const char* section, const char* key) = 0; - virtual void SetStringList(const char* section, const char* key, const std::vector& items) = 0; - virtual bool RemoveFromStringList(const char* section, const char* key, const char* item) = 0; - virtual bool AddToStringList(const char* section, const char* key, const char* item) = 0; - - virtual void DeleteValue(const char* section, const char* key) = 0; - virtual void ClearSection(const char* section) = 0; }; struct SettingInfo @@ -285,7 +271,6 @@ struct Settings }; void Load(SettingsInterface& si); - void Save(SettingsInterface& si) const; static std::optional ParseLogLevelName(const char* str); static const char* GetLogLevelName(LOGLEVEL level); diff --git a/src/libretro/libretro_settings_interface.cpp b/src/libretro/libretro_settings_interface.cpp index 8b64815a..fd253252 100644 --- a/src/libretro/libretro_settings_interface.cpp +++ b/src/libretro/libretro_settings_interface.cpp @@ -1,9 +1,7 @@ #include "libretro_settings_interface.h" -#include "common/log.h" #include "common/string_util.h" #include "libretro_host_interface.h" #include -Log_SetChannel(LibretroSettingsInterface); template static T GetVariable(const char* section, const char* key, DefaultValueType default_value) @@ -38,17 +36,6 @@ static T GetVariable(const char* section, const char* key, DefaultValueType defa } } -bool LibretroSettingsInterface::Save() -{ - Log_WarningPrintf("Save not implemented"); - return true; -} - -void LibretroSettingsInterface::Clear() -{ - Log_WarningPrintf("Clear not implemented"); -} - int LibretroSettingsInterface::GetIntValue(const char* section, const char* key, int default_value /*= 0*/) { return GetVariable(section, key, default_value); @@ -70,26 +57,6 @@ std::string LibretroSettingsInterface::GetStringValue(const char* section, const return GetVariable(section, key, default_value); } -void LibretroSettingsInterface::SetIntValue(const char* section, const char* key, int value) -{ - Log_ErrorPrintf("SetIntValue(\"%s\", \"%s\", %d) not implemented", section, key, value); -} - -void LibretroSettingsInterface::SetFloatValue(const char* section, const char* key, float value) -{ - Log_ErrorPrintf("SetFloatValue(\"%s\", \"%s\", %f) not implemented", section, key, value); -} - -void LibretroSettingsInterface::SetBoolValue(const char* section, const char* key, bool value) -{ - Log_ErrorPrintf("SetBoolValue(\"%s\", \"%s\", %u) not implemented", section, key, static_cast(value)); -} - -void LibretroSettingsInterface::SetStringValue(const char* section, const char* key, const char* value) -{ - Log_ErrorPrintf("SetStringValue(\"%s\", \"%s\", \"%s\") not implemented", section, key, value); -} - std::vector LibretroSettingsInterface::GetStringList(const char* section, const char* key) { std::string value = GetVariable(section, key, ""); @@ -98,31 +65,3 @@ std::vector LibretroSettingsInterface::GetStringList(const char* se return std::vector({std::move(value)}); } - -void LibretroSettingsInterface::SetStringList(const char* section, const char* key, - const std::vector& items) -{ - Log_ErrorPrintf("SetStringList(\"%s\", \"%s\") not implemented", section, key); -} - -bool LibretroSettingsInterface::RemoveFromStringList(const char* section, const char* key, const char* item) -{ - Log_ErrorPrintf("RemoveFromStringList(\"%s\", \"%s\", \"%s\") not implemented", section, key, item); - return false; -} - -bool LibretroSettingsInterface::AddToStringList(const char* section, const char* key, const char* item) -{ - Log_ErrorPrintf("AddToStringList(\"%s\", \"%s\", \"%s\") not implemented", section, key, item); - return false; -} - -void LibretroSettingsInterface::DeleteValue(const char* section, const char* key) -{ - Log_ErrorPrintf("DeleteValue(\"%s\", \"%s\") not implemented", section, key); -} - -void LibretroSettingsInterface::ClearSection(const char* section) -{ - Log_ErrorPrintf("ClearSection(\"%s\") not implemented", section); -} diff --git a/src/libretro/libretro_settings_interface.h b/src/libretro/libretro_settings_interface.h index ababc1fa..8dce87e9 100644 --- a/src/libretro/libretro_settings_interface.h +++ b/src/libretro/libretro_settings_interface.h @@ -4,24 +4,10 @@ class LibretroSettingsInterface : public SettingsInterface { public: - bool Save() override; - void Clear() override; - int GetIntValue(const char* section, const char* key, int default_value = 0) override; float GetFloatValue(const char* section, const char* key, float default_value = 0.0f) override; bool GetBoolValue(const char* section, const char* key, bool default_value = false) override; std::string GetStringValue(const char* section, const char* key, const char* default_value = "") override; - void SetIntValue(const char* section, const char* key, int value) override; - void SetFloatValue(const char* section, const char* key, float value) override; - void SetBoolValue(const char* section, const char* key, bool value) override; - void SetStringValue(const char* section, const char* key, const char* value) override; - std::vector GetStringList(const char* section, const char* key) override; - void SetStringList(const char* section, const char* key, const std::vector& items) override; - bool RemoveFromStringList(const char* section, const char* key, const char* item) override; - bool AddToStringList(const char* section, const char* key, const char* item) override; - - void DeleteValue(const char* section, const char* key) override; - void ClearSection(const char* section) override; };