diff options
| author | Jonathan Marshall <jmarshall@never.you.mind> | 2011-07-29 10:13:20 +1200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@never.you.mind> | 2011-07-29 10:13:20 +1200 |
| commit | 29bfb97ebd1706804ec43ddd4b72957434e2690f (patch) | |
| tree | a0a104a5ae39a96b6a3b4944d6d1efcb9b419c59 /XBMC-ATV2.xcodeproj | |
| parent | bbf9ea510b8d2eea8be958d0bbe7917a98710113 (diff) | |
| parent | 87b682734e78ae67d714c49ddeb9f0182a51fd81 (diff) | |
Merge branch 'log_frame_times'
* log_frame_times:
make CApplication::FrameMove conditional to cleanup ProcessRenderLoop
Enable the timesmoother for frame times
Add CTimeSmoother class for smoothing timestamps
move update of frame time to immediately following flip, and pass in whether or not a flip occurred
No need to call Process() in OnDeinitWindow as ProcessRenderLoop(true) does this
Conflicts:
xbmc/Application.cpp
Diffstat (limited to 'XBMC-ATV2.xcodeproj')
| -rw-r--r-- | XBMC-ATV2.xcodeproj/project.pbxproj | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj index c9ef42412f..1406b54786 100644 --- a/XBMC-ATV2.xcodeproj/project.pbxproj +++ b/XBMC-ATV2.xcodeproj/project.pbxproj @@ -24,6 +24,7 @@ 7C89627013B702F3003631FE /* GUIWindowScreensaverDim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C89626E13B702F3003631FE /* GUIWindowScreensaverDim.cpp */; }; 7C99B73F133D372300FC2B16 /* CacheCircular.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B73D133D372300FC2B16 /* CacheCircular.cpp */; }; 7C99B7AA134072CD00FC2B16 /* GUIDialogPlayEject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B7A8134072CD00FC2B16 /* GUIDialogPlayEject.cpp */; }; + 7CEE2E6D13D6B7A8000ABF2A /* TimeSmoother.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CEE2E6B13D6B7A8000ABF2A /* TimeSmoother.cpp */; }; C807119F135DB842002F601B /* InputOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C807119D135DB842002F601B /* InputOperations.cpp */; }; C8EC5D51136954E400CCC10D /* XBMC_keytable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8EC5D4F136954E400CCC10D /* XBMC_keytable.cpp */; }; DF0DF16C13A3AF82008ED511 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF16813A3AF82008ED511 /* FileNFS.cpp */; }; @@ -957,6 +958,8 @@ 7C99B73E133D372300FC2B16 /* CacheCircular.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheCircular.h; sourceTree = "<group>"; }; 7C99B7A8134072CD00FC2B16 /* GUIDialogPlayEject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPlayEject.cpp; sourceTree = "<group>"; }; 7C99B7A9134072CD00FC2B16 /* GUIDialogPlayEject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPlayEject.h; sourceTree = "<group>"; }; + 7CEE2E6B13D6B7A8000ABF2A /* TimeSmoother.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimeSmoother.cpp; sourceTree = "<group>"; }; + 7CEE2E6C13D6B7A8000ABF2A /* TimeSmoother.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeSmoother.h; sourceTree = "<group>"; }; 8316267613B670FF004AED87 /* README.ios */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.ios; sourceTree = "<group>"; }; 8D576316048677EA00EA77CD /* XBMC.frappliance */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = XBMC.frappliance; sourceTree = BUILT_PRODUCTS_DIR; }; A192FD47135E46C800D92E9B /* IOSAudioRingBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOSAudioRingBuffer.h; path = AudioRenderers/IOSAudioRingBuffer.h; sourceTree = "<group>"; }; @@ -5149,6 +5152,8 @@ 18ECC9A913CF17EB00A9ED6C /* StreamUtils.h */, F56C7768131EC154000AD0F6 /* SystemInfo.cpp */, F56C7769131EC154000AD0F6 /* SystemInfo.h */, + 7CEE2E6B13D6B7A8000ABF2A /* TimeSmoother.cpp */, + 7CEE2E6C13D6B7A8000ABF2A /* TimeSmoother.h */, F56C776A131EC154000AD0F6 /* TimeUtils.cpp */, F56C776B131EC154000AD0F6 /* TimeUtils.h */, F56C776C131EC154000AD0F6 /* TuxBoxUtil.cpp */, @@ -6754,6 +6759,7 @@ F5CEE72C13D3F9AC00225F72 /* DVDOverlayCodecTX3G.cpp in Sources */, DFD4D22013D7286E00A47C47 /* Implementation.cpp in Sources */, DFD4D22213D7286E00A47C47 /* SystemClock.cpp in Sources */, + 7CEE2E6D13D6B7A8000ABF2A /* TimeSmoother.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; |