mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-21 03:55:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add <optional> to RB3MidiDrums.h

Browse source
This commit is contained in:
RipleyTom 2024-02-14 12:17:44 +01:00 • committed by Elad.Ash
parent d71f4b33d7
commit 5a64556fbf
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/Io/RB3MidiDrums.cpp
View file

@ -28,14 +28,14 @@ constexpr FlagByIndex BUTTON_3 = {0x04, 0};
constexpr FlagByIndex BUTTON_4 = {0x08, 0};
constexpr FlagByIndex BUTTON_5 = {0x10, 0};
constexpr FlagByIndex BUTTON_6 = {0x20, 0};
constexpr FlagByIndex BUTTON_7 = {0x40, 0};
constexpr FlagByIndex BUTTON_8 = {0x80, 0};
// constexpr FlagByIndex BUTTON_7 = {0x40, 0};
// constexpr FlagByIndex BUTTON_8 = {0x80, 0};
constexpr FlagByIndex BUTTON_9 = {0x01, 1};
constexpr FlagByIndex BUTTON_10 = {0x02, 1};
constexpr FlagByIndex BUTTON_11 = {0x04, 1};
constexpr FlagByIndex BUTTON_12 = {0x08, 1};
constexpr FlagByIndex BUTTON_13 = {0x10, 1};
// constexpr FlagByIndex BUTTON_13 = {0x10, 1};
constexpr usz DPAD_INDEX = 2;
enum class DPad : u8
@ -111,9 +111,9 @@ constexpr FlagByIndex HIHAT_PEDAL = controller::BUTTON_6;
constexpr FlagByIndex IS_DRUM = controller::BUTTON_11;
constexpr FlagByIndex IS_CYMBAL = controller::BUTTON_12;
constexpr FlagByIndex BACK_BUTTON = controller::BUTTON_3;
// constexpr FlagByIndex BACK_BUTTON = controller::BUTTON_3;
constexpr FlagByIndex START_BUTTON = controller::BUTTON_10;
constexpr FlagByIndex SYSTEM_BUTTON = controller::BUTTON_13;
// constexpr FlagByIndex SYSTEM_BUTTON = controller::BUTTON_13;
constexpr FlagByIndex SELECT_BUTTON = controller::BUTTON_9;
rb3drums::KitState start_state()

1
rpcs3/Emu/Io/RB3MidiDrums.h
View file

@ -5,6 +5,7 @@
#include <rtmidi_c.h>
#include <chrono>
#include <vector>
#include <optional>
namespace rb3drums
{

2
rpcs3/Input/raw_mouse_handler.cpp
View file

@ -23,7 +23,7 @@ static inline void draw_overlay_cursor(u32 index, s32 x_pos, s32 y_pos, s32 x_ma
rsx::overlays::set_cursor(rsx::overlays::cursor_offset::last + index, x, y, color, 2'000'000, false);
}
#else
static inline void draw_overlay_cursor(u32, s32, s32, s32, s32) {}
[[maybe_unused]] static inline void draw_overlay_cursor(u32, s32, s32, s32, s32) {}
#endif
LOG_CHANNEL(input_log, "Input");