Merge pull request #13553 from garbear/rp-guicode

RetroPlayer: Move and document GUI code

32 files changed, 142 insertions, 38 deletions

diff --git a/cmake/treedata/common/retroplayer.txt b/cmake/treedata/common/retroplayer.txt
index 97e27b322d..0239801890 100644
--- a/cmake/treedata/common/retroplayer.txt
+++ b/cmake/treedata/common/retroplayer.txt
@@ -1,7 +1,8 @@
 xbmc/cores/RetroPlayer                                          cores/RetroPlayer
+xbmc/cores/RetroPlayer/guibridge                                cores/RetroPlayer/guibridge
 xbmc/cores/RetroPlayer/guicontrols                              cores/RetroPlayer/guicontrols
+xbmc/cores/RetroPlayer/guiwindows                               cores/RetroPlayer/guiwindows
 xbmc/cores/RetroPlayer/process                                  cores/RetroPlayer/process
 xbmc/cores/RetroPlayer/rendering                                cores/RetroPlayer/rendering
 xbmc/cores/RetroPlayer/rendering/VideoRenderers                 cores/RetroPlayer/rendering/VideoRenderers
 xbmc/cores/RetroPlayer/rendering/VideoShaders                   cores/RetroPlayer/rendering/VideoShaders
-xbmc/cores/RetroPlayer/windows                                  cores/RetroPlayer/windows
diff --git a/xbmc/ServiceManager.cpp b/xbmc/ServiceManager.cpp
index 92e010aad8..257d4c05f9 100644
--- a/xbmc/ServiceManager.cpp
+++ b/xbmc/ServiceManager.cpp
@@ -26,7 +26,7 @@
 #include "cores/AudioEngine/Engines/ActiveAE/ActiveAE.h"
 #include "cores/DataCacheCore.h"
 #include "cores/playercorefactory/PlayerCoreFactory.h"
-#include "cores/RetroPlayer/rendering/GUIGameRenderManager.h"
+#include "cores/RetroPlayer/guibridge/GUIGameRenderManager.h"
 #include "favourites/FavouritesService.h"
 #include "games/controllers/ControllerManager.h"
 #include "games/GameServices.h"
diff --git a/xbmc/cores/RetroPlayer/RetroPlayer.cpp b/xbmc/cores/RetroPlayer/RetroPlayer.cpp
index 0cea5e4af9..d75b0366fc 100644
--- a/xbmc/cores/RetroPlayer/RetroPlayer.cpp
+++ b/xbmc/cores/RetroPlayer/RetroPlayer.cpp
@@ -25,8 +25,8 @@
 #include "RetroPlayerVideo.h"
 #include "addons/AddonManager.h"
 #include "cores/DataCacheCore.h"
+#include "cores/RetroPlayer/guibridge/GUIGameRenderManager.h"
 #include "cores/RetroPlayer/process/RPProcessInfo.h"
-#include "cores/RetroPlayer/rendering/GUIGameRenderManager.h"
 #include "cores/RetroPlayer/rendering/RPRenderManager.h"
 #include "dialogs/GUIDialogYesNo.h"
 #include "filesystem/File.h"
