aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorPär Björklund <per.bjorklund@gmail.com>2015-01-03 14:28:32 +0100
committerPär Björklund <per.bjorklund@gmail.com>2015-02-02 14:47:52 +0100
commit899ad0adb3ca449c0aac85018a75b0e30799f6d9 (patch)
tree50c288bb1d0a1c287fdb89dd97493193c2d24142 /project
parenta756aaac9af73b885ebe03c96e128f501c642cfc (diff)
Moved input handling from CApplication into it's own class CInputManager.
Removed global g_joystick and made it a private member of CInputManager
Diffstat (limited to 'project')
-rw-r--r--project/VS2010Express/XBMC.vcxproj2
-rw-r--r--project/VS2010Express/XBMC.vcxproj.filters8
2 files changed, 9 insertions, 1 deletions
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index c1a81cc51a..0a1be3ab21 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -496,6 +496,7 @@
<ClCompile Include="..\..\xbmc\GUIPassword.cpp" />
<ClCompile Include="..\..\xbmc\input\ButtonTranslator.cpp" />
<ClCompile Include="..\..\xbmc\input\InertialScrollingHandler.cpp" />
+ <ClCompile Include="..\..\xbmc\input\InputManager.cpp" />
<ClCompile Include="..\..\xbmc\input\KeyboardLayout.cpp" />
<ClCompile Include="..\..\xbmc\input\KeyboardLayoutConfiguration.cpp" />
<ClCompile Include="..\..\xbmc\input\KeyboardStat.cpp" />
@@ -880,6 +881,7 @@
<ClInclude Include="..\..\xbmc\guilib\imagefactory.h" />
<ClInclude Include="..\..\xbmc\guilib\ISliderCallback.h" />
<ClInclude Include="..\..\xbmc\IFileItemListModifier.h" />
+ <ClInclude Include="..\..\xbmc\input\InputManager.h" />
<ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchActionHandler.h" />
<ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchSwipeDetector.h" />
<ClInclude Include="..\..\xbmc\input\touch\generic\IGenericTouchGestureDetector.h" />
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index c77d5fb468..7c9d2ed656 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -3101,6 +3101,9 @@
<ClCompile Include="..\..\xbmc\utils\test\TestHttpRangeUtils.cpp">
<Filter>utils\test</Filter>
</ClCompile>
+ <ClCompile Include="..\..\xbmc\input\InputManager.cpp">
+ <Filter>input</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\xbmc\win32\pch.h">
@@ -6033,6 +6036,9 @@
<ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPFileHandler.h">
<Filter>network\httprequesthandler</Filter>
</ClInclude>
+ <ClInclude Include="..\..\xbmc\input\InputManager.h">
+ <Filter>input</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
@@ -6075,4 +6081,4 @@
<Filter>win32</Filter>
</CustomBuild>
</ItemGroup>
-</Project>
+</Project> \ No newline at end of file