Merge pull request #441 from popcornmix/windowing

rbp: kill g_Windowing
xbmc · Nov 24, 2017 · 285fff2 · 285fff2
2 parents 3090144 + 3b175d1
commit 285fff2
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 20 deletions.
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
@@ -31,7 +31,6 @@
 #include "ServiceBroker.h"
 #include "DVDClock.h"
 #include "DVDStreamInfo.h"
-#include "windowing/WindowingFactory.h"
 #include "cores/VideoPlayer/DVDCodecs/DVDCodecs.h"
 #include "cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h"
 #include "DVDVideoCodec.h"

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
@@ -34,7 +34,6 @@
 #include "threads/SingleLock.h"
 #include "utils/log.h"
 #include "utils/MathUtils.h"
-#include "windowing/WindowingFactory.h"
 #include "cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h"
 #include "cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.h"
 #include "xbmc/Application.h"

diff --git a/xbmc/cores/omxplayer/OMXImage.cpp b/xbmc/cores/omxplayer/OMXImage.cpp
@@ -32,7 +32,8 @@
 #include "settings/Settings.h"
 #include "linux/RBP.h"
 #include "utils/URIUtils.h"
-#include "windowing/WindowingFactory.h"
+#include "windowing/WinSystem.h"
+#include "windowing/rpi/WinSystemRpiGLESContext.h"
 #include "Application.h"
 #include <algorithm>
 #include <cassert>
