[Peripherals] Move events to subfolder

16 files changed, 28 insertions, 16 deletions

diff --git a/cmake/treedata/common/peripherals.txt b/cmake/treedata/common/peripherals.txt
index 903b5378e0..838384bf80 100644
--- a/cmake/treedata/common/peripherals.txt
+++ b/cmake/treedata/common/peripherals.txt
@@ -4,3 +4,5 @@ xbmc/peripherals/bus            peripherals/bus
 xbmc/peripherals/bus/virtual    peripherals/bus/virtual
 xbmc/peripherals/devices        peripherals/devices
 xbmc/peripherals/dialogs        peripherals/dialogs
+xbmc/peripherals/events         peripherals/events
+xbmc/peripherals/events/interfaces peripherals/events/interfaces
diff --git a/xbmc/cores/RetroPlayer/RetroPlayerInput.cpp b/xbmc/cores/RetroPlayer/RetroPlayerInput.cpp
index 7fe19f7987..70f6242b9f 100644
--- a/xbmc/cores/RetroPlayer/RetroPlayerInput.cpp
+++ b/xbmc/cores/RetroPlayer/RetroPlayerInput.cpp
@@ -10,8 +10,8 @@
 
 #include "cores/RetroPlayer/process/RPProcessInfo.h"
 #include "cores/RetroPlayer/rendering/RenderContext.h"
-#include "peripherals/EventPollHandle.h"
 #include "peripherals/Peripherals.h"
+#include "peripherals/events/EventPollHandle.h"
 #include "utils/log.h"
 
 using namespace KODI;
diff --git a/xbmc/games/addons/input/GameClientInput.cpp b/xbmc/games/addons/input/GameClientInput.cpp
index 95fcfef91d..33f11cd41b 100644
--- a/xbmc/games/addons/input/GameClientInput.cpp
+++ b/xbmc/games/addons/input/GameClientInput.cpp
@@ -30,8 +30,8 @@
 #include "games/ports/input/PortManager.h"
 #include "games/ports/types/PortNode.h"
 #include "input/joysticks/JoystickTypes.h"
-#include "peripherals/EventLockHandle.h"
 #include "peripherals/Peripherals.h"
+#include "peripherals/events/EventLockHandle.h"
 #include "utils/log.h"
 
 #include <algorithm>
diff --git a/xbmc/games/agents/input/AgentInput.cpp b/xbmc/games/agents/input/AgentInput.cpp
index 18152aa8d6..40005b05c1 100644
--- a/xbmc/games/agents/input/AgentInput.cpp
+++ b/xbmc/games/agents/input/AgentInput.cpp
@@ -14,10 +14,10 @@
 #include "games/addons/input/GameClientJoystick.h"
 #include "games/controllers/Controller.h"
 #include "input/InputManager.h"
-#include "peripherals/EventLockHandle.h"
 #include "peripherals/Peripherals.h"
 #include "peripherals/devices/Peripheral.h"
 #include "peripherals/devices/PeripheralJoystick.h"
+#include "peripherals/events/EventLockHandle.h"
 #include "utils/log.h"
 
 #include <array>
diff --git a/xbmc/peripherals/CMakeLists.txt b/xbmc/peripherals/CMakeLists.txt
index 9de62b9648..7525c9ddf6 100644
--- a/xbmc/peripherals/CMakeLists.txt
+++ b/xbmc/peripherals/CMakeLists.txt
@@ -1,13 +1,6 @@
-set(SOURCES EventLockHandle.cpp
-            EventPollHandle.cpp
-            EventScanner.cpp
-            Peripherals.cpp)
+set(SOURCES Peripherals.cpp)
 
