Ports: Refactor ports into new folder

33 files changed, 53 insertions, 35 deletions

diff --git a/cmake/treedata/common/games.txt b/cmake/treedata/common/games.txt
index e72c9de9f9..26d60d4cbf 100644
--- a/cmake/treedata/common/games.txt
+++ b/cmake/treedata/common/games.txt
@@ -10,5 +10,8 @@ xbmc/games/controllers/types       games/controllers/types
 xbmc/games/controllers/windows     games/controllers/windows
 xbmc/games/dialogs                 games/dialogs
 xbmc/games/dialogs/osd             games/dialogs/osd
+xbmc/games/ports/input             games/ports/input
+xbmc/games/ports/types             games/ports/types
+xbmc/games/ports/windows           games/ports/windows
 xbmc/games/tags                    games/tags
 xbmc/games/windows                 games/windows
diff --git a/xbmc/games/addons/input/GameClientInput.cpp b/xbmc/games/addons/input/GameClientInput.cpp
index 07f9a59c3e..f37026b154 100644
--- a/xbmc/games/addons/input/GameClientInput.cpp
+++ b/xbmc/games/addons/input/GameClientInput.cpp
@@ -23,7 +23,7 @@
 #include "games/controllers/Controller.h"
 #include "games/controllers/ControllerLayout.h"
 #include "games/controllers/input/PhysicalTopology.h"
-#include "games/controllers/input/PortManager.h"
+#include "games/ports/input/PortManager.h"
 #include "input/joysticks/JoystickTypes.h"
 #include "peripherals/EventLockHandle.h"
 #include "peripherals/Peripherals.h"
diff --git a/xbmc/games/addons/input/GameClientJoystick.cpp b/xbmc/games/addons/input/GameClientJoystick.cpp
index 291dc6755b..30a6016d9e 100644
--- a/xbmc/games/addons/input/GameClientJoystick.cpp
+++ b/xbmc/games/addons/input/GameClientJoystick.cpp
@@ -11,7 +11,7 @@
 #include "GameClientInput.h"
 #include "games/addons/GameClient.h"
 #include "games/controllers/Controller.h"
-#include "games/controllers/input/PortInput.h"
+#include "games/ports/input/PortInput.h"
 #include "input/joysticks/interfaces/IInputReceiver.h"
 #include "utils/log.h"
 
