archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 01:08:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

product_info: add Harmonix Pro-Drum Kit (#9822)

Browse source 
Co-authored-by: DrGeelfood <79338929+DrGeelfood@users.noreply.github.com>
This commit is contained in:
Megamouse 2021-02-23 16:23:53 +01:00 • committed by GitHub
parent 112b7f6571
commit b83cb2dbf5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
rpcs3/Input/product_info.h
View file

@ -13,6 +13,7 @@ namespace input
dj_hero_turntable, dj_hero_turntable,
harmonix_rockband_guitar, harmonix_rockband_guitar,
harmonix_rockband_drum_kit, harmonix_rockband_drum_kit,
harmonix_rockband_drum_kit_2,
rock_revolution_drum_kit rock_revolution_drum_kit
}; };
@ -25,14 +26,15 @@ namespace input
enum product_id enum product_id
{ {
red_octane_gh_guitar = 0x0100, // RedOctane Guitar (Guitar Hero 4 Guitar Controller) red_octane_gh_guitar = 0x0100, // RedOctane Guitar (Guitar Hero 4 Guitar Controller)
red_octane_gh_drum_kit = 0x0120, // RedOctane Drum Kit (Guitar Hero 4 Drum Controller) red_octane_gh_drum_kit = 0x0120, // RedOctane Drum Kit (Guitar Hero 4 Drum Controller)
dance_dance_revolution_mat = 0x0140, // Dance Dance Revolution Dance Mat Controller dance_dance_revolution_mat = 0x0140, // Dance Dance Revolution Dance Mat Controller
dj_hero_turntable = 0x0140, // DJ Hero Turntable Controller dj_hero_turntable = 0x0140, // DJ Hero Turntable Controller
harmonix_rockband_guitar = 0x0200, // Harmonix Guitar (Rock Band II Guitar Controller) harmonix_rockband_guitar = 0x0200, // Harmonix Guitar (Rock Band II Guitar Controller)
harmonix_rockband_drum_kit = 0x0210, // Harmonix Drum Kit (Rock Band II Drum Controller) harmonix_rockband_drum_kit = 0x0210, // Harmonix Drum Kit (Rock Band II Drum Controller)
playstation_3_controller = 0x0268, // PlayStation 3 Controller harmonix_rockband_drum_kit_2 = 0x0218, // Harmonix Pro-Drum Kit (Rock Band III Pro-Drum Controller)
rock_revolution_drum_kit = 0x0300, // Rock Revolution Drum Controller playstation_3_controller = 0x0268, // PlayStation 3 Controller
rock_revolution_drum_kit = 0x0300, // Rock Revolution Drum Controller
}; };
struct product_info struct product_info
@ -64,6 +66,10 @@ namespace input
{ {
return product_info{ type, vendor_id::sony_cea, product_id::harmonix_rockband_drum_kit, 0x000000FF }; return product_info{ type, vendor_id::sony_cea, product_id::harmonix_rockband_drum_kit, 0x000000FF };
} }
case product_type::harmonix_rockband_drum_kit_2:
{
return product_info{ type, vendor_id::sony_cea, product_id::harmonix_rockband_drum_kit_2, 0x000000BF };
}
case product_type::harmonix_rockband_guitar: case product_type::harmonix_rockband_guitar:
{ {
return product_info{ type, vendor_id::sony_cea, product_id::harmonix_rockband_guitar, 0x00007FFF }; return product_info{ type, vendor_id::sony_cea, product_id::harmonix_rockband_guitar, 0x00007FFF };
@ -109,6 +115,7 @@ namespace input
{ {
get_product_info(product_type::red_octane_gh_drum_kit), get_product_info(product_type::red_octane_gh_drum_kit),
get_product_info(product_type::harmonix_rockband_drum_kit), get_product_info(product_type::harmonix_rockband_drum_kit),
get_product_info(product_type::harmonix_rockband_drum_kit_2),
get_product_info(product_type::rock_revolution_drum_kit) get_product_info(product_type::rock_revolution_drum_kit)
}; };
} }

5
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file

@ -1467,6 +1467,11 @@ void pad_settings_dialog::HandleDeviceClassChange(int index)
ui->chooseProduct->addItem(tr("Rockband", "Harmonix Rockband Drum Kit"), static_cast<int>(product.type)); ui->chooseProduct->addItem(tr("Rockband", "Harmonix Rockband Drum Kit"), static_cast<int>(product.type));
break; break;
} }
case input::product_type::harmonix_rockband_drum_kit_2:
{
ui->chooseProduct->addItem(tr("Rockband Pro", "Harmonix Rockband Pro-Drum Kit"), static_cast<int>(product.type));
break;
}
case input::product_type::harmonix_rockband_guitar: case input::product_type::harmonix_rockband_guitar:
{ {
ui->chooseProduct->addItem(tr("Rockband", "Harmonix Rockband Guitar"), static_cast<int>(product.type)); ui->chooseProduct->addItem(tr("Rockband", "Harmonix Rockband Guitar"), static_cast<int>(product.type));