piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename ciface::Wiimote to ciface::WiimoteController

Browse Source
This commit is contained in:
Shawn Hoffman 2020-09-15 04:24:25 -07:00
parent 84128d9532
commit 0be1491ef0
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -26,7 +26,7 @@
#include "Core/HW/WiimoteReal/IOWin.h" #include "Core/HW/WiimoteReal/IOWin.h"
#include "Core/HW/WiimoteReal/IOdarwin.h" #include "Core/HW/WiimoteReal/IOdarwin.h"
#include "Core/HW/WiimoteReal/IOhidapi.h" #include "Core/HW/WiimoteReal/IOhidapi.h"
#include "InputCommon/ControllerInterface/Wiimote/Wiimote.h" #include "InputCommon/ControllerInterface/Wiimote/WiimoteController.h"
#include "InputCommon/InputConfig.h" #include "InputCommon/InputConfig.h"
#include "SFML/Network.hpp" #include "SFML/Network.hpp"
@ -85,7 +85,7 @@ static void TryToFillWiimoteSlot(u32 index)
// If the pool is empty, attempt to steal from ControllerInterface. // If the pool is empty, attempt to steal from ControllerInterface.
if (s_wiimote_pool.empty()) if (s_wiimote_pool.empty())
{ {
ciface::Wiimote::ReleaseDevices(1); ciface::WiimoteController::ReleaseDevices(1);
// Still empty? // Still empty?
if (s_wiimote_pool.empty()) if (s_wiimote_pool.empty())
@ -108,13 +108,13 @@ void ProcessWiimotePool()
if (SConfig::GetInstance().connect_wiimotes_for_ciface) if (SConfig::GetInstance().connect_wiimotes_for_ciface)
{ {
for (auto& entry : s_wiimote_pool) for (auto& entry : s_wiimote_pool)
ciface::Wiimote::AddDevice(std::move(entry.wiimote)); ciface::WiimoteController::AddDevice(std::move(entry.wiimote));
s_wiimote_pool.clear(); s_wiimote_pool.clear();
} }
else else
{ {
ciface::Wiimote::ReleaseDevices(); ciface::WiimoteController::ReleaseDevices();
} }
} }
@ -858,7 +858,7 @@ void Shutdown()
HandleWiimoteDisconnect(i); HandleWiimoteDisconnect(i);
// Release remotes from ControllerInterface and empty the pool. // Release remotes from ControllerInterface and empty the pool.
ciface::Wiimote::ReleaseDevices(); ciface::WiimoteController::ReleaseDevices();
s_wiimote_pool.clear(); s_wiimote_pool.clear();
} }

4
Source/Core/InputCommon/CMakeLists.txt
View File

@ -56,8 +56,8 @@ add_library(inputcommon
ControllerInterface/ControllerInterface.h ControllerInterface/ControllerInterface.h
ControllerInterface/Device.cpp ControllerInterface/Device.cpp
ControllerInterface/Device.h ControllerInterface/Device.h
ControllerInterface/Wiimote/Wiimote.cpp ControllerInterface/Wiimote/WiimoteController.cpp
ControllerInterface/Wiimote/Wiimote.h ControllerInterface/Wiimote/WiimoteController.h
ControlReference/ControlReference.cpp ControlReference/ControlReference.cpp
ControlReference/ControlReference.h ControlReference/ControlReference.h
ControlReference/ExpressionParser.cpp ControlReference/ExpressionParser.cpp

6
Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp → Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "InputCommon/ControllerInterface/Wiimote/Wiimote.h" #include "InputCommon/ControllerInterface/Wiimote/WiimoteController.h"
#include "Common/BitUtils.h" #include "Common/BitUtils.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
@ -13,7 +13,7 @@
#include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/ControllerInterface.h"
namespace ciface::Wiimote namespace ciface::WiimoteController
{ {
static constexpr char SOURCE_NAME[] = "Bluetooth"; static constexpr char SOURCE_NAME[] = "Bluetooth";
@ -1677,4 +1677,4 @@ void Device::ProcessStatusReport(const InputReportStatus& status)
} }
} }
} // namespace ciface::Wiimote } // namespace ciface::WiimoteController

