From 00c89d21d28338247a5efddd2ac7037891880732 Mon Sep 17 00:00:00 2001 From: ndeadly <24677491+ndeadly@users.noreply.github.com> Date: Sun, 28 Jun 2020 17:21:07 +0200 Subject: [PATCH] btdrv-mitm: comment out virtual controller stuff for now --- btdrv-mitm/source/controllers/bluetoothcontroller.cpp | 2 +- btdrv-mitm/source/controllers/bluetoothcontroller.hpp | 2 +- btdrv-mitm/source/controllers/dualshock4.cpp | 4 ++-- btdrv-mitm/source/controllers/wiimote.cpp | 4 ++-- btdrv-mitm/source/controllers/wiiupro.cpp | 4 ++-- btdrv-mitm/source/controllers/xboxone.cpp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/btdrv-mitm/source/controllers/bluetoothcontroller.cpp b/btdrv-mitm/source/controllers/bluetoothcontroller.cpp index ff0bf1b..3eaa175 100644 --- a/btdrv-mitm/source/controllers/bluetoothcontroller.cpp +++ b/btdrv-mitm/source/controllers/bluetoothcontroller.cpp @@ -5,7 +5,7 @@ namespace controller { BluetoothController::BluetoothController(ControllerType type, const BluetoothAddress *address) : m_type(type), m_address(*address) { m_switchController = (type == ControllerType_Joycon) || (type == ControllerType_SwitchPro); - m_virtualController = nullptr; + //m_virtualController = nullptr; } const BluetoothAddress& BluetoothController::address(void) const { diff --git a/btdrv-mitm/source/controllers/bluetoothcontroller.hpp b/btdrv-mitm/source/controllers/bluetoothcontroller.hpp index 058e3cc..6ccc5f0 100644 --- a/btdrv-mitm/source/controllers/bluetoothcontroller.hpp +++ b/btdrv-mitm/source/controllers/bluetoothcontroller.hpp @@ -39,7 +39,7 @@ namespace controller { BluetoothAddress m_address; bool m_switchController; - std::unique_ptr m_virtualController; + //std::unique_ptr m_virtualController; }; diff --git a/btdrv-mitm/source/controllers/dualshock4.cpp b/btdrv-mitm/source/controllers/dualshock4.cpp index 9485b74..d012bcd 100644 --- a/btdrv-mitm/source/controllers/dualshock4.cpp +++ b/btdrv-mitm/source/controllers/dualshock4.cpp @@ -19,8 +19,8 @@ namespace controller { Dualshock4Controller::Dualshock4Controller(const BluetoothAddress *address) : BluetoothController(ControllerType_Dualshock4, address) { - if (ams::hos::GetVersion() >= ams::hos::Version_7_0_0) - m_virtualController = std::make_unique(); + //if (ams::hos::GetVersion() >= ams::hos::Version_7_0_0) + //m_virtualController = std::make_unique(); } Result Dualshock4Controller::initialize(void) { diff --git a/btdrv-mitm/source/controllers/wiimote.cpp b/btdrv-mitm/source/controllers/wiimote.cpp index a3314c3..212c59d 100644 --- a/btdrv-mitm/source/controllers/wiimote.cpp +++ b/btdrv-mitm/source/controllers/wiimote.cpp @@ -6,8 +6,8 @@ namespace controller { WiimoteController::WiimoteController(const BluetoothAddress *address) : WiiController(ControllerType_Wiimote, address) { - if (ams::hos::GetVersion() >= ams::hos::Version_7_0_0) - m_virtualController = std::make_unique(); + //if (ams::hos::GetVersion() >= ams::hos::Version_7_0_0) + //m_virtualController = std::make_unique(); } void WiimoteController::convertReportFormat(const HidReport *inReport, HidReport *outReport) { diff --git a/btdrv-mitm/source/controllers/wiiupro.cpp b/btdrv-mitm/source/controllers/wiiupro.cpp index 32f63e1..ae3a6dd 100644 --- a/btdrv-mitm/source/controllers/wiiupro.cpp +++ b/btdrv-mitm/source/controllers/wiiupro.cpp @@ -9,8 +9,8 @@ namespace controller { WiiUProController::WiiUProController(const BluetoothAddress *address) : WiiController(ControllerType_WiiUPro, address) { - if (ams::hos::GetVersion() >= ams::hos::Version_7_0_0) - m_virtualController = std::make_unique(); + //if (ams::hos::GetVersion() >= ams::hos::Version_7_0_0) + //m_virtualController = std::make_unique(); } Result WiiUProController::initialize(void) { diff --git a/btdrv-mitm/source/controllers/xboxone.cpp b/btdrv-mitm/source/controllers/xboxone.cpp index 928fde5..f220a8a 100644 --- a/btdrv-mitm/source/controllers/xboxone.cpp +++ b/btdrv-mitm/source/controllers/xboxone.cpp @@ -15,8 +15,8 @@ namespace controller { XboxOneController::XboxOneController(const BluetoothAddress *address) : BluetoothController(ControllerType_XboxOne, address) { - if (ams::hos::GetVersion() >= ams::hos::Version_7_0_0) - m_virtualController = std::make_unique(); + //if (ams::hos::GetVersion() >= ams::hos::Version_7_0_0) + //m_virtualController = std::make_unique(); } void XboxOneController::convertReportFormat(const HidReport *inReport, HidReport *outReport) {