Merge pull request #11355 from Memphiz/ios_dispresource_bp

[ios] - adapt to changes in IDispResource
xbmc · Jan 11, 2017 · 4d93228 · 4d93228
2 parents 413464b + 76bca63
commit 4d93228
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -29,13 +29,13 @@ class CVideoSyncIos : public CVideoSync, IDispResource
   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();