rename OnLostDevice, OnResetDevice

popcornmix · Sep 21, 2015 · 82d7b53 · 82d7b53
1 parent 61f55da
commit 82d7b53
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 22 deletions.
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
@@ -2721,7 +2721,7 @@ AEAudioFormat CActiveAE::GetCurrentSinkFormat()
   return m_stats.GetCurrentSinkFormat();
 }
 
-void CActiveAE::OnLostDevice()
+void CActiveAE::OnLostDisplay()
 {
   Message *reply;
   if (m_controlPort.SendOutMessageSync(CActiveAEControlProtocol::DISPLAYLOST,
@@ -2741,7 +2741,7 @@ void CActiveAE::OnLostDevice()
   }
 }
 
-void CActiveAE::OnResetDevice()
+void CActiveAE::OnResetDisplay()
 {
   m_controlPort.SendOutMessage(CActiveAEControlProtocol::DISPLAYRESET);
 }

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h
@@ -262,8 +262,8 @@ class CActiveAE : public IAE, private CThread
   virtual void RegisterAudioCallback(IAudioCallback* pCallback);
   virtual void UnregisterAudioCallback(IAudioCallback* pCallback);
 
-  virtual void OnLostDevice();
-  virtual void OnResetDevice();
+  virtual void OnLostDisplay();
+  virtual void OnResetDisplay();
   virtual void OnAppFocusChange(bool focus);
 
 protected:

diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp
@@ -679,7 +679,7 @@ void CDecoder::SetWidthHeight(int width, int height)
     CLog::Log(LOGDEBUG, "CVDPAU::SetWidthHeight Setting OutWidth: %i OutHeight: %i", m_vdpauConfig.outWidth, m_vdpauConfig.outHeight);
 }
 
-void CDecoder::OnLostDevice()
+void CDecoder::OnLostDisplay()
 {
   CLog::Log(LOGNOTICE,"CVDPAU::OnLostDevice event");
 
@@ -698,7 +698,7 @@ void CDecoder::OnLostDevice()
   g_graphicsContext.restore(count);
 }
 
-void CDecoder::OnResetDevice()
+void CDecoder::OnResetDisplay()
 {
   CLog::Log(LOGNOTICE,"CVDPAU::OnResetDevice event");
 

diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h
@@ -580,8 +580,8 @@ class CDecoder
                     const VdpPictureInfo *info, uint32_t buffers_used,
                     const VdpBitstreamBuffer *buffers);
 
-  virtual void OnLostDevice();
-  virtual void OnResetDevice();
+  virtual void OnLostDisplay();
+  virtual void OnResetDisplay();
 
 protected:
   void SetWidthHeight(int width, int height);

diff --git a/xbmc/guilib/DispResource.h b/xbmc/guilib/DispResource.h
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2005-2013 Team XBMC
+ *      Copyright (C) 2005-2015 Team XBMC
  *      http://xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -20,14 +20,12 @@
 
 #pragma once
 
-#if defined(HAS_GLX) || defined(HAS_EGL) || defined(TARGET_DARWIN)
 class IDispResource
 {
 public:
   virtual ~IDispResource() {};
-  virtual void OnLostDevice() {};
-  virtual void OnResetDevice() {};
+  virtual void OnLostDisplay() {};
+  virtual void OnResetDisplay() {};
   virtual void OnAppFocusChange(bool focus) {};
 };
 
-#endif
diff --git a/xbmc/video/videosync/VideoSyncDRM.cpp b/xbmc/video/videosync/VideoSyncDRM.cpp
@@ -165,7 +165,7 @@ void CVideoSyncDRM::EventHandler(int fd, unsigned int frame, unsigned int sec,
   info->videoSync->UpdateClock(vblanks, now);
 }
 
-void CVideoSyncDRM::OnResetDevice()
+void CVideoSyncDRM::OnResetDisplay()
 {
   m_abort = true;
 }

diff --git a/xbmc/video/videosync/VideoSyncDRM.h b/xbmc/video/videosync/VideoSyncDRM.h
@@ -31,7 +31,7 @@ class CVideoSyncDRM : public CVideoSync, IDispResource
   virtual void Run(volatile bool& stop);
   virtual void Cleanup();
   virtual float GetFps();
-  virtual void OnResetDevice();
+  virtual void OnResetDisplay();
   virtual void RefreshChanged();
 private:
   static void EventHandler(int fd, unsigned int frame, unsigned int sec, unsigned int usec, void *data);

diff --git a/xbmc/video/videosync/VideoSyncGLX.cpp b/xbmc/video/videosync/VideoSyncGLX.cpp
@@ -34,7 +34,7 @@
 
 Display* CVideoSyncGLX::m_Dpy = NULL;
 
-void CVideoSyncGLX::OnLostDevice()
+void CVideoSyncGLX::OnLostDisplay()
 {
   if (!m_displayLost)
   {
@@ -43,7 +43,7 @@ void CVideoSyncGLX::OnLostDevice()
   }
 }
 
-void CVideoSyncGLX::OnResetDevice()
+void CVideoSyncGLX::OnResetDisplay()
 {
   m_displayReset = true;
 }

diff --git a/xbmc/video/videosync/VideoSyncGLX.h b/xbmc/video/videosync/VideoSyncGLX.h
@@ -36,8 +36,8 @@ class CVideoSyncGLX : public CVideoSync, IDispResource
   virtual void Run(volatile bool& stop);
   virtual void Cleanup();
   virtual float GetFps();
-  virtual void OnLostDevice();
-  virtual void OnResetDevice();
+  virtual void OnLostDisplay();
+  virtual void OnResetDisplay();
 
 private:
   int  (*m_glXWaitVideoSyncSGI) (int, int, unsigned int*);

diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
@@ -616,7 +616,7 @@ void CWinSystemX11::OnLostDevice()
 
   { CSingleLock lock(m_resourceSection);
     for (std::vector<IDispResource *>::iterator i = m_resources.begin(); i != m_resources.end(); ++i)
-      (*i)->OnLostDevice();
+      (*i)->OnLostDisplay();
   }
 
   CWinEventsX11Imp::SetXRRFailSafeTimer(3000);

diff --git a/xbmc/windowing/X11/WinSystemX11GLContext.cpp b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
@@ -82,7 +82,7 @@ bool CWinSystemX11GLContext::SetWindow(int width, int height, bool fullscreen, c
     CSingleLock lock(m_resourceSection);
     // tell any shared resources
     for (std::vector<IDispResource *>::iterator i = m_resources.begin(); i != m_resources.end(); ++i)
-      (*i)->OnResetDevice();
+      (*i)->OnResetDisplay();
   }
   return true;
 }

diff --git a/xbmc/windowing/egl/WinSystemEGL.cpp b/xbmc/windowing/egl/WinSystemEGL.cpp
@@ -307,7 +307,7 @@ bool CWinSystemEGL::CreateNewWindow(const std::string& name, bool fullScreen, RE
   CSingleLock lock(m_resourceSection);
   // tell any shared resources
   for (std::vector<IDispResource *>::iterator i = m_resources.begin(); i != m_resources.end(); ++i)
-    (*i)->OnResetDevice();
+    (*i)->OnResetDisplay();
 
   return true;
 }