@@ -223,7 +224,8 @@ bool COMXImage::SendMessage(bool (*callback)(EGLDisplay egl_display, EGLContext
   // we can only call gl functions from the application thread or texture thread
   if ( g_application.IsCurrentThread() )
   {
-    return callback(g_Windowing.GetEGLDisplay(), GetEGLContext(), cookie);
+    CWinSystemRpiGLESContext &winsystem = static_cast<CWinSystemRpiGLESContext &>(CServiceBroker::GetWinSystem());
+    return callback(winsystem.GetEGLDisplay(), GetEGLContext(), cookie);
   }
   struct callbackinfo mess;
   mess.callback = callback;
@@ -335,8 +337,9 @@ bool COMXImage::DecodeJpegToTexture(COMXImageFile *file, unsigned int width, uns
 EGLContext COMXImage::GetEGLContext()
 {
   CSingleLock lock(m_texqueue_lock);
+  CWinSystemRpiGLESContext &winsystem = static_cast<CWinSystemRpiGLESContext &>(CServiceBroker::GetWinSystem());
   if (g_application.IsCurrentThread())
-    return g_Windowing.GetEGLContext();
+    return winsystem.GetEGLContext();
   if (m_egl_context == EGL_NO_CONTEXT)
     CreateContext();
   return m_egl_context;
@@ -386,7 +389,8 @@ void COMXImage::CreateContext()
 {
   EGLConfig egl_config;
   GLint m_result;
-  EGLDisplay egl_display = g_Windowing.GetEGLDisplay();
+  CWinSystemRpiGLESContext &winsystem = static_cast<CWinSystemRpiGLESContext &>(CServiceBroker::GetWinSystem());
+  EGLDisplay egl_display = winsystem.GetEGLDisplay();
 
   eglInitialize(egl_display, NULL, NULL);
   CheckError();
@@ -413,7 +417,7 @@ void COMXImage::CreateContext()
     CLog::Log(LOGERROR, "%s: Could not find a compatible configuration",__FUNCTION__);
     return;
   }
-  m_egl_context = eglCreateContext(egl_display, egl_config, g_Windowing.GetEGLContext(), contextAttrs);
+  m_egl_context = eglCreateContext(egl_display, egl_config, winsystem.GetEGLContext(), contextAttrs);
   CheckError();
   if (m_egl_context == EGL_NO_CONTEXT)
   {
@@ -451,7 +455,8 @@ void COMXImage::Process()
       m_texqueue.pop();
       lock.Leave();
 
-      mess->result = mess->callback(g_Windowing.GetEGLDisplay(), GetEGLContext(), mess->cookie);
+      CWinSystemRpiGLESContext &winsystem = static_cast<CWinSystemRpiGLESContext &>(CServiceBroker::GetWinSystem());
+      mess->result = mess->callback(winsystem.GetEGLDisplay(), GetEGLContext(), mess->cookie);
       {
         CSingleLock lock(m_texqueue_lock);
         mess->sync.Set();
@@ -1982,7 +1987,8 @@ void COMXTexture::Close()
 
 bool COMXTexture::HandlePortSettingChange(unsigned int resize_width, unsigned int resize_height, void *egl_image, bool port_settings_changed)
 {
-  EGLDisplay egl_display = g_Windowing.GetEGLDisplay();
+  CWinSystemRpiGLESContext &winsystem = static_cast<CWinSystemRpiGLESContext &>(CServiceBroker::GetWinSystem());
+  EGLDisplay egl_display = winsystem.GetEGLDisplay();
   OMX_ERRORTYPE omx_err;
 
   if (port_settings_changed)

diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
@@ -34,7 +34,6 @@
 
 #include "DVDDemuxers/DVDDemuxUtils.h"
 #include "DVDCodecs/DVDCodecUtils.h"
-#include "windowing/WindowingFactory.h"
 #include "settings/DisplaySettings.h"
 #include "settings/Settings.h"
 #include "settings/MediaSettings.h"

diff --git a/xbmc/guilib/TexturePi.cpp b/xbmc/guilib/TexturePi.cpp
@@ -20,7 +20,6 @@
 
 #include "system.h"
 #include "Texture.h"
-#include "windowing/WindowingFactory.h"
 #include "utils/log.h"
 #include "utils/GLUtils.h"
 #include "guilib/TextureManager.h"

diff --git a/xbmc/windowing/rpi/VideoSyncPi.cpp b/xbmc/windowing/rpi/VideoSyncPi.cpp
@@ -21,8 +21,9 @@
 #include "system.h"
 
 #include "VideoSyncPi.h"
+#include "ServiceBroker.h"
 #include "guilib/GraphicContext.h"
-#include "windowing/WindowingFactory.h"
+#include "windowing/WinSystem.h"
 #include "utils/TimeUtils.h"
 #include "utils/log.h"
 #include "linux/RBP.h"
@@ -32,7 +33,7 @@ bool CVideoSyncPi::Setup(PUPDATECLOCK func)
 {
   UpdateClock = func;
   m_abort = false;
-  g_Windowing.Register(this);
+  CServiceBroker::GetWinSystem().Register(this);
   CLog::Log(LOGDEBUG, "CVideoReferenceClock: setting up RPi");
   return true;
 }
@@ -53,7 +54,7 @@ void CVideoSyncPi::Run(CEvent& stopEvent)
 void CVideoSyncPi::Cleanup()
 {
   CLog::Log(LOGDEBUG, "CVideoReferenceClock: cleaning up RPi");
-  g_Windowing.Unregister(this);
+  CServiceBroker::GetWinSystem().Unregister(this);
 }
 
 float CVideoSyncPi::GetFps()

diff --git a/xbmc/windowing/rpi/WinSystemRpi.cpp b/xbmc/windowing/rpi/WinSystemRpi.cpp
@@ -39,8 +39,6 @@
 
 CWinSystemRpi::CWinSystemRpi()
 {
-  m_eWindowSystem = WINDOW_SYSTEM_RPI;
-
   m_nativeDisplay = EGL_NO_DISPLAY;
   m_nativeWindow = EGL_NO_SURFACE;
 

diff --git a/xbmc/windowing/rpi/WinSystemRpiGLESContext.cpp b/xbmc/windowing/rpi/WinSystemRpiGLESContext.cpp
@@ -34,6 +34,13 @@
 
 using namespace KODI;
 
+
+std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
+{
+  std::unique_ptr<CWinSystemBase> winSystem(new CWinSystemRpiGLESContext());
+  return winSystem;
+}
+
 bool CWinSystemRpiGLESContext::InitWindowSystem()
 {
   if (!CWinSystemRpi::InitWindowSystem())

diff --git a/xbmc/windowing/rpi/WinSystemRpiGLESContext.h b/xbmc/windowing/rpi/WinSystemRpiGLESContext.h
@@ -22,7 +22,6 @@
 
 #include "GLContextEGL.h"
 #include "rendering/gles/RenderSystemGLES.h"
-#include "utils/GlobalsHandling.h"
 #include "WinSystemRpi.h"
 
 class CWinSystemRpiGLESContext : public CWinSystemRpi, public CRenderSystemGLES
@@ -53,6 +52,3 @@ class CWinSystemRpiGLESContext : public CWinSystemRpi, public CRenderSystemGLES
   CGLContextEGL m_pGLContext;
 
 };
-
-XBMC_GLOBAL_REF(CWinSystemRpiGLESContext, g_Windowing);
-#define g_Windowing XBMC_GLOBAL_USE(CWinSystemRpiGLESContext)