4
Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.h → Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h
View File

@ -18,7 +18,7 @@
#include "Core/HW/WiimoteReal/WiimoteReal.h" #include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "InputCommon/ControllerInterface/Device.h" #include "InputCommon/ControllerInterface/Device.h"
namespace ciface::Wiimote namespace ciface::WiimoteController
{ {
using namespace WiimoteCommon; using namespace WiimoteCommon;
@ -279,4 +279,4 @@ private:
Clock::time_point m_last_report_time = Clock::now(); Clock::time_point m_last_report_time = Clock::now();
}; };
} // namespace ciface::Wiimote } // namespace ciface::WiimoteController

4
Source/Core/InputCommon/InputCommon.vcxproj
View File

@ -47,7 +47,7 @@
<ClCompile Include="ControlReference\ExpressionParser.cpp" /> <ClCompile Include="ControlReference\ExpressionParser.cpp" />
<ClCompile Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.cpp" /> <ClCompile Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.cpp" />
<ClCompile Include="ControllerInterface\Win32\Win32.cpp" /> <ClCompile Include="ControllerInterface\Win32\Win32.cpp" />
<ClCompile Include="ControllerInterface\Wiimote\Wiimote.cpp" /> <ClCompile Include="ControllerInterface\Wiimote\WiimoteController.cpp" />
<ClCompile Include="ControllerInterface\XInput\XInput.cpp" /> <ClCompile Include="ControllerInterface\XInput\XInput.cpp" />
<ClCompile Include="ControlReference\FunctionExpression.cpp" /> <ClCompile Include="ControlReference\FunctionExpression.cpp" />
<ClCompile Include="DynamicInputTextureConfiguration.cpp" /> <ClCompile Include="DynamicInputTextureConfiguration.cpp" />
@ -92,7 +92,7 @@
<ClInclude Include="ControlReference\ExpressionParser.h" /> <ClInclude Include="ControlReference\ExpressionParser.h" />
<ClInclude Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.h" /> <ClInclude Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.h" />
<ClInclude Include="ControllerInterface\Win32\Win32.h" /> <ClInclude Include="ControllerInterface\Win32\Win32.h" />
<ClInclude Include="ControllerInterface\Wiimote\Wiimote.h" /> <ClInclude Include="ControllerInterface\Wiimote\WiimoteController.h" />
<ClInclude Include="ControllerInterface\XInput\XInput.h" /> <ClInclude Include="ControllerInterface\XInput\XInput.h" />
<ClInclude Include="DynamicInputTextureConfiguration.h" /> <ClInclude Include="DynamicInputTextureConfiguration.h" />
<ClInclude Include="DynamicInputTextureManager.h" /> <ClInclude Include="DynamicInputTextureManager.h" />

4
Source/Core/InputCommon/InputCommon.vcxproj.filters
View File

@ -110,7 +110,7 @@
<ClCompile Include="ControllerInterface\Win32\Win32.cpp"> <ClCompile Include="ControllerInterface\Win32\Win32.cpp">
<Filter>ControllerInterface\Win32</Filter> <Filter>ControllerInterface\Win32</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="ControllerInterface\Wiimote\Wiimote.cpp"> <ClCompile Include="ControllerInterface\Wiimote\WiimoteController.cpp">
<Filter>ControllerInterface\Wiimote</Filter> <Filter>ControllerInterface\Wiimote</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="ControlReference\ExpressionParser.cpp"> <ClCompile Include="ControlReference\ExpressionParser.cpp">
@ -223,7 +223,7 @@
<ClInclude Include="ControllerInterface\Win32\Win32.h"> <ClInclude Include="ControllerInterface\Win32\Win32.h">
<Filter>ControllerInterface\Win32</Filter> <Filter>ControllerInterface\Win32</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="ControllerInterface\Wiimote\Wiimote.h"> <ClInclude Include="ControllerInterface\Wiimote\WiimoteController.h">
<Filter>ControllerInterface\Wiimote</Filter> <Filter>ControllerInterface\Wiimote</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="ControlReference\ExpressionParser.h"> <ClInclude Include="ControlReference\ExpressionParser.h">