-set(HEADERS EventLockHandle.h
-            EventPollHandle.h
-            EventScanner.h
-            IEventScannerCallback.h
-            Peripherals.h
+set(HEADERS Peripherals.h
             PeripheralTypes.h)
 
 core_add_library(peripherals)
diff --git a/xbmc/peripherals/Peripherals.cpp b/xbmc/peripherals/Peripherals.cpp
index ab26f56ce3..e282fbf700 100644
--- a/xbmc/peripherals/Peripherals.cpp
+++ b/xbmc/peripherals/Peripherals.cpp
@@ -9,7 +9,6 @@
 #include "Peripherals.h"
 
 #include "CompileInfo.h"
-#include "EventScanner.h"
 #include "addons/AddonButtonMap.h"
 #include "addons/AddonManager.h"
 #include "addons/addoninfo/AddonInfo.h"
@@ -54,6 +53,7 @@
 #include "messaging/ApplicationMessenger.h"
 #include "messaging/ThreadMessage.h"
 #include "peripherals/dialogs/GUIDialogPeripherals.h"
+#include "peripherals/events/EventScanner.h"
 #include "settings/SettingAddon.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
diff --git a/xbmc/peripherals/Peripherals.h b/xbmc/peripherals/Peripherals.h
index 89605ad3a7..02992a6676 100644
--- a/xbmc/peripherals/Peripherals.h
+++ b/xbmc/peripherals/Peripherals.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "IEventScannerCallback.h"
 #include "bus/PeripheralBus.h"
 #include "devices/Peripheral.h"
 #include "interfaces/IAnnouncer.h"
 #include "messaging/IMessageTarget.h"
+#include "peripherals/events/interfaces/IEventScannerCallback.h"
 #include "settings/lib/ISettingCallback.h"
 #include "threads/CriticalSection.h"
 #include "threads/Thread.h"
diff --git a/xbmc/peripherals/events/CMakeLists.txt b/xbmc/peripherals/events/CMakeLists.txt
new file mode 100644
index 0000000000..27992d23c7
--- /dev/null
+++ b/xbmc/peripherals/events/CMakeLists.txt
@@ -0,0 +1,11 @@
+set(SOURCES EventLockHandle.cpp
+            EventPollHandle.cpp
+            EventScanner.cpp
+)
+
+set(HEADERS EventLockHandle.h
+            EventPollHandle.h
+            EventScanner.h
+)
+
+core_add_library(peripherals_events)
diff --git a/xbmc/peripherals/EventLockHandle.cpp b/xbmc/peripherals/events/EventLockHandle.cpp
index 11c7a01d57..11c7a01d57 100644
--- a/xbmc/peripherals/EventLockHandle.cpp
+++ b/xbmc/peripherals/events/EventLockHandle.cpp
diff --git a/xbmc/peripherals/EventLockHandle.h b/xbmc/peripherals/events/EventLockHandle.h
index 7cca5805ba..7cca5805ba 100644
--- a/xbmc/peripherals/EventLockHandle.h
+++ b/xbmc/peripherals/events/EventLockHandle.h
diff --git a/xbmc/peripherals/EventPollHandle.cpp b/xbmc/peripherals/events/EventPollHandle.cpp
index 03c13698db..03c13698db 100644
--- a/xbmc/peripherals/EventPollHandle.cpp
+++ b/xbmc/peripherals/events/EventPollHandle.cpp
diff --git a/xbmc/peripherals/EventPollHandle.h b/xbmc/peripherals/events/EventPollHandle.h
index fdeb793d55..fdeb793d55 100644
--- a/xbmc/peripherals/EventPollHandle.h
+++ b/xbmc/peripherals/events/EventPollHandle.h
diff --git a/xbmc/peripherals/EventScanner.cpp b/xbmc/peripherals/events/EventScanner.cpp
index 50eb512218..b1021e42b3 100644
--- a/xbmc/peripherals/EventScanner.cpp
+++ b/xbmc/peripherals/events/EventScanner.cpp
@@ -8,7 +8,7 @@
 
 #include "EventScanner.h"
 
-#include "IEventScannerCallback.h"
+#include "peripherals/events/interfaces/IEventScannerCallback.h"
 #include "utils/log.h"
 
 #include <algorithm>
diff --git a/xbmc/peripherals/EventScanner.h b/xbmc/peripherals/events/EventScanner.h
index 205aa2c18b..05ff606b71 100644
--- a/xbmc/peripherals/EventScanner.h
+++ b/xbmc/peripherals/events/EventScanner.h
@@ -10,7 +10,7 @@
 
 #include "EventLockHandle.h"
 #include "EventPollHandle.h"
-#include "PeripheralTypes.h"
+#include "peripherals/PeripheralTypes.h"
 #include "threads/CriticalSection.h"
 #include "threads/Event.h"
 #include "threads/Thread.h"
diff --git a/xbmc/peripherals/events/interfaces/CMakeLists.txt b/xbmc/peripherals/events/interfaces/CMakeLists.txt
new file mode 100644
index 0000000000..332a91ffd4
--- /dev/null
+++ b/xbmc/peripherals/events/interfaces/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(HEADERS IEventScannerCallback.h
+)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(peripherals_events_interfaces)
+endif()
diff --git a/xbmc/peripherals/IEventScannerCallback.h b/xbmc/peripherals/events/interfaces/IEventScannerCallback.h
index cbea165504..cbea165504 100644
--- a/xbmc/peripherals/IEventScannerCallback.h
+++ b/xbmc/peripherals/events/interfaces/IEventScannerCallback.h