INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-10 22:28:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

service: nfc: Merge device interfaces and create the device manager

Browse Source
This commit is contained in:
Narr the Reg
2023-04-19 19:01:23 -06:00
committed by german77
parent 5e16fe4579
commit 94151097b9
32 changed files with 2086 additions and 2465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/yuzu/main.cpp
View File

@ -570,8 +570,8 @@ void GMainWindow::RegisterMetaTypes() {
// Cabinet Applet
qRegisterMetaType<Core::Frontend::CabinetParameters>("Core::Frontend::CabinetParameters");
qRegisterMetaType<std::shared_ptr<Service::NFP::NfpDevice>>(
"std::shared_ptr<Service::NFP::NfpDevice>");
qRegisterMetaType<std::shared_ptr<Service::NFC::NfcDevice>>(
"std::shared_ptr<Service::NFC::NfcDevice>");
// Controller Applet
qRegisterMetaType<Core::Frontend::ControllerParameters>("Core::Frontend::ControllerParameters");
@ -599,7 +599,7 @@ void GMainWindow::RegisterMetaTypes() {
}
void GMainWindow::AmiiboSettingsShowDialog(const Core::Frontend::CabinetParameters& parameters,
std::shared_ptr<Service::NFP::NfpDevice> nfp_device) {
std::shared_ptr<Service::NFC::NfcDevice> nfp_device) {
cabinet_applet =
new QtAmiiboSettingsDialog(this, parameters, input_subsystem.get(), nfp_device);
SCOPE_EXIT({