From 5bc128e085ea2ce5148ef5bc4ce4fa2319f4e64f Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 14 Jun 2026 06:19:01 +0200 Subject: [PATCH] Use std::string_view in midi handlers --- rpcs3/Emu/Io/RB3MidiDrums.cpp | 2 +- rpcs3/Emu/Io/RB3MidiDrums.h | 2 +- rpcs3/Emu/Io/RB3MidiGuitar.cpp | 2 +- rpcs3/Emu/Io/RB3MidiGuitar.h | 2 +- rpcs3/Emu/Io/RB3MidiKeyboard.cpp | 2 +- rpcs3/Emu/Io/RB3MidiKeyboard.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/Io/RB3MidiDrums.cpp b/rpcs3/Emu/Io/RB3MidiDrums.cpp index efb1283c1c..88ccb17178 100644 --- a/rpcs3/Emu/Io/RB3MidiDrums.cpp +++ b/rpcs3/Emu/Io/RB3MidiDrums.cpp @@ -313,7 +313,7 @@ usb_device_rb3_midi_drums::Definition::Definition(std::string name, const std::s , create_state{create_state} {} -usb_device_rb3_midi_drums::usb_device_rb3_midi_drums(const std::array& location, const std::string& device_name) +usb_device_rb3_midi_drums::usb_device_rb3_midi_drums(const std::array& location, std::string_view device_name) : usb_device_emulated(location) { m_id_to_note_mapping = midi::create_id_to_note_mapping(); diff --git a/rpcs3/Emu/Io/RB3MidiDrums.h b/rpcs3/Emu/Io/RB3MidiDrums.h index 9d13a81812..8d71ce93ef 100644 --- a/rpcs3/Emu/Io/RB3MidiDrums.h +++ b/rpcs3/Emu/Io/RB3MidiDrums.h @@ -109,7 +109,7 @@ enum class Note : u8 class usb_device_rb3_midi_drums : public usb_device_emulated { public: - usb_device_rb3_midi_drums(const std::array& location, const std::string& device_name); + usb_device_rb3_midi_drums(const std::array& location, std::string_view device_name); ~usb_device_rb3_midi_drums(); void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override; diff --git a/rpcs3/Emu/Io/RB3MidiGuitar.cpp b/rpcs3/Emu/Io/RB3MidiGuitar.cpp index 923fc3a98b..573944dd52 100644 --- a/rpcs3/Emu/Io/RB3MidiGuitar.cpp +++ b/rpcs3/Emu/Io/RB3MidiGuitar.cpp @@ -6,7 +6,7 @@ LOG_CHANNEL(rb3_midi_guitar_log); -usb_device_rb3_midi_guitar::usb_device_rb3_midi_guitar(const std::array& location, const std::string& device_name, bool twentytwo_fret) +usb_device_rb3_midi_guitar::usb_device_rb3_midi_guitar(const std::array& location, std::string_view device_name, bool twentytwo_fret) : usb_device_emulated(location) { // For the 22-fret guitar (Fender Squier), the only thing that's different diff --git a/rpcs3/Emu/Io/RB3MidiGuitar.h b/rpcs3/Emu/Io/RB3MidiGuitar.h index 3a93f95d61..6c20aa5a2a 100644 --- a/rpcs3/Emu/Io/RB3MidiGuitar.h +++ b/rpcs3/Emu/Io/RB3MidiGuitar.h @@ -36,7 +36,7 @@ private: void write_state(u8* buf); public: - usb_device_rb3_midi_guitar(const std::array& location, const std::string& device_name, bool twentytwo_fret); + usb_device_rb3_midi_guitar(const std::array& location, std::string_view device_name, bool twentytwo_fret); ~usb_device_rb3_midi_guitar(); void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override; diff --git a/rpcs3/Emu/Io/RB3MidiKeyboard.cpp b/rpcs3/Emu/Io/RB3MidiKeyboard.cpp index f96f138628..f22ad800b7 100644 --- a/rpcs3/Emu/Io/RB3MidiKeyboard.cpp +++ b/rpcs3/Emu/Io/RB3MidiKeyboard.cpp @@ -6,7 +6,7 @@ LOG_CHANNEL(rb3_midi_keyboard_log); -usb_device_rb3_midi_keyboard::usb_device_rb3_midi_keyboard(const std::array& location, const std::string& device_name) +usb_device_rb3_midi_keyboard::usb_device_rb3_midi_keyboard(const std::array& location, std::string_view device_name) : usb_device_emulated(location) { device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x0200, 0x00, 0x00, 0x00, 64, 0x12ba, 0x2338, 0x01, 0x01, 0x02, 0x00, 0x01}); diff --git a/rpcs3/Emu/Io/RB3MidiKeyboard.h b/rpcs3/Emu/Io/RB3MidiKeyboard.h index c5042af239..131fedc0c3 100644 --- a/rpcs3/Emu/Io/RB3MidiKeyboard.h +++ b/rpcs3/Emu/Io/RB3MidiKeyboard.h @@ -41,7 +41,7 @@ private: void write_state(u8* buf); public: - usb_device_rb3_midi_keyboard(const std::array& location, const std::string& device_name); + usb_device_rb3_midi_keyboard(const std::array& location, std::string_view device_name); ~usb_device_rb3_midi_keyboard(); void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;