diff --git a/xbmc/games/controllers/dialogs/CMakeLists.txt b/xbmc/games/controllers/dialogs/CMakeLists.txt
index 2b398e98ed..e40e60eaf3 100644
--- a/xbmc/games/controllers/dialogs/CMakeLists.txt
+++ b/xbmc/games/controllers/dialogs/CMakeLists.txt
@@ -1,9 +1,13 @@
-set(SOURCES GUIDialogAxisDetection.cpp
+set(SOURCES ControllerInstaller.cpp
+            ControllerSelect.cpp
+            GUIDialogAxisDetection.cpp
             GUIDialogButtonCapture.cpp
             GUIDialogIgnoreInput.cpp
 )
 
-set(HEADERS GUIDialogAxisDetection.h
+set(HEADERS ControllerInstaller.h
+            ControllerSelect.h
+            GUIDialogAxisDetection.h
             GUIDialogButtonCapture.h
             GUIDialogIgnoreInput.h
 )
diff --git a/xbmc/games/controllers/windows/ControllerInstaller.cpp b/xbmc/games/controllers/dialogs/ControllerInstaller.cpp
index 26cf854749..26cf854749 100644
--- a/xbmc/games/controllers/windows/ControllerInstaller.cpp
+++ b/xbmc/games/controllers/dialogs/ControllerInstaller.cpp
diff --git a/xbmc/games/controllers/windows/ControllerInstaller.h b/xbmc/games/controllers/dialogs/ControllerInstaller.h
index 9863e2754b..9863e2754b 100644
--- a/xbmc/games/controllers/windows/ControllerInstaller.h
+++ b/xbmc/games/controllers/dialogs/ControllerInstaller.h
diff --git a/xbmc/games/controllers/windows/ControllerSelect.cpp b/xbmc/games/controllers/dialogs/ControllerSelect.cpp
index badfd3b8c8..badfd3b8c8 100644
--- a/xbmc/games/controllers/windows/ControllerSelect.cpp
+++ b/xbmc/games/controllers/dialogs/ControllerSelect.cpp
diff --git a/xbmc/games/controllers/windows/ControllerSelect.h b/xbmc/games/controllers/dialogs/ControllerSelect.h
index 83a1b416ce..83a1b416ce 100644
--- a/xbmc/games/controllers/windows/ControllerSelect.h
+++ b/xbmc/games/controllers/dialogs/ControllerSelect.h
diff --git a/xbmc/games/controllers/input/CMakeLists.txt b/xbmc/games/controllers/input/CMakeLists.txt
index 9c48ca5189..511fa3751e 100644
--- a/xbmc/games/controllers/input/CMakeLists.txt
+++ b/xbmc/games/controllers/input/CMakeLists.txt
@@ -1,17 +1,11 @@
 set(SOURCES InputSink.cpp
             PhysicalFeature.cpp
-            PhysicalPort.cpp
             PhysicalTopology.cpp
-            PortInput.cpp
-            PortManager.cpp
 )
 
 set(HEADERS InputSink.h
             PhysicalFeature.h
-            PhysicalPort.h
             PhysicalTopology.h
-            PortInput.h
-            PortManager.h
 )
 
 core_add_library(games_controller_input)
diff --git a/xbmc/games/controllers/input/PhysicalTopology.h b/xbmc/games/controllers/input/PhysicalTopology.h
index bc76bb91b2..c194de82f9 100644
--- a/xbmc/games/controllers/input/PhysicalTopology.h
+++ b/xbmc/games/controllers/input/PhysicalTopology.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "PhysicalPort.h"
+#include "games/ports/input/PhysicalPort.h"
 
 #include <vector>
 
diff --git a/xbmc/games/controllers/types/CMakeLists.txt b/xbmc/games/controllers/types/CMakeLists.txt
index fc9d6c89e0..503d254257 100644
--- a/xbmc/games/controllers/types/CMakeLists.txt
+++ b/xbmc/games/controllers/types/CMakeLists.txt
@@ -1,14 +1,12 @@
 set(SOURCES ControllerGrid.cpp
             ControllerHub.cpp
             ControllerNode.cpp
-            PortNode.cpp
 )
 
 set(HEADERS ControllerGrid.h
             ControllerHub.h
             ControllerNode.h
             ControllerTree.h
-            PortNode.h
 )
 
 core_add_library(games_controller_types)
diff --git a/xbmc/games/controllers/types/ControllerHub.h b/xbmc/games/controllers/types/ControllerHub.h
index d9c3f8fc83..fc48a81a8f 100644
--- a/xbmc/games/controllers/types/ControllerHub.h
+++ b/xbmc/games/controllers/types/ControllerHub.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "PortNode.h"
 #include "games/controllers/ControllerTypes.h"
+#include "games/ports/types/PortNode.h"
 
 #include <string>
 
diff --git a/xbmc/games/controllers/types/ControllerNode.cpp b/xbmc/games/controllers/types/ControllerNode.cpp
index 99a7fa4c7b..0434df7f83 100644
--- a/xbmc/games/controllers/types/ControllerNode.cpp
+++ b/xbmc/games/controllers/types/ControllerNode.cpp
@@ -9,9 +9,9 @@
 #include "ControllerNode.h"
 
 #include "ControllerHub.h"
-#include "PortNode.h"
 #include "games/controllers/Controller.h"
 #include "games/controllers/input/PhysicalTopology.h"
+#include "games/ports/types/PortNode.h"
 
 #include <algorithm>
 #include <utility>
diff --git a/xbmc/games/controllers/windows/CMakeLists.txt b/xbmc/games/controllers/windows/CMakeLists.txt
index c33aa5bbdc..72c815474c 100644
--- a/xbmc/games/controllers/windows/CMakeLists.txt
+++ b/xbmc/games/controllers/windows/CMakeLists.txt
@@ -1,25 +1,15 @@
-set(SOURCES ControllerInstaller.cpp
-            ControllerSelect.cpp
-            GUIConfigurationWizard.cpp
+set(SOURCES GUIConfigurationWizard.cpp
             GUIControllerList.cpp
             GUIControllerWindow.cpp
             GUIFeatureList.cpp
-            GUIPortList.cpp
-            GUIPortWindow.cpp
 )
 
-set(HEADERS ControllerInstaller.h
-            ControllerSelect.cpp
-            GUIConfigurationWizard.h
+set(HEADERS GUIConfigurationWizard.h
             GUIControllerDefines.h
             GUIControllerList.h
             GUIControllerWindow.h
             GUIFeatureList.h
-            GUIPortDefines.h
-            GUIPortList.h
-            GUIPortWindow.h
             IConfigurationWindow.h
-            IPortList.h
 )
 
 core_add_library(games_controller_windows)
diff --git a/xbmc/games/controllers/windows/GUIControllerWindow.cpp b/xbmc/games/controllers/windows/GUIControllerWindow.cpp
index d2570d001e..391ec1a502 100644
--- a/xbmc/games/controllers/windows/GUIControllerWindow.cpp
+++ b/xbmc/games/controllers/windows/GUIControllerWindow.cpp
@@ -8,7 +8,6 @@
 
 #include "GUIControllerWindow.h"
 
-#include "ControllerInstaller.h"
 #include "GUIControllerDefines.h"
 #include "GUIControllerList.h"
 #include "GUIFeatureList.h"
@@ -19,6 +18,7 @@
 #include "cores/RetroPlayer/guibridge/GUIGameRenderManager.h"
 #include "cores/RetroPlayer/guibridge/GUIGameSettingsHandle.h"
 #include "games/addons/GameClient.h"
+#include "games/controllers/dialogs/ControllerInstaller.h"
 #include "games/controllers/dialogs/GUIDialogIgnoreInput.h"
 #include "guilib/GUIButtonControl.h"
 #include "guilib/GUIControl.h"
diff --git a/xbmc/games/ports/input/CMakeLists.txt b/xbmc/games/ports/input/CMakeLists.txt
new file mode 100644
index 0000000000..5b2b27f78d
--- /dev/null
+++ b/xbmc/games/ports/input/CMakeLists.txt
@@ -0,0 +1,11 @@
+set(SOURCES PhysicalPort.cpp
+            PortInput.cpp
+            PortManager.cpp
+)
+
+set(HEADERS PhysicalPort.h
+            PortInput.h
+            PortManager.h
+)
+
+core_add_library(games_ports_input)
diff --git a/xbmc/games/controllers/input/PhysicalPort.cpp b/xbmc/games/ports/input/PhysicalPort.cpp
index 9c53c76199..9c53c76199 100644
--- a/xbmc/games/controllers/input/PhysicalPort.cpp
+++ b/xbmc/games/ports/input/PhysicalPort.cpp
diff --git a/xbmc/games/controllers/input/PhysicalPort.h b/xbmc/games/ports/input/PhysicalPort.h
index 83fe3a503c..83fe3a503c 100644
--- a/xbmc/games/controllers/input/PhysicalPort.h
+++ b/xbmc/games/ports/input/PhysicalPort.h
diff --git a/xbmc/games/controllers/input/PortInput.cpp b/xbmc/games/ports/input/PortInput.cpp
index e7837c3f7e..af1652b048 100644
--- a/xbmc/games/controllers/input/PortInput.cpp
+++ b/xbmc/games/ports/input/PortInput.cpp
@@ -8,8 +8,8 @@
 
 #include "PortInput.h"
 
-#include "InputSink.h"
 #include "games/addons/GameClient.h"
+#include "games/controllers/input/InputSink.h"
 #include "guilib/WindowIDs.h"
 #include "input/joysticks/keymaps/KeymapHandling.h"
 #include "peripherals/devices/Peripheral.h"
diff --git a/xbmc/games/controllers/input/PortInput.h b/xbmc/games/ports/input/PortInput.h
index 4e296a376c..4e296a376c 100644
--- a/xbmc/games/controllers/input/PortInput.h
+++ b/xbmc/games/ports/input/PortInput.h
diff --git a/xbmc/games/controllers/input/PortManager.cpp b/xbmc/games/ports/input/PortManager.cpp
index 9b60291626..8de43d02c8 100644
--- a/xbmc/games/controllers/input/PortManager.cpp
+++ b/xbmc/games/ports/input/PortManager.cpp
@@ -13,7 +13,7 @@
 #include "games/controllers/Controller.h"
 #include "games/controllers/types/ControllerHub.h"
 #include "games/controllers/types/ControllerNode.h"
-#include "games/controllers/types/PortNode.h"
+#include "games/ports/types/PortNode.h"
 #include "utils/URIUtils.h"
 #include "utils/XBMCTinyXML.h"
 #include "utils/XMLUtils.h"
diff --git a/xbmc/games/controllers/input/PortManager.h b/xbmc/games/ports/input/PortManager.h
index d5193b377c..d5193b377c 100644
--- a/xbmc/games/controllers/input/PortManager.h
+++ b/xbmc/games/ports/input/PortManager.h
diff --git a/xbmc/games/ports/types/CMakeLists.txt b/xbmc/games/ports/types/CMakeLists.txt
new file mode 100644
index 0000000000..735df429c4
--- /dev/null
+++ b/xbmc/games/ports/types/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(SOURCES PortNode.cpp
+)
+
+set(HEADERS PortNode.h
+)
+
+core_add_library(games_ports_types)
diff --git a/xbmc/games/controllers/types/PortNode.cpp b/xbmc/games/ports/types/PortNode.cpp
index dd54ff12b1..009e37df10 100644
--- a/xbmc/games/controllers/types/PortNode.cpp
+++ b/xbmc/games/ports/types/PortNode.cpp
@@ -9,8 +9,8 @@
 #include "PortNode.h"
 
 #include "games/controllers/Controller.h"
-#include "games/controllers/input/PhysicalPort.h"
 #include "games/controllers/types/ControllerHub.h"
+#include "games/ports/input/PhysicalPort.h"
 
 #include <algorithm>
 #include <utility>
diff --git a/xbmc/games/controllers/types/PortNode.h b/xbmc/games/ports/types/PortNode.h
index f970e9637b..660a7bcc8a 100644
--- a/xbmc/games/controllers/types/PortNode.h
+++ b/xbmc/games/ports/types/PortNode.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "ControllerNode.h"
 #include "games/controllers/ControllerTypes.h"
+#include "games/controllers/types/ControllerNode.h"
 
 #include <string>
 #include <vector>
diff --git a/xbmc/games/ports/windows/CMakeLists.txt b/xbmc/games/ports/windows/CMakeLists.txt
new file mode 100644
index 0000000000..4cf07ea029
--- /dev/null
+++ b/xbmc/games/ports/windows/CMakeLists.txt
@@ -0,0 +1,11 @@
+set(SOURCES GUIPortList.cpp
+            GUIPortWindow.cpp
+)
+
+set(HEADERS GUIPortDefines.h
+            GUIPortList.h
+            GUIPortWindow.h
+            IPortList.h
+)
+
+core_add_library(games_ports_windows)
diff --git a/xbmc/games/controllers/windows/GUIPortDefines.h b/xbmc/games/ports/windows/GUIPortDefines.h
index c9c255b3fe..c9c255b3fe 100644
--- a/xbmc/games/controllers/windows/GUIPortDefines.h
+++ b/xbmc/games/ports/windows/GUIPortDefines.h
diff --git a/xbmc/games/controllers/windows/GUIPortList.cpp b/xbmc/games/ports/windows/GUIPortList.cpp
index b488ea2f07..0797d619d4 100644
--- a/xbmc/games/controllers/windows/GUIPortList.cpp
+++ b/xbmc/games/ports/windows/GUIPortList.cpp
@@ -19,7 +19,7 @@
 #include "games/controllers/ControllerLayout.h"
 #include "games/controllers/types/ControllerHub.h"
 #include "games/controllers/types/ControllerTree.h"
-#include "games/controllers/types/PortNode.h"
+#include "games/ports/types/PortNode.h"
 #include "guilib/GUIMessage.h"
 #include "guilib/GUIWindow.h"
 #include "guilib/LocalizeStrings.h"
diff --git a/xbmc/games/controllers/windows/GUIPortList.h b/xbmc/games/ports/windows/GUIPortList.h
index 93a27b4ea8..fc6597ca61 100644
--- a/xbmc/games/controllers/windows/GUIPortList.h
+++ b/xbmc/games/ports/windows/GUIPortList.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "ControllerSelect.h"
 #include "IPortList.h"
 #include "addons/AddonEvents.h"
 #include "games/GameTypes.h"
 #include "games/controllers/ControllerTypes.h"
+#include "games/controllers/dialogs/ControllerSelect.h"
 #include "games/controllers/types/ControllerTree.h"
 
 #include <map>
diff --git a/xbmc/games/controllers/windows/GUIPortWindow.cpp b/xbmc/games/ports/windows/GUIPortWindow.cpp
index 47e7aa347b..47e7aa347b 100644
--- a/xbmc/games/controllers/windows/GUIPortWindow.cpp
+++ b/xbmc/games/ports/windows/GUIPortWindow.cpp
diff --git a/xbmc/games/controllers/windows/GUIPortWindow.h b/xbmc/games/ports/windows/GUIPortWindow.h
index 1b529dccc9..1b529dccc9 100644
--- a/xbmc/games/controllers/windows/GUIPortWindow.h
+++ b/xbmc/games/ports/windows/GUIPortWindow.h
diff --git a/xbmc/games/controllers/windows/IPortList.h b/xbmc/games/ports/windows/IPortList.h
index 0956dcc3fa..0956dcc3fa 100644
--- a/xbmc/games/controllers/windows/IPortList.h
+++ b/xbmc/games/ports/windows/IPortList.h
diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp
index b55213a128..9696249a04 100644
--- a/xbmc/guilib/GUIWindowManager.cpp
+++ b/xbmc/guilib/GUIWindowManager.cpp
@@ -137,13 +137,13 @@
 /* Game related include files */
 #include "cores/RetroPlayer/guiwindows/GameWindowFullScreen.h"
 #include "games/controllers/windows/GUIControllerWindow.h"
-#include "games/controllers/windows/GUIPortWindow.h"
 #include "games/dialogs/osd/DialogGameAdvancedSettings.h"
 #include "games/dialogs/osd/DialogGameOSD.h"
 #include "games/dialogs/osd/DialogGameStretchMode.h"
 #include "games/dialogs/osd/DialogGameVideoFilter.h"
 #include "games/dialogs/osd/DialogGameVideoRotation.h"
 #include "games/dialogs/osd/DialogGameVolume.h"
+#include "games/ports/windows/GUIPortWindow.h"
 #include "games/windows/GUIWindowGames.h"
 
 using namespace KODI;