aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--XBMC-ATV2.xcodeproj/project.pbxproj12
-rw-r--r--XBMC-IOS.xcodeproj/project.pbxproj12
-rw-r--r--XBMC.xcodeproj/project.pbxproj16
-rw-r--r--project/VS2010Express/XBMC.vcxproj4
-rw-r--r--project/VS2010Express/XBMC.vcxproj.filters8
-rw-r--r--xbmc/Application.cpp2
-rw-r--r--xbmc/Makefile.in1
-rw-r--r--xbmc/input/InertialScrollingHandler.cpp (renamed from xbmc/InertialScrollingHandler.cpp)0
-rw-r--r--xbmc/input/InertialScrollingHandler.h (renamed from xbmc/InertialScrollingHandler.h)0
-rw-r--r--xbmc/input/Makefile1
-rw-r--r--xbmc/osx/ios/XBMCController.mm1
11 files changed, 30 insertions, 27 deletions
diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj
index 04ef66a8a9..c0dc021eba 100644
--- a/XBMC-ATV2.xcodeproj/project.pbxproj
+++ b/XBMC-ATV2.xcodeproj/project.pbxproj
@@ -29,7 +29,7 @@
C8EC5D51136954E400CCC10D /* XBMC_keytable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8EC5D4F136954E400CCC10D /* XBMC_keytable.cpp */; };
DF0DF16C13A3AF82008ED511 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF16813A3AF82008ED511 /* FileNFS.cpp */; };
DF0DF16D13A3AF82008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF16A13A3AF82008ED511 /* NFSDirectory.cpp */; };
- DF27E25C13C23CCA002514FE /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF27E25A13C23CCA002514FE /* InertialScrollingHandler.cpp */; };
+ DFAB04C113F8385F00B70BFB /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB04BF13F8385F00B70BFB /* InertialScrollingHandler.cpp */; };
DFD4D22013D7286E00A47C47 /* Implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D21413D7286E00A47C47 /* Implementation.cpp */; };
DFD4D22113D7286E00A47C47 /* README.platform in Resources */ = {isa = PBXBuildFile; fileRef = DFD4D21613D7286E00A47C47 /* README.platform */; };
DFD4D22213D7286E00A47C47 /* SystemClock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D21C13D7286E00A47C47 /* SystemClock.cpp */; };
@@ -971,8 +971,8 @@
DF0DF16913A3AF82008ED511 /* FileNFS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileNFS.h; sourceTree = "<group>"; };
DF0DF16A13A3AF82008ED511 /* NFSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSDirectory.cpp; sourceTree = "<group>"; };
DF0DF16B13A3AF82008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = "<group>"; };
- DF27E25A13C23CCA002514FE /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = "<group>"; };
- DF27E25B13C23CCA002514FE /* InertialScrollingHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InertialScrollingHandler.h; sourceTree = "<group>"; };
+ DFAB04BF13F8385F00B70BFB /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = "<group>"; };
+ DFAB04C013F8385F00B70BFB /* InertialScrollingHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InertialScrollingHandler.h; sourceTree = "<group>"; };
DFD4D20D13D7286E00A47C47 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
DFD4D20E13D7286E00A47C47 /* CriticalSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CriticalSection.h; sourceTree = "<group>"; };
DFD4D21213D7286E00A47C47 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
@@ -3285,8 +3285,6 @@
F56C77EA131EC154000AD0F6 /* GUIViewControl.h */,
F56C77EB131EC154000AD0F6 /* GUIViewState.cpp */,
F56C77EC131EC154000AD0F6 /* GUIViewState.h */,
- DF27E25A13C23CCA002514FE /* InertialScrollingHandler.cpp */,
- DF27E25B13C23CCA002514FE /* InertialScrollingHandler.h */,
F56C77ED131EC154000AD0F6 /* IProgressCallback.h */,
F56C77EE131EC154000AD0F6 /* LangInfo.cpp */,
F56C77EF131EC154000AD0F6 /* LangInfo.h */,
@@ -4445,6 +4443,8 @@
children = (
F56C7554131EC152000AD0F6 /* ButtonTranslator.cpp */,
F56C7555131EC152000AD0F6 /* ButtonTranslator.h */,
+ DFAB04BF13F8385F00B70BFB /* InertialScrollingHandler.cpp */,
+ DFAB04C013F8385F00B70BFB /* InertialScrollingHandler.h */,
F56C7556131EC152000AD0F6 /* KeyboardLayoutConfiguration.cpp */,
F56C7557131EC152000AD0F6 /* KeyboardLayoutConfiguration.h */,
F56C7558131EC152000AD0F6 /* KeyboardStat.cpp */,
@@ -6757,13 +6757,13 @@
DF0DF16D13A3AF82008ED511 /* NFSDirectory.cpp in Sources */,
7C89627013B702F3003631FE /* GUIWindowScreensaverDim.cpp in Sources */,
1830216013B8E35300770920 /* controledit.cpp in Sources */,
- DF27E25C13C23CCA002514FE /* InertialScrollingHandler.cpp in Sources */,
18ECC9AA13CF17EB00A9ED6C /* StreamUtils.cpp in Sources */,
F5CEE72C13D3F9AC00225F72 /* DVDOverlayCodecTX3G.cpp in Sources */,
DFD4D22013D7286E00A47C47 /* Implementation.cpp in Sources */,
DFD4D22213D7286E00A47C47 /* SystemClock.cpp in Sources */,
7CEE2E6D13D6B7A8000ABF2A /* TimeSmoother.cpp in Sources */,
F5E6209F13E9081400D5F2CD /* InfoBool.cpp in Sources */,
+ DFAB04C113F8385F00B70BFB /* InertialScrollingHandler.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj
index afc9ac4238..637805e81d 100644
--- a/XBMC-IOS.xcodeproj/project.pbxproj
+++ b/XBMC-IOS.xcodeproj/project.pbxproj
@@ -30,7 +30,7 @@
C8EC5D26136953E100CCC10D /* XBMC_keytable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8EC5D24136953E100CCC10D /* XBMC_keytable.cpp */; };
DF0DF17F13A3AF9F008ED511 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF17B13A3AF9F008ED511 /* FileNFS.cpp */; };
DF0DF18013A3AF9F008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF17D13A3AF9F008ED511 /* NFSDirectory.cpp */; };
- DF27E23613C23CAC002514FE /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF27E23413C23CAC002514FE /* InertialScrollingHandler.cpp */; };
+ DFAB04B013F8383300B70BFB /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB04AE13F8383300B70BFB /* InertialScrollingHandler.cpp */; };
DFD4D1E213D725ED00A47C47 /* Implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D1D813D725ED00A47C47 /* Implementation.cpp */; };
DFD4D1E713D7263000A47C47 /* README.platform in Resources */ = {isa = PBXBuildFile; fileRef = DFD4D1E613D7263000A47C47 /* README.platform */; };
DFD4D1FE13D7283500A47C47 /* SystemClock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D1FC13D7283500A47C47 /* SystemClock.cpp */; };
@@ -971,8 +971,8 @@
DF0DF17C13A3AF9F008ED511 /* FileNFS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileNFS.h; sourceTree = "<group>"; };
DF0DF17D13A3AF9F008ED511 /* NFSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSDirectory.cpp; sourceTree = "<group>"; };
DF0DF17E13A3AF9F008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = "<group>"; };
- DF27E23413C23CAC002514FE /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = "<group>"; };
- DF27E23513C23CAC002514FE /* InertialScrollingHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InertialScrollingHandler.h; sourceTree = "<group>"; };
+ DFAB04AE13F8383300B70BFB /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = "<group>"; };
+ DFAB04AF13F8383300B70BFB /* InertialScrollingHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InertialScrollingHandler.h; sourceTree = "<group>"; };
DFD4D1D113D725ED00A47C47 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
DFD4D1D213D725ED00A47C47 /* CriticalSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CriticalSection.h; sourceTree = "<group>"; };
DFD4D1D613D725ED00A47C47 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
@@ -3644,8 +3644,6 @@
F56C87D7131F42ED000AD0F6 /* GUIViewControl.h */,
F56C87D8131F42ED000AD0F6 /* GUIViewState.cpp */,
F56C87D9131F42ED000AD0F6 /* GUIViewState.h */,
- DF27E23413C23CAC002514FE /* InertialScrollingHandler.cpp */,
- DF27E23513C23CAC002514FE /* InertialScrollingHandler.h */,
F56C87DA131F42ED000AD0F6 /* IProgressCallback.h */,
F56C87DB131F42ED000AD0F6 /* LangInfo.cpp */,
F56C87DC131F42ED000AD0F6 /* LangInfo.h */,
@@ -4804,6 +4802,8 @@
children = (
F56C8537131F42E9000AD0F6 /* ButtonTranslator.cpp */,
F56C8538131F42E9000AD0F6 /* ButtonTranslator.h */,
+ DFAB04AE13F8383300B70BFB /* InertialScrollingHandler.cpp */,
+ DFAB04AF13F8383300B70BFB /* InertialScrollingHandler.h */,
F56C8539131F42E9000AD0F6 /* KeyboardLayoutConfiguration.cpp */,
F56C853A131F42E9000AD0F6 /* KeyboardLayoutConfiguration.h */,
F56C853B131F42E9000AD0F6 /* KeyboardStat.cpp */,
@@ -6772,13 +6772,13 @@
DF0DF18013A3AF9F008ED511 /* NFSDirectory.cpp in Sources */,
7C89628013B7031E003631FE /* GUIWindowScreensaverDim.cpp in Sources */,
1830219E13B8E37300770920 /* controledit.cpp in Sources */,
- DF27E23613C23CAC002514FE /* InertialScrollingHandler.cpp in Sources */,
18ECC99D13CF17D200A9ED6C /* StreamUtils.cpp in Sources */,
F5CEE73013D3F9D100225F72 /* DVDOverlayCodecTX3G.cpp in Sources */,
DFD4D1E213D725ED00A47C47 /* Implementation.cpp in Sources */,
DFD4D1FE13D7283500A47C47 /* SystemClock.cpp in Sources */,
7CEE2E7F13D6B7D4000ABF2A /* TimeSmoother.cpp in Sources */,
F5E6209613E907E200D5F2CD /* InfoBool.cpp in Sources */,
+ DFAB04B013F8383300B70BFB /* InertialScrollingHandler.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index 8cda5ff495..ff1c5c1215 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -406,7 +406,6 @@
43348AAE1077486D00F859CF /* PlayerCoreFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43348AA81077486D00F859CF /* PlayerCoreFactory.cpp */; };
43348AAF1077486D00F859CF /* PlayerSelectionRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43348AAA1077486D00F859CF /* PlayerSelectionRule.cpp */; };
43352CEE1071634600706B8A /* libsquish.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352CED1071634600706B8A /* libsquish.a */; };
- 43B0A5D013C64DF900B2382A /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF27E26C13C23D12002514FE /* InertialScrollingHandler.cpp */; };
43BF08EB1080C6BA00E25290 /* Neptune.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BF08A41080C6B900E25290 /* Neptune.cpp */; };
43BF08EC1080C6BA00E25290 /* NptBase64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BF08A71080C6B900E25290 /* NptBase64.cpp */; };
43BF08ED1080C6BA00E25290 /* NptBufferedStreams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BF08A91080C6B900E25290 /* NptBufferedStreams.cpp */; };
@@ -618,7 +617,8 @@
C8EC5D0E1369519D00CCC10D /* XBMC_keytable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8EC5D0C1369519D00CCC10D /* XBMC_keytable.cpp */; };
DF0DF15B13A3ADA7008ED511 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF15713A3ADA7008ED511 /* FileNFS.cpp */; };
DF0DF15C13A3ADA7008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF15913A3ADA7008ED511 /* NFSDirectory.cpp */; };
- DF27E26E13C23D12002514FE /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF27E26C13C23D12002514FE /* InertialScrollingHandler.cpp */; };
+ DFAB049813F8376700B70BFB /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */; };
+ DFAB049913F8376700B70BFB /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */; };
E306D12E0DDF7B590052C2AD /* XBMCHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E306D12C0DDF7B590052C2AD /* XBMCHelper.cpp */; };
E33206380D5070AA00435CE3 /* DVDDemuxVobsub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E33206370D5070AA00435CE3 /* DVDDemuxVobsub.cpp */; };
E33466A60D2E5103005A65EC /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E33466A50D2E5103005A65EC /* IOKit.framework */; };
@@ -2542,8 +2542,8 @@
DF0DF15813A3ADA7008ED511 /* FileNFS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileNFS.h; sourceTree = "<group>"; };
DF0DF15913A3ADA7008ED511 /* NFSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSDirectory.cpp; sourceTree = "<group>"; };
DF0DF15A13A3ADA7008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = "<group>"; };
- DF27E26C13C23D12002514FE /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = "<group>"; };
- DF27E26D13C23D12002514FE /* InertialScrollingHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InertialScrollingHandler.h; sourceTree = "<group>"; };
+ DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = "<group>"; };
+ DFAB049713F8376700B70BFB /* InertialScrollingHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InertialScrollingHandler.h; sourceTree = "<group>"; };
E306D12C0DDF7B590052C2AD /* XBMCHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMCHelper.cpp; sourceTree = "<group>"; };
E306D12D0DDF7B590052C2AD /* XBMCHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMCHelper.h; sourceTree = "<group>"; };
E33206370D5070AA00435CE3 /* DVDDemuxVobsub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDDemuxVobsub.cpp; sourceTree = "<group>"; };
@@ -4303,6 +4303,8 @@
children = (
18B7C8CB12942546009E7A26 /* ButtonTranslator.cpp */,
18B7C8CC12942546009E7A26 /* ButtonTranslator.h */,
+ DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */,
+ DFAB049713F8376700B70BFB /* InertialScrollingHandler.h */,
18B7C8CD12942546009E7A26 /* KeyboardLayoutConfiguration.cpp */,
18B7C8CE12942546009E7A26 /* KeyboardLayoutConfiguration.h */,
18B7C8CF12942546009E7A26 /* KeyboardStat.cpp */,
@@ -5027,8 +5029,6 @@
E38E17F80D25F9FA00618676 /* GUIViewControl.h */,
E38E17F90D25F9FA00618676 /* GUIViewState.cpp */,
E38E17FA0D25F9FA00618676 /* GUIViewState.h */,
- DF27E26C13C23D12002514FE /* InertialScrollingHandler.cpp */,
- DF27E26D13C23D12002514FE /* InertialScrollingHandler.h */,
E38E184F0D25F9FA00618676 /* IProgressCallback.h */,
E38E18580D25F9FA00618676 /* LangInfo.cpp */,
E38E18590D25F9FA00618676 /* LangInfo.h */,
@@ -8075,13 +8075,13 @@
DF0DF15C13A3ADA7008ED511 /* NFSDirectory.cpp in Sources */,
7C89619213B6A16F003631FE /* GUIWindowScreensaverDim.cpp in Sources */,
1830212813B8E2DC00770920 /* controledit.cpp in Sources */,
- DF27E26E13C23D12002514FE /* InertialScrollingHandler.cpp in Sources */,
18ECC96213CF178D00A9ED6C /* StreamUtils.cpp in Sources */,
F5CEE60913D3C89700225F72 /* DVDOverlayCodecTX3G.cpp in Sources */,
38F4E57013CCCB3B00664821 /* Implementation.cpp in Sources */,
3802709A13D5A653009493DD /* SystemClock.cpp in Sources */,
7CEE2E5B13D6B71E000ABF2A /* TimeSmoother.cpp in Sources */,
7C89674613C03B22003631FE /* InfoBool.cpp in Sources */,
+ DFAB049813F8376700B70BFB /* InertialScrollingHandler.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -8970,13 +8970,13 @@
F558F3D113AE663A00631E12 /* NFSDirectory.cpp in Sources */,
7C89619313B6A16F003631FE /* GUIWindowScreensaverDim.cpp in Sources */,
1830212913B8E2DC00770920 /* controledit.cpp in Sources */,
- 43B0A5D013C64DF900B2382A /* InertialScrollingHandler.cpp in Sources */,
7CEE2E5C13D6B71E000ABF2A /* TimeSmoother.cpp in Sources */,
4308680413E3F64100698436 /* StreamUtils.cpp in Sources */,
4308680913E3F64C00698436 /* SystemClock.cpp in Sources */,
4308680D13E3F65700698436 /* Implementation.cpp in Sources */,
4308681213E3F66600698436 /* DVDOverlayCodecTX3G.cpp in Sources */,
7C89674813C03B22003631FE /* InfoBool.cpp in Sources */,
+ DFAB049913F8376700B70BFB /* InertialScrollingHandler.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index 79b4f36c2f..a0d38b4c43 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -440,8 +440,8 @@
<ClCompile Include="..\..\xbmc\GUIPassword.cpp" />
<ClCompile Include="..\..\xbmc\GUIViewControl.cpp" />
<ClCompile Include="..\..\xbmc\GUIViewState.cpp" />
- <ClCompile Include="..\..\xbmc\InertialScrollingHandler.cpp" />
<ClCompile Include="..\..\xbmc\input\ButtonTranslator.cpp" />
+ <ClCompile Include="..\..\xbmc\input\InertialScrollingHandler.cpp" />
<ClCompile Include="..\..\xbmc\input\KeyboardLayoutConfiguration.cpp" />
<ClCompile Include="..\..\xbmc\input\KeyboardStat.cpp" />
<ClCompile Include="..\..\xbmc\input\KeymapLoader.cpp" />
@@ -1356,8 +1356,8 @@
<ClInclude Include="..\..\xbmc\GUIUserMessages.h" />
<ClInclude Include="..\..\xbmc\GUIViewControl.h" />
<ClInclude Include="..\..\xbmc\GUIViewState.h" />
- <ClInclude Include="..\..\xbmc\InertialScrollingHandler.h" />
<ClInclude Include="..\..\xbmc\input\ButtonTranslator.h" />
+ <ClInclude Include="..\..\xbmc\input\InertialScrollingHandler.h" />
<ClInclude Include="..\..\xbmc\input\KeyboardLayoutConfiguration.h" />
<ClInclude Include="..\..\xbmc\input\KeyboardStat.h" />
<ClInclude Include="..\..\xbmc\input\KeymapLoader.h" />
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index c1c9b61279..c370592a28 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -2475,7 +2475,9 @@
<ClCompile Include="..\..\xbmc\guilib\DirtyRegionTracker.cpp">
<Filter>guilib</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\InertialScrollingHandler.cpp" />
+ <ClCompile Include="..\..\xbmc\input\InertialScrollingHandler.cpp">
+ <Filter>input</Filter>
+ </ClCompile>
<ClCompile Include="..\..\xbmc\threads\platform\Implementation.cpp">
<Filter>threads\platform</Filter>
</ClCompile>
@@ -4974,7 +4976,9 @@
<ClInclude Include="..\..\xbmc\threads\ThreadLocal.h">
<Filter>threads</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\InertialScrollingHandler.h" />
+ <ClInclude Include="..\..\xbmc\input\InertialScrollingHandler.h" >
+ <Filter>input</Filter>
+ </ClInclude>
<ClInclude Include="..\..\xbmc\threads\platform\Condition.h">
<Filter>threads\platform</Filter>
</ClInclude>
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 742c47a33e..e8443a2d6a 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -52,7 +52,7 @@
#include "network/libscrobbler/lastfmscrobbler.h"
#include "network/libscrobbler/librefmscrobbler.h"
#include "GUIPassword.h"
-#include "InertialScrollingHandler.h"
+#include "input/InertialScrollingHandler.h"
#include "ApplicationMessenger.h"
#include "SectionLoader.h"
#include "cores/DllLoader/DllLoaderContainer.h"
diff --git a/xbmc/Makefile.in b/xbmc/Makefile.in
index f903157a9d..e73035d807 100644
--- a/xbmc/Makefile.in
+++ b/xbmc/Makefile.in
@@ -7,7 +7,6 @@ SRCS=Application.cpp \
DynamicDll.cpp \
Favourites.cpp \
FileItem.cpp \
- InertialScrollingHandler.cpp \
LangInfo.cpp \
GUIInfoManager.cpp \
GUILargeTextureManager.cpp \
diff --git a/xbmc/InertialScrollingHandler.cpp b/xbmc/input/InertialScrollingHandler.cpp
index b44f200417..b44f200417 100644
--- a/xbmc/InertialScrollingHandler.cpp
+++ b/xbmc/input/InertialScrollingHandler.cpp
diff --git a/xbmc/InertialScrollingHandler.h b/xbmc/input/InertialScrollingHandler.h
index 38be2ac762..38be2ac762 100644
--- a/xbmc/InertialScrollingHandler.h
+++ b/xbmc/input/InertialScrollingHandler.h
diff --git a/xbmc/input/Makefile b/xbmc/input/Makefile
index 6abec12cfa..6221f4a133 100644
--- a/xbmc/input/Makefile
+++ b/xbmc/input/Makefile
@@ -1,4 +1,5 @@
SRCS=ButtonTranslator.cpp \
+ InertialScrollingHandler.cpp \
KeyboardLayoutConfiguration.cpp \
KeyboardStat.cpp \
KeymapLoader.cpp \
diff --git a/xbmc/osx/ios/XBMCController.mm b/xbmc/osx/ios/XBMCController.mm
index 42d56e36f6..8f25bdfa65 100644
--- a/xbmc/osx/ios/XBMCController.mm
+++ b/xbmc/osx/ios/XBMCController.mm
@@ -29,7 +29,6 @@
#include "AdvancedSettings.h"
#include "FileItem.h"
#include "Application.h"
-#include "InertialScrollingHandler.h"
#include "MouseStat.h"
#include "WindowingFactory.h"
#include "guilib/GUIWindowManager.h"
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-22 10:23:54 +0000