diff --git a/xbmc/cores/RetroPlayer/guibridge/CMakeLists.txt b/xbmc/cores/RetroPlayer/guibridge/CMakeLists.txt
new file mode 100644
index 0000000000..6a2c808db2
--- /dev/null
+++ b/xbmc/cores/RetroPlayer/guibridge/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(SOURCES GUIGameRenderManager.cpp
+            GUIGameSettings.cpp
+            GUIGameVideoHandle.cpp
+            GUIRenderHandle.cpp
+            GUIRenderTarget.cpp
+            GUIRenderTargetFactory.cpp
+)
+
+set(HEADERS GUIGameRenderManager.h
+            GUIGameSettings.h
+            GUIGameVideoHandle.h
+            GUIRenderHandle.h
+            GUIRenderTarget.h
+            GUIRenderTargetFactory.h
+            IGUIRenderSettings.h
+            IRenderCallback.h
+)
+
+core_add_library(retroplayer_guibridge)
diff --git a/xbmc/cores/RetroPlayer/rendering/GUIGameRenderManager.cpp b/xbmc/cores/RetroPlayer/guibridge/GUIGameRenderManager.cpp
index 09203f7ec2..1a833c9416 100644
--- a/xbmc/cores/RetroPlayer/rendering/GUIGameRenderManager.cpp
+++ b/xbmc/cores/RetroPlayer/guibridge/GUIGameRenderManager.cpp
@@ -33,12 +33,14 @@ CGUIGameRenderManager::~CGUIGameRenderManager() = default;
 
 void CGUIGameRenderManager::RegisterPlayer(CGUIRenderTargetFactory *factory, IRenderCallback *callback)
 {
+  // Set factory
   {
     CSingleLock lock(m_targetMutex);
     m_factory = factory;
     UpdateRenderTargets();
   }
 
+  // Set callback
   {
     CSingleLock lock(m_callbackMutex);
     m_callback = callback;
@@ -47,11 +49,13 @@ void CGUIGameRenderManager::RegisterPlayer(CGUIRenderTargetFactory *factory, IRe
 
 void CGUIGameRenderManager::UnregisterPlayer()
 {
+  // Reset callback
   {
     CSingleLock lock(m_callbackMutex);
     m_callback = nullptr;
   }
 
+  // Reset factory
   {
     CSingleLock lock(m_targetMutex);
     m_factory = nullptr;
@@ -63,6 +67,7 @@ std::shared_ptr<CGUIRenderHandle> CGUIGameRenderManager::RegisterControl(CGUIGam
 {
   CSingleLock lock(m_targetMutex);
 
+  // Create handle for game control
   std::shared_ptr<CGUIRenderHandle> renderHandle(new CGUIRenderControlHandle(*this, control));
 
   std::shared_ptr<CGUIRenderTarget> renderTarget;
@@ -78,6 +83,7 @@ std::shared_ptr<CGUIRenderHandle> CGUIGameRenderManager::RegisterWindow(CGameWin
 {
   CSingleLock lock(m_targetMutex);
 
+  // Create handle for game window
   std::shared_ptr<CGUIRenderHandle> renderHandle(new CGUIRenderFullScreenHandle(*this, window));
 
   std::shared_ptr<CGUIRenderTarget> renderTarget;
diff --git a/xbmc/cores/RetroPlayer/rendering/GUIGameRenderManager.h b/xbmc/cores/RetroPlayer/guibridge/GUIGameRenderManager.h
index 1596e70ed4..30e1a388d6 100644
--- a/xbmc/cores/RetroPlayer/rendering/GUIGameRenderManager.h
+++ b/xbmc/cores/RetroPlayer/guibridge/GUIGameRenderManager.h
@@ -42,6 +42,33 @@ namespace RETRO
   class CGUIRenderTarget;
   class IRenderCallback;
 
+  /*!
+   * \brief Class to safely route commands between the GUI and RetroPlayer
+   *
+   * This class is brought up before the GUI and player core factory. It
+   * provides the GUI with safe access to a registered player.
+   *
+   * Access to the player is done through handles. When a handle is no
+   * longer needed, it should be destroyed.
+   *
+   * Two kinds of handles are provided:
+   *
+   *   - CGUIRenderHandle
+   *         Allows the holder to invoke render events
+   *
+   *   - CGUIGameVideoHandle
+   *         Allows the holder to query video properties, such as the filter
+   *         or view mode.
+   *
+   * Each manager fulfills the following design requirements:
+   *
+   *   1. No assumption of player lifetimes
+   *
+   *   2. No assumption of GUI element lifetimes, as long as handles are
+   *      destroyed before this class is destructed
+   *
+   *   3. No limit on the number of handles
+   */
   class CGUIGameRenderManager
   {
     friend class CGUIGameVideoHandle;
@@ -51,11 +78,45 @@ namespace RETRO
     CGUIGameRenderManager() = default;
     ~CGUIGameRenderManager();
 
+    /*!
+     * \brief Register a RetroPlayer instance
+     *
+     * \param factory The interface for creating render targets exposed to the GUI
+     * \param callback The interface for querying video properties
+     */
     void RegisterPlayer(CGUIRenderTargetFactory *factory, IRenderCallback *callback);
+
+    /*!
+     * \brief Unregister a RetroPlayer instance
+     */
     void UnregisterPlayer();
 
+    /*!
+     * \brief Register a GUI game control ("gamewindow" skin control)
+     *
+     * \param control The game control
+     *
+     * \return A handle to invoke render events
+     */
     std::shared_ptr<CGUIRenderHandle> RegisterControl(CGUIGameControl &control);
+
+    /*!
+     * \brief Register a fullscreen game window ("FullscreenGame" window)
+     *
+     * \param window The game window
+     *
+     * \return A handle to invoke render events
+     */
     std::shared_ptr<CGUIRenderHandle> RegisterWindow(CGameWindowFullScreen &window);
+
+    /*!
+     * \brief Register a video select dialog (for selecting video filters,
+     *        view modes, etc.)
+     *
+     * \param dialog The video select dialog
+     *
+     * \return A handle to query game and video properties
+     */
     std::shared_ptr<CGUIGameVideoHandle> RegisterDialog(GAME::CDialogGameVideoSelect &dialog);
 
   protected:
@@ -73,14 +134,27 @@ namespace RETRO
     bool SupportsScalingMethod(ESCALINGMETHOD method);
 
   private:
+    /*!
+     * \brief Helper function to create or destroy render targets when a
+     *        factory is registered/unregistered
+     */
     void UpdateRenderTargets();
 
+    /*!
+     * \brief Helper function to create a render target
+     *
+     * \param handle The handle given to the registered GUI element
+     *
+     * \return A target to receive rendering commands
+     */
     CGUIRenderTarget *CreateRenderTarget(CGUIRenderHandle *handle);
 
+    // Render events
     CGUIRenderTargetFactory *m_factory = nullptr;
     std::map<CGUIRenderHandle*, std::shared_ptr<CGUIRenderTarget>> m_renderTargets;
     CCriticalSection m_targetMutex;
 
+    // Video properties
     IRenderCallback *m_callback = nullptr;
     CCriticalSection m_callbackMutex;
   };
diff --git a/xbmc/cores/RetroPlayer/rendering/GUIGameSettings.cpp b/xbmc/cores/RetroPlayer/guibridge/GUIGameSettings.cpp
index 58266afb08..58266afb08 100644
--- a/xbmc/cores/RetroPlayer/rendering/GUIGameSettings.cpp
+++ b/xbmc/cores/RetroPlayer/guibridge/GUIGameSettings.cpp
diff --git a/xbmc/cores/RetroPlayer/rendering/GUIGameSettings.h b/xbmc/cores/RetroPlayer/guibridge/GUIGameSettings.h
index 4541469f7b..6187d91062 100644
--- a/xbmc/cores/RetroPlayer/rendering/GUIGameSettings.h
+++ b/xbmc/cores/RetroPlayer/guibridge/GUIGameSettings.h
@@ -20,7 +20,7 @@
 #pragma once
 
 #include "IGUIRenderSettings.h"
-#include "RenderSettings.h"
+#include "cores/RetroPlayer/rendering/RenderSettings.h"
 #include "threads/CriticalSection.h"
 #include "utils/Observer.h"
 
diff --git a/xbmc/cores/RetroPlayer/rendering/GUIGameVideoHandle.cpp b/xbmc/cores/RetroPlayer/guibridge/GUIGameVideoHandle.cpp
index e1875ec726..e1875ec726 100644
--- a/xbmc/cores/RetroPlayer/rendering/GUIGameVideoHandle.cpp
+++ b/xbmc/cores/RetroPlayer/guibridge/GUIGameVideoHandle.cpp
diff --git a/xbmc/cores/RetroPlayer/rendering/GUIGameVideoHandle.h b/xbmc/cores/RetroPlayer/guibridge/GUIGameVideoHandle.h
index afa78febc8..afa78febc8 100644
--- a/xbmc/cores/RetroPlayer/rendering/GUIGameVideoHandle.h
+++ b/xbmc/cores/RetroPlayer/guibridge/GUIGameVideoHandle.h
diff --git a/xbmc/cores/RetroPlayer/rendering/GUIRenderHandle.cpp b/xbmc/cores/RetroPlayer/guibridge/GUIRenderHandle.cpp
index bb2c877fa8..bb2c877fa8 100644
--- a/xbmc/cores/RetroPlayer/rendering/GUIRenderHandle.cpp
+++ b/xbmc/cores/RetroPlayer/guibridge/GUIRenderHandle.cpp
diff --git a/xbmc/cores/RetroPlayer/rendering/GUIRenderHandle.h b/xbmc/cores/RetroPlayer/guibridge/GUIRenderHandle.h
index ce9da081a6..ce9da081a6 100644
--- a/xbmc/cores/RetroPlayer/rendering/GUIRenderHandle.h
+++ b/xbmc/cores/RetroPlayer/guibridge/GUIRenderHandle.h
diff --git a/xbmc/cores/RetroPlayer/rendering/GUIRenderTarget.cpp b/xbmc/cores/RetroPlayer/guibridge/GUIRenderTarget.cpp
index 5add8e4390..b783e9554b 100644
--- a/xbmc/cores/RetroPlayer/rendering/GUIRenderTarget.cpp
+++ b/xbmc/cores/RetroPlayer/guibridge/GUIRenderTarget.cpp
@@ -19,9 +19,9 @@
  */
 
 #include "GUIRenderTarget.h"
-#include "IRenderManager.h"
 #include "cores/RetroPlayer/guicontrols/GUIGameControl.h"
-#include "cores/RetroPlayer/windows/GameWindowFullScreen.h"
+#include "cores/RetroPlayer/guiwindows/GameWindowFullScreen.h"
+#include "cores/RetroPlayer/rendering/IRenderManager.h"
 
 using namespace KODI;
 using namespace RETRO;
diff --git a/xbmc/cores/RetroPlayer/rendering/GUIRenderTarget.h b/xbmc/cores/RetroPlayer/guibridge/GUIRenderTarget.h
index c2367e41e9..4f1c5ed66b 100644
--- a/xbmc/cores/RetroPlayer/rendering/GUIRenderTarget.h
+++ b/xbmc/cores/RetroPlayer/guibridge/GUIRenderTarget.h
@@ -29,6 +29,12 @@ namespace RETRO
 
   // --- CGUIRenderTarget ------------------------------------------------------
 
+  /*!
+   * \brief A target of rendering commands
+   *
+   * This class abstracts the destination of rendering commands. As a result,
+   * controls and windows are given a unified API.
+   */
   class CGUIRenderTarget
   {
   public:
@@ -36,12 +42,24 @@ namespace RETRO
 
     virtual ~CGUIRenderTarget() = default;
 
+    /*!
+     * \brief Draw the frame to the rendering area
+     */
     virtual void Render() = 0;
 
+    /*!
+     * \brief Draw the frame to the rendering area differently somehow
+     */
     virtual void RenderEx() = 0;
 
+    /*!
+     * \brief Clear the background of the rendering area
+     */
     virtual void ClearBackground() { } //! @todo
 
+    /*!
+     * \brief Check of the rendering area is dirty
+     */
     virtual bool IsDirty() { return true; } //! @todo
 
   protected:
diff --git a/xbmc/cores/RetroPlayer/rendering/GUIRenderTargetFactory.cpp b/xbmc/cores/RetroPlayer/guibridge/GUIRenderTargetFactory.cpp
index d852d14e21..d852d14e21 100644
--- a/xbmc/cores/RetroPlayer/rendering/GUIRenderTargetFactory.cpp
+++ b/xbmc/cores/RetroPlayer/guibridge/GUIRenderTargetFactory.cpp
diff --git a/xbmc/cores/RetroPlayer/rendering/GUIRenderTargetFactory.h b/xbmc/cores/RetroPlayer/guibridge/GUIRenderTargetFactory.h
index e5511b12b5..e5511b12b5 100644
--- a/xbmc/cores/RetroPlayer/rendering/GUIRenderTargetFactory.h
+++ b/xbmc/cores/RetroPlayer/guibridge/GUIRenderTargetFactory.h
diff --git a/xbmc/cores/RetroPlayer/rendering/IGUIRenderSettings.h b/xbmc/cores/RetroPlayer/guibridge/IGUIRenderSettings.h
index 19fb91ac49..c5df2726ee 100644
--- a/xbmc/cores/RetroPlayer/rendering/IGUIRenderSettings.h
+++ b/xbmc/cores/RetroPlayer/guibridge/IGUIRenderSettings.h
@@ -19,7 +19,7 @@
  */
 #pragma once
 
-#include "RenderSettings.h"
+#include "cores/RetroPlayer/rendering/RenderSettings.h"
 
 namespace KODI
 {
diff --git a/xbmc/cores/RetroPlayer/rendering/IRenderCallback.h b/xbmc/cores/RetroPlayer/guibridge/IRenderCallback.h
index bddb00192f..bddb00192f 100644
--- a/xbmc/cores/RetroPlayer/rendering/IRenderCallback.h
+++ b/xbmc/cores/RetroPlayer/guibridge/IRenderCallback.h
diff --git a/xbmc/cores/RetroPlayer/guicontrols/GUIGameControl.cpp b/xbmc/cores/RetroPlayer/guicontrols/GUIGameControl.cpp
index 7a4e08c041..bd33a32250 100644
--- a/xbmc/cores/RetroPlayer/guicontrols/GUIGameControl.cpp
+++ b/xbmc/cores/RetroPlayer/guicontrols/GUIGameControl.cpp
@@ -20,8 +20,8 @@
 
 #include "GUIGameControl.h"
 #include "GUIRenderSettings.h"
-#include "cores/RetroPlayer/rendering/GUIGameRenderManager.h"
-#include "cores/RetroPlayer/rendering/GUIRenderHandle.h"
+#include "cores/RetroPlayer/guibridge/GUIGameRenderManager.h"
+#include "cores/RetroPlayer/guibridge/GUIRenderHandle.h"
 #include "cores/RetroPlayer/rendering/RenderGeometry.h"
 #include "cores/RetroPlayer/rendering/RenderSettings.h"
 #include "cores/RetroPlayer/rendering/RenderVideoSettings.h"
diff --git a/xbmc/cores/RetroPlayer/guicontrols/GUIRenderSettings.h b/xbmc/cores/RetroPlayer/guicontrols/GUIRenderSettings.h
index ca3292abde..52940e0aab 100644
--- a/xbmc/cores/RetroPlayer/guicontrols/GUIRenderSettings.h
+++ b/xbmc/cores/RetroPlayer/guicontrols/GUIRenderSettings.h
@@ -19,7 +19,7 @@
  */
 #pragma once
 
-#include "cores/RetroPlayer/rendering/IGUIRenderSettings.h"
+#include "cores/RetroPlayer/guibridge/IGUIRenderSettings.h"
 #include "cores/RetroPlayer/rendering/RenderGeometry.h"
 #include "cores/RetroPlayer/rendering/RenderSettings.h"
 #include "cores/IPlayer.h"
diff --git a/xbmc/cores/RetroPlayer/windows/CMakeLists.txt b/xbmc/cores/RetroPlayer/guiwindows/CMakeLists.txt
index 9c0c6cce18..aaa05a20ea 100644
--- a/xbmc/cores/RetroPlayer/windows/CMakeLists.txt
+++ b/xbmc/cores/RetroPlayer/guiwindows/CMakeLists.txt
@@ -6,4 +6,4 @@ set(HEADERS GameWindowFullScreen.h
             GameWindowFullScreenText.h
 )
 
-core_add_library(retroplayer_windows)
+core_add_library(retroplayer_guiwindows)
diff --git a/xbmc/cores/RetroPlayer/windows/GameWindowFullScreen.cpp b/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreen.cpp
index d9eba1a9a9..6e94c993ad 100644
--- a/xbmc/cores/RetroPlayer/windows/GameWindowFullScreen.cpp
+++ b/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreen.cpp
@@ -20,8 +20,8 @@
 
 #include "GameWindowFullScreen.h"
 #include "GameWindowFullScreenText.h"
-#include "cores/RetroPlayer/rendering/GUIGameRenderManager.h"
-#include "cores/RetroPlayer/rendering/GUIRenderHandle.h"
+#include "cores/RetroPlayer/guibridge/GUIGameRenderManager.h"
+#include "cores/RetroPlayer/guibridge/GUIRenderHandle.h"
 #include "guilib/GraphicContext.h" //! @todo Remove me
 #include "guilib/GUIDialog.h"
 #include "guilib/GUIControl.h"
diff --git a/xbmc/cores/RetroPlayer/windows/GameWindowFullScreen.h b/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreen.h
index e6751a24cd..e6751a24cd 100644
--- a/xbmc/cores/RetroPlayer/windows/GameWindowFullScreen.h
+++ b/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreen.h
diff --git a/xbmc/cores/RetroPlayer/windows/GameWindowFullScreenText.cpp b/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreenText.cpp
index 639ac3563c..639ac3563c 100644
--- a/xbmc/cores/RetroPlayer/windows/GameWindowFullScreenText.cpp
+++ b/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreenText.cpp
diff --git a/xbmc/cores/RetroPlayer/windows/GameWindowFullScreenText.h b/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreenText.h
index 29ca192c22..29ca192c22 100644
--- a/xbmc/cores/RetroPlayer/windows/GameWindowFullScreenText.h
+++ b/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreenText.h
diff --git a/xbmc/cores/RetroPlayer/rendering/CMakeLists.txt b/xbmc/cores/RetroPlayer/rendering/CMakeLists.txt
index 6c743b60cd..2c00e2d67b 100644
--- a/xbmc/cores/RetroPlayer/rendering/CMakeLists.txt
+++ b/xbmc/cores/RetroPlayer/rendering/CMakeLists.txt
@@ -1,10 +1,4 @@
-set(SOURCES GUIGameRenderManager.cpp
-            GUIGameSettings.cpp
-            GUIGameVideoHandle.cpp
-            GUIRenderHandle.cpp
-            GUIRenderTarget.cpp
-            GUIRenderTargetFactory.cpp
-            RenderContext.cpp
+set(SOURCES RenderContext.cpp
             RenderGeometry.cpp
             RenderSettings.cpp
             RenderTranslator.cpp
@@ -12,15 +6,7 @@ set(SOURCES GUIGameRenderManager.cpp
             RPRenderManager.cpp
 )
 
-set(HEADERS GUIGameRenderManager.h
-            GUIGameSettings.h
-            GUIGameVideoHandle.h
-            GUIRenderHandle.h
-            GUIRenderTarget.h
-            GUIRenderTargetFactory.h
-            IGUIRenderSettings.h
-            IRenderCallback.h
-            IRenderManager.h
+set(HEADERS IRenderManager.h
             RenderContext.h
             RenderGeometry.h
             RenderSettings.h
diff --git a/xbmc/cores/RetroPlayer/rendering/RPRenderManager.cpp b/xbmc/cores/RetroPlayer/rendering/RPRenderManager.cpp
index 755f7ed353..a3b1170f69 100644
--- a/xbmc/cores/RetroPlayer/rendering/RPRenderManager.cpp
+++ b/xbmc/cores/RetroPlayer/rendering/RPRenderManager.cpp
@@ -19,12 +19,12 @@
  */
 
 #include "RPRenderManager.h"
-#include "GUIGameSettings.h"
-#include "GUIRenderTargetFactory.h"
-#include "IGUIRenderSettings.h"
 #include "RenderContext.h"
 #include "RenderSettings.h"
 #include "RenderTranslator.h"
+#include "cores/RetroPlayer/guibridge/GUIGameSettings.h"
+#include "cores/RetroPlayer/guibridge/GUIRenderTargetFactory.h"
+#include "cores/RetroPlayer/guibridge/IGUIRenderSettings.h"
 #include "cores/RetroPlayer/process/IRenderBuffer.h"
 #include "cores/RetroPlayer/process/IRenderBufferPool.h"
 #include "cores/RetroPlayer/process/RenderBufferManager.h"
diff --git a/xbmc/cores/RetroPlayer/rendering/RPRenderManager.h b/xbmc/cores/RetroPlayer/rendering/RPRenderManager.h
index f1308c2ef3..8031ed940f 100644
--- a/xbmc/cores/RetroPlayer/rendering/RPRenderManager.h
+++ b/xbmc/cores/RetroPlayer/rendering/RPRenderManager.h
@@ -19,9 +19,9 @@
  */
 #pragma once
 
-#include "IRenderCallback.h"
 #include "IRenderManager.h"
 #include "RenderVideoSettings.h"
+#include "cores/RetroPlayer/guibridge/IRenderCallback.h"
 #include "threads/CriticalSection.h"
 
 extern "C" {
diff --git a/xbmc/games/dialogs/osd/DialogGameVideoFilter.cpp b/xbmc/games/dialogs/osd/DialogGameVideoFilter.cpp
index e0f3584047..444c8e62eb 100644
--- a/xbmc/games/dialogs/osd/DialogGameVideoFilter.cpp
+++ b/xbmc/games/dialogs/osd/DialogGameVideoFilter.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "DialogGameVideoFilter.h"
-#include "cores/RetroPlayer/rendering/GUIGameVideoHandle.h"
+#include "cores/RetroPlayer/guibridge/GUIGameVideoHandle.h"
 #include "guilib/LocalizeStrings.h"
 #include "guilib/WindowIDs.h"
 #include "settings/GameSettings.h"
diff --git a/xbmc/games/dialogs/osd/DialogGameVideoSelect.cpp b/xbmc/games/dialogs/osd/DialogGameVideoSelect.cpp
index 7555e74935..46bcbfe325 100644
--- a/xbmc/games/dialogs/osd/DialogGameVideoSelect.cpp
+++ b/xbmc/games/dialogs/osd/DialogGameVideoSelect.cpp
@@ -19,8 +19,8 @@
  */
 
 #include "DialogGameVideoSelect.h"
-#include "cores/RetroPlayer/rendering/GUIGameVideoHandle.h"
-#include "cores/RetroPlayer/rendering/GUIGameRenderManager.h"
+#include "cores/RetroPlayer/guibridge/GUIGameVideoHandle.h"
+#include "cores/RetroPlayer/guibridge/GUIGameRenderManager.h"
 #include "guilib/GraphicContext.h"
 #include "guilib/GUIBaseContainer.h"
 #include "guilib/GUIMessage.h"
diff --git a/xbmc/games/dialogs/osd/DialogGameViewMode.cpp b/xbmc/games/dialogs/osd/DialogGameViewMode.cpp
index 3907d64a52..1d5c4dbce7 100644
--- a/xbmc/games/dialogs/osd/DialogGameViewMode.cpp
+++ b/xbmc/games/dialogs/osd/DialogGameViewMode.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "DialogGameViewMode.h"
-#include "cores/RetroPlayer/rendering/GUIGameVideoHandle.h"
+#include "cores/RetroPlayer/guibridge/GUIGameVideoHandle.h"
 #include "guilib/LocalizeStrings.h"
 #include "guilib/WindowIDs.h"
 #include "settings/GameSettings.h"
diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp
index 6ba09d7ccb..4944b2cbc0 100644
--- a/xbmc/guilib/GUIWindowManager.cpp
+++ b/xbmc/guilib/GUIWindowManager.cpp
@@ -151,7 +151,7 @@
 #include "addons/interfaces/AddonInterfaces.h"
 
 /* Game related include files */
-#include "cores/RetroPlayer/windows/GameWindowFullScreen.h"
+#include "cores/RetroPlayer/guiwindows/GameWindowFullScreen.h"
 #include "games/controllers/windows/GUIControllerWindow.h"
 #include "games/windows/GUIWindowGames.h"
 #include "games/dialogs/osd/DialogGameOSD.h"