From 105c4988f02d0845aacb25e7b06d026130a76dee Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 28 Sep 2026 10:01:44 +0200 Subject: [PATCH] mic: fix some warnings --- rpcs3/Emu/Io/usb_microphone.cpp | 17 ++--------------- rpcs3/Emu/Io/usb_microphone.h | 5 +---- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/rpcs3/Emu/Io/usb_microphone.cpp b/rpcs3/Emu/Io/usb_microphone.cpp index eca24065ba..1abfe3ef26 100644 --- a/rpcs3/Emu/Io/usb_microphone.cpp +++ b/rpcs3/Emu/Io/usb_microphone.cpp @@ -200,6 +200,8 @@ usb_device_mic::usb_device_mic(u32 controller_index, const std::array& lo break; } case MicType::Logitech: + case MicType::EyeToy: + case MicType::PsEye: { device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor { @@ -501,21 +503,6 @@ usb_device_mic::usb_device_mic(u32 controller_index, const std::array& lo } } -std::shared_ptr usb_device_mic::make_singstar(u32 controller_index, const std::array& location) -{ - return std::make_shared(controller_index, location, MicType::SingStar); -} - -std::shared_ptr usb_device_mic::make_logitech(u32 controller_index, const std::array& location) -{ - return std::make_shared(controller_index, location, MicType::Logitech); -} - -std::shared_ptr usb_device_mic::make_rocksmith(u32 controller_index, const std::array& location) -{ - return std::make_shared(controller_index, location, MicType::Rocksmith); -} - u16 usb_device_mic::get_num_emu_devices() { return 1; diff --git a/rpcs3/Emu/Io/usb_microphone.h b/rpcs3/Emu/Io/usb_microphone.h index 374aa642df..4a7ca0e7e7 100644 --- a/rpcs3/Emu/Io/usb_microphone.h +++ b/rpcs3/Emu/Io/usb_microphone.h @@ -25,10 +25,7 @@ class usb_device_mic : public usb_device_emulated { public: usb_device_mic(u32 controller_index, const std::array& location, MicType mic_type); - - static std::shared_ptr make_singstar(u32 controller_index, const std::array& location); - static std::shared_ptr make_logitech(u32 controller_index, const std::array& location); - static std::shared_ptr make_rocksmith(u32 controller_index, const std::array& location); + static u16 get_num_emu_devices(); void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;