RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2025-12-06 07:12:14 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ps3/android: Remove rtmidi

Browse source
This commit is contained in:
DH 2025-04-25 17:57:50 +03:00
parent 6129723f09
commit 80e27d9dcf
8 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
3rdparty/CMakeLists.txt vendored
View file

@ -378,7 +378,12 @@ endif()
add_subdirectory(miniupnp EXCLUDE_FROM_ALL) add_subdirectory(miniupnp EXCLUDE_FROM_ALL)
# RTMIDI # RTMIDI
add_subdirectory(rtmidi EXCLUDE_FROM_ALL) if(NOT ANDROID)
add_subdirectory(rtmidi EXCLUDE_FROM_ALL)
else()
add_library(rtmidi INTERFACE)
target_compile_definitions(rtmidi INTERFACE WITHOUT_RTMIDI)
endif()
# OPENCV # OPENCV
add_subdirectory(opencv EXCLUDE_FROM_ALL) add_subdirectory(opencv EXCLUDE_FROM_ALL)

2
rpcs3/Emu/Cell/lv2/sys_usbd.cpp
View file

@ -537,6 +537,7 @@ usb_handler_thread::usb_handler_thread()
usb_devices.push_back(std::make_shared<usb_device_vfs>(usb_info, get_new_location())); usb_devices.push_back(std::make_shared<usb_device_vfs>(usb_info, get_new_location()));
} }
#ifndef WITHOUT_RTMIDI
const std::vector<std::string> devices_list = fmt::split(g_cfg.io.midi_devices.to_string(), {"@@@"}); const std::vector<std::string> devices_list = fmt::split(g_cfg.io.midi_devices.to_string(), {"@@@"});
for (usz index = 0; index < std::min(max_midi_devices, devices_list.size()); index++) for (usz index = 0; index < std::min(max_midi_devices, devices_list.size()); index++)
{ {
@ -569,6 +570,7 @@ usb_handler_thread::usb_handler_thread()
break; break;
} }
} }
#endif
} }
usb_handler_thread::~usb_handler_thread() usb_handler_thread::~usb_handler_thread()

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

@ -1,6 +1,8 @@
// Rock Band 3 MIDI Pro Adapter Emulator (drums Mode) // Rock Band 3 MIDI Pro Adapter Emulator (drums Mode)
#include "stdafx.h" #include "stdafx.h"
#ifndef WITHOUT_RTMIDI
#include "RB3MidiDrums.h" #include "RB3MidiDrums.h"
#include "Emu/Cell/lv2/sys_usbd.h" #include "Emu/Cell/lv2/sys_usbd.h"
#include "Emu/Io/rb3drums_config.h" #include "Emu/Io/rb3drums_config.h"
@ -838,3 +840,5 @@ std::optional<rb3drums::KitState> usb_device_rb3_midi_drums::ComboTracker::take_
} }
return {}; return {};
} }
#endif

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

@ -1,5 +1,7 @@
#pragma once #pragma once
#ifndef WITHOUT_RTMIDI
#include "Emu/Io/usb_device.h" #include "Emu/Io/usb_device.h"
#include <rtmidi_c.h> #include <rtmidi_c.h>
@ -155,3 +157,5 @@ private:
bool is_midi_cc(u8 id, u8 value); bool is_midi_cc(u8 id, u8 value);
void write_state(u8* buf, const rb3drums::KitState&); void write_state(u8* buf, const rb3drums::KitState&);
}; };
#endif

5
rpcs3/Emu/Io/RB3MidiGuitar.cpp
View file

@ -1,6 +1,9 @@
// Rock Band 3 MIDI Pro Adapter Emulator (Guitar Mode) // Rock Band 3 MIDI Pro Adapter Emulator (Guitar Mode)
#include "stdafx.h" #include "stdafx.h"
#ifndef WITHOUT_RTMIDI
#include "RB3MidiGuitar.h" #include "RB3MidiGuitar.h"
#include "Emu/Cell/lv2/sys_usbd.h" #include "Emu/Cell/lv2/sys_usbd.h"
@ -370,3 +373,5 @@ void usb_device_rb3_midi_guitar::write_state(u8* buf)
buf[2] = button_state.dpad; buf[2] = button_state.dpad;
} }
#endif

4
rpcs3/Emu/Io/RB3MidiGuitar.h
View file

@ -1,5 +1,7 @@
#pragma once #pragma once
#ifndef WITHOUT_RTMIDI
#include "Emu/Io/usb_device.h" #include "Emu/Io/usb_device.h"
#include <rtmidi_c.h> #include <rtmidi_c.h>
@ -42,3 +44,5 @@ public:
void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override; void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override; void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
}; };
#endif

5
rpcs3/Emu/Io/RB3MidiKeyboard.cpp
View file

@ -1,6 +1,7 @@
// Rock Band 3 MIDI Pro Adapter Emulator (Keyboard Mode) // Rock Band 3 MIDI Pro Adapter Emulator (Keyboard Mode)
#include "stdafx.h" #include "stdafx.h"
#ifndef WITHOUT_RTMIDI
#include "RB3MidiKeyboard.h" #include "RB3MidiKeyboard.h"
#include "Emu/Cell/lv2/sys_usbd.h" #include "Emu/Cell/lv2/sys_usbd.h"
@ -355,3 +356,5 @@ void usb_device_rb3_midi_keyboard::write_state(u8* buf)
buf[15] = std::min<u8>(std::max<u8>(0x5, wheel_pos), 0x75); buf[15] = std::min<u8>(std::max<u8>(0x5, wheel_pos), 0x75);
} }
} }
#endif

3
rpcs3/Emu/Io/RB3MidiKeyboard.h
View file

@ -1,5 +1,7 @@
#pragma once #pragma once
#ifndef WITHOUT_RTMIDI
#include "Emu/Io/usb_device.h" #include "Emu/Io/usb_device.h"
#include <rtmidi_c.h> #include <rtmidi_c.h>
@ -47,3 +49,4 @@ public:
void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override; void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override; void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
}; };
#endif