Browse Source
Merge pull request #4980 from bunnei/error-fixup
input_common: Add more missing [[maybe_unused]] from #4927.
pull/15/merge
bunnei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
6 additions and
4 deletions
-
src/input_common/gcadapter/gc_poller.cpp
-
src/input_common/sdl/sdl_impl.cpp
-
src/input_common/udp/client.cpp
|
|
|
@ -299,7 +299,8 @@ public: |
|
|
|
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 processed_amplitude = |
|
|
|
static_cast<u8>((mean_amplitude + std::pow(mean_amplitude, 0.3f)) * 0.5f * 0x8); |
|
|
|
|
|
|
|
@ -400,7 +400,8 @@ public: |
|
|
|
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) { |
|
|
|
return static_cast<u16>((amplitude + std::pow(amplitude, 0.3f)) * 0.5f * 0xFFFF); |
|
|
|
}; |
|
|
|
|
|
|
|
@ -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); |
|
|
|
} |
|
|
|
|
|
|
|
void Client::OnVersion(Response::Version data) { |
|
|
|
void Client::OnVersion([[maybe_unused]] Response::Version data) { |
|
|
|
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); |
|
|
|
} |
|
|
|
|
|
|
|
|