mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-19 18:13:21 +02:00
Merge pull request #4693 from FearlessTobi/port-stuffffz
Port yuzu-emu/yuzu#2189, yuzu-emu/yuzu#2222, yuzu-emu/yuzu#2218
This commit is contained in:
commit
2ff7ed4200
@ -131,9 +131,10 @@ void Config::ReadValues() {
|
|||||||
Settings::values.factor_3d =
|
Settings::values.factor_3d =
|
||||||
static_cast<u8>(sdl2_config->GetInteger("Renderer", "factor_3d", 0));
|
static_cast<u8>(sdl2_config->GetInteger("Renderer", "factor_3d", 0));
|
||||||
|
|
||||||
Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 0.0);
|
Settings::values.bg_red = static_cast<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_green =
|
||||||
Settings::values.bg_blue = (float)sdl2_config->GetReal("Renderer", "bg_blue", 0.0);
|
static_cast<float>(sdl2_config->GetReal("Renderer", "bg_green", 0.0));
|
||||||
|
Settings::values.bg_blue = static_cast<float>(sdl2_config->GetReal("Renderer", "bg_blue", 0.0));
|
||||||
|
|
||||||
// Layout
|
// Layout
|
||||||
Settings::values.layout_option =
|
Settings::values.layout_option =
|
||||||
@ -165,7 +166,7 @@ void Config::ReadValues() {
|
|||||||
Settings::values.enable_audio_stretching =
|
Settings::values.enable_audio_stretching =
|
||||||
sdl2_config->GetBoolean("Audio", "enable_audio_stretching", true);
|
sdl2_config->GetBoolean("Audio", "enable_audio_stretching", true);
|
||||||
Settings::values.audio_device_id = sdl2_config->GetString("Audio", "output_device", "auto");
|
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<float>(sdl2_config->GetReal("Audio", "volume", 1));
|
||||||
Settings::values.mic_input_device =
|
Settings::values.mic_input_device =
|
||||||
sdl2_config->GetString("Audio", "mic_input_device", "Default");
|
sdl2_config->GetString("Audio", "mic_input_device", "Default");
|
||||||
Settings::values.mic_input_type =
|
Settings::values.mic_input_type =
|
||||||
|
@ -112,7 +112,8 @@ const std::array<ServiceModuleInfo, 40> service_module_map{
|
|||||||
* Creates a function string for logging, complete with the name (or header code, depending
|
* 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.
|
* 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) {
|
const u32* cmd_buff) {
|
||||||
// Number of params == bits 0-5 + bits 6-11
|
// Number of params == bits 0-5 + bits 6-11
|
||||||
int num_params = (cmd_buff[0] & 0x3F) + ((cmd_buff[0] >> 6) & 0x3F);
|
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, "{}",
|
LOG_TRACE(Service, "{}",
|
||||||
MakeFunctionString(info->name, GetServiceName().c_str(), context.CommandBuffer()));
|
MakeFunctionString(info->name, GetServiceName(), context.CommandBuffer()));
|
||||||
handler_invoker(this, info->handler_callback, context);
|
handler_invoker(this, info->handler_callback, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,8 +4,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <functional>
|
|
||||||
#include <future>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace WebService {
|
namespace WebService {
|
||||||
|
Loading…
Reference in New Issue
Block a user