diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 70f05b7b5..c08a3d607 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -131,9 +131,10 @@ void Config::ReadValues() { Settings::values.factor_3d = static_cast(sdl2_config->GetInteger("Renderer", "factor_3d", 0)); - Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 0.0); - Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 0.0); - Settings::values.bg_blue = (float)sdl2_config->GetReal("Renderer", "bg_blue", 0.0); + Settings::values.bg_red = static_cast(sdl2_config->GetReal("Renderer", "bg_red", 0.0)); + Settings::values.bg_green = + static_cast(sdl2_config->GetReal("Renderer", "bg_green", 0.0)); + Settings::values.bg_blue = static_cast(sdl2_config->GetReal("Renderer", "bg_blue", 0.0)); // Layout Settings::values.layout_option = @@ -165,7 +166,7 @@ void Config::ReadValues() { Settings::values.enable_audio_stretching = sdl2_config->GetBoolean("Audio", "enable_audio_stretching", true); Settings::values.audio_device_id = sdl2_config->GetString("Audio", "output_device", "auto"); - Settings::values.volume = sdl2_config->GetReal("Audio", "volume", 1); + Settings::values.volume = static_cast(sdl2_config->GetReal("Audio", "volume", 1)); Settings::values.mic_input_device = sdl2_config->GetString("Audio", "mic_input_device", "Default"); Settings::values.mic_input_type = diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index a4ccf429e..41156f858 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -112,7 +112,8 @@ const std::array service_module_map{ * Creates a function string for logging, complete with the name (or header code, depending * on what's passed in) the port name, and all the cmd_buff arguments. */ -[[maybe_unused]] static std::string MakeFunctionString(const char* name, const char* port_name, +[[maybe_unused]] static std::string MakeFunctionString(std::string_view name, + std::string_view port_name, const u32* cmd_buff) { // Number of params == bits 0-5 + bits 6-11 int num_params = (cmd_buff[0] & 0x3F) + ((cmd_buff[0] >> 6) & 0x3F); @@ -179,7 +180,7 @@ void ServiceFrameworkBase::HandleSyncRequest(Kernel::HLERequestContext& context) } LOG_TRACE(Service, "{}", - MakeFunctionString(info->name, GetServiceName().c_str(), context.CommandBuffer())); + MakeFunctionString(info->name, GetServiceName(), context.CommandBuffer())); handler_invoker(this, info->handler_callback, context); } diff --git a/src/web_service/verify_login.h b/src/web_service/verify_login.h index 93eb4036f..5dcc006dc 100644 --- a/src/web_service/verify_login.h +++ b/src/web_service/verify_login.h @@ -4,8 +4,6 @@ #pragma once -#include -#include #include namespace WebService {