franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4980 from bunnei/error-fixup 

input_common: Add more missing [[maybe_unused]] from #4927.
This commit is contained in:
bunnei 2020-11-23 21:00:59 -08:00 committed by GitHub
parent d04abd39eb 7fb7540d69
commit 5ec6a265bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/input_common/gcadapter/gc_poller.cpp
View File

@ -299,7 +299,8 @@ public:
return gcadapter->RumblePlay(port, 0); return gcadapter->RumblePlay(port, 0);
} }
bool SetRumblePlay(f32 amp_low, f32 freq_low, f32 amp_high, f32 freq_high) const override { bool SetRumblePlay(f32 amp_low, [[maybe_unused]] f32 freq_low, [[maybe_unused]] f32 amp_high,
f32 freq_high) const override {
const auto mean_amplitude = (amp_low + amp_high) * 0.5f; const auto mean_amplitude = (amp_low + amp_high) * 0.5f;
const auto processed_amplitude = const auto processed_amplitude =
static_cast<u8>((mean_amplitude + std::pow(mean_amplitude, 0.3f)) * 0.5f * 0x8); static_cast<u8>((mean_amplitude + std::pow(mean_amplitude, 0.3f)) * 0.5f * 0x8);

3
src/input_common/sdl/sdl_impl.cpp
View File

@ -400,7 +400,8 @@ public:
return joystick->RumblePlay(0, 0); return joystick->RumblePlay(0, 0);
} }
bool SetRumblePlay(f32 amp_low, f32 freq_low, f32 amp_high, f32 freq_high) const override { bool SetRumblePlay(f32 amp_low, [[maybe_unused]] f32 freq_low, f32 amp_high,
[[maybe_unused]] f32 freq_high) const override {
const auto process_amplitude = [](f32 amplitude) { const auto process_amplitude = [](f32 amplitude) {
return static_cast<u16>((amplitude + std::pow(amplitude, 0.3f)) * 0.5f * 0xFFFF); return static_cast<u16>((amplitude + std::pow(amplitude, 0.3f)) * 0.5f * 0xFFFF);
}; };

4
src/input_common/udp/client.cpp
View File

@ -189,11 +189,11 @@ void Client::ReloadSocket(const std::string& host, u16 port, std::size_t pad_ind
StartCommunication(client, host, port, pad_index, client_id); StartCommunication(client, host, port, pad_index, client_id);
} }
void Client::OnVersion(Response::Version data) { void Client::OnVersion([[maybe_unused]] Response::Version data) {
LOG_TRACE(Input, "Version packet received: {}", data.version); LOG_TRACE(Input, "Version packet received: {}", data.version);
} }
void Client::OnPortInfo(Response::PortInfo data) { void Client::OnPortInfo([[maybe_unused]] Response::PortInfo data) {
LOG_TRACE(Input, "PortInfo packet received: {}", data.model); LOG_TRACE(Input, "PortInfo packet received: {}", data.model);
} }