diff options
author | Martijn Kaijser <martijn@xbmc.org> | 2017-01-11 20:51:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-11 20:51:26 +0100 |
commit | 4d93228e19afa928d08327da6d414e999d7273d6 (patch) | |
tree | 4c0684384924a941205a7e4508153dec258a3ea8 | |
parent | 413464bd0c77ecf68dec05c941363be1ab02f37f (diff) | |
parent | 76bca63ea530f9efb3dd21bc7cf5b5836b7f1c64 (diff) |
Merge pull request #11355 from Memphiz/ios_dispresource_bp17.0rc3-Krypton
[ios] - adapt to changes in IDispResource
-rw-r--r-- | xbmc/video/videosync/VideoSyncIos.cpp | 2 | ||||
-rw-r--r-- | xbmc/video/videosync/VideoSyncIos.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xbmc/video/videosync/VideoSyncIos.cpp b/xbmc/video/videosync/VideoSyncIos.cpp index 8dcefdb82d..026dd7ed91 100644 --- a/xbmc/video/videosync/VideoSyncIos.cpp +++ b/xbmc/video/videosync/VideoSyncIos.cpp @@ -70,7 +70,7 @@ float CVideoSyncIos::GetFps() return m_fps; } -void CVideoSyncIos::OnResetDevice() +void CVideoSyncIos::OnResetDisplay() { m_abort = true; } diff --git a/xbmc/video/videosync/VideoSyncIos.h b/xbmc/video/videosync/VideoSyncIos.h index a31590f6d8..bf336b80dd 100644 --- a/xbmc/video/videosync/VideoSyncIos.h +++ b/xbmc/video/videosync/VideoSyncIos.h @@ -29,13 +29,13 @@ public: CVideoSyncIos(CVideoReferenceClock *clock) : CVideoSync(clock), m_LastVBlankTime(0), m_abort(false){} // CVideoSync interface - virtual bool Setup(PUPDATECLOCK func); - virtual void Run(std::atomic<bool>& stop); - virtual void Cleanup(); - virtual float GetFps(); + virtual bool Setup(PUPDATECLOCK func) override; + virtual void Run(std::atomic<bool>& stop) override; + virtual void Cleanup() override; + virtual float GetFps() override; // IDispResource interface - virtual void OnResetDevice(); + virtual void OnResetDisplay() override; // used in the displaylink callback void IosVblankHandler(); |