diff options
author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2019-10-01 22:15:16 +0200 |
---|---|---|
committer | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2019-10-02 22:18:48 +0200 |
commit | ee64384da0e6fb0628166f785ead7e2e76aa0859 (patch) | |
tree | 1ed59fc25c4e8ed501b023b84e8ae07eb1978a42 | |
parent | bc65cedc3aeaa36ddf3c0ee6bec9d09b3861354a (diff) |
[PVR] Rework PVR component source directory structure.
60 files changed, 121 insertions, 105 deletions
diff --git a/cmake/treedata/common/pvr.txt b/cmake/treedata/common/pvr.txt index decdabb559..74e766f2d0 100644 --- a/cmake/treedata/common/pvr.txt +++ b/cmake/treedata/common/pvr.txt @@ -1,8 +1,12 @@ -xbmc/pvr pvr -xbmc/pvr/addons pvr/addons -xbmc/pvr/channels pvr/channels -xbmc/pvr/dialogs pvr/dialogs -xbmc/pvr/epg pvr/epg -xbmc/pvr/recordings pvr/recordings -xbmc/pvr/timers pvr/timers -xbmc/pvr/windows pvr/windows +xbmc/pvr pvr +xbmc/pvr/addons pvr/addons +xbmc/pvr/channels pvr/channels +xbmc/pvr/dialogs pvr/dialogs +xbmc/pvr/epg pvr/epg +xbmc/pvr/filesystem pvr/filesystem +xbmc/pvr/guilib pvr/guilib +xbmc/pvr/guilib/guiinfo pvr/guilib/guiinfo +xbmc/pvr/recordings pvr/recordings +xbmc/pvr/settings pvr/settings +xbmc/pvr/timers pvr/timers +xbmc/pvr/windows pvr/windows diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index 9e96108b7b..92362ec92e 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -130,8 +130,8 @@ #include "addons/settings/GUIDialogAddonSettings.h" // PVR related include Files -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" +#include "pvr/guilib/PVRGUIActions.h" #include "video/dialogs/GUIDialogFullScreenInfo.h" #include "dialogs/GUIDialogCache.h" diff --git a/xbmc/filesystem/PVRDirectory.cpp b/xbmc/filesystem/PVRDirectory.cpp index b4a5e88962..915d3f76fb 100644 --- a/xbmc/filesystem/PVRDirectory.cpp +++ b/xbmc/filesystem/PVRDirectory.cpp @@ -8,7 +8,7 @@ #include "PVRDirectory.h" -#include "pvr/PVRGUIDirectory.h" +#include "pvr/filesystem/PVRGUIDirectory.h" using namespace XFILE; using namespace PVR; diff --git a/xbmc/guilib/GUIControlFactory.cpp b/xbmc/guilib/GUIControlFactory.cpp index 00561765ea..93b49c015d 100644 --- a/xbmc/guilib/GUIControlFactory.cpp +++ b/xbmc/guilib/GUIControlFactory.cpp @@ -49,7 +49,7 @@ #include "cores/RetroPlayer/guicontrols/GUIGameControl.h" #include "games/controllers/guicontrols/GUIGameController.h" #include "input/Key.h" -#include "pvr/windows/GUIEPGGridContainer.h" +#include "pvr/guilib/GUIEPGGridContainer.h" #include "utils/CharsetConverter.h" #include "utils/RssManager.h" #include "utils/StringUtils.h" diff --git a/xbmc/input/WindowTranslator.cpp b/xbmc/input/WindowTranslator.cpp index dfbd42c46e..b035bd2f83 100644 --- a/xbmc/input/WindowTranslator.cpp +++ b/xbmc/input/WindowTranslator.cpp @@ -11,8 +11,8 @@ #include "Application.h" #include "ServiceBroker.h" #include "guilib/WindowIDs.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" +#include "pvr/guilib/PVRGUIActions.h" #include "utils/StringUtils.h" #include "utils/log.h" diff --git a/xbmc/interfaces/builtins/PVRBuiltins.cpp b/xbmc/interfaces/builtins/PVRBuiltins.cpp index a3cd8d5720..311042e57e 100644 --- a/xbmc/interfaces/builtins/PVRBuiltins.cpp +++ b/xbmc/interfaces/builtins/PVRBuiltins.cpp @@ -14,8 +14,8 @@ #include "guilib/GUIComponent.h" #include "guilib/GUIWindowManager.h" #include "guilib/guiinfo/GUIInfoLabels.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" +#include "pvr/guilib/PVRGUIActions.h" #include "pvr/windows/GUIWindowPVRGuide.h" #include "utils/log.h" diff --git a/xbmc/interfaces/json-rpc/PVROperations.cpp b/xbmc/interfaces/json-rpc/PVROperations.cpp index 28b3079d75..883b286850 100644 --- a/xbmc/interfaces/json-rpc/PVROperations.cpp +++ b/xbmc/interfaces/json-rpc/PVROperations.cpp @@ -9,7 +9,6 @@ #include "PVROperations.h" #include "ServiceBroker.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" #include "pvr/PVRPlaybackState.h" #include "pvr/channels/PVRChannel.h" @@ -17,6 +16,7 @@ #include "pvr/channels/PVRChannelGroupsContainer.h" #include "pvr/epg/Epg.h" #include "pvr/epg/EpgContainer.h" +#include "pvr/guilib/PVRGUIActions.h" #include "pvr/recordings/PVRRecordings.h" #include "pvr/timers/PVRTimerInfoTag.h" #include "pvr/timers/PVRTimers.h" diff --git a/xbmc/interfaces/json-rpc/PlayerOperations.cpp b/xbmc/interfaces/json-rpc/PlayerOperations.cpp index 2dcb0d7b1e..cd07454607 100644 --- a/xbmc/interfaces/json-rpc/PlayerOperations.cpp +++ b/xbmc/interfaces/json-rpc/PlayerOperations.cpp @@ -26,12 +26,12 @@ #include "messaging/ApplicationMessenger.h" #include "music/MusicDatabase.h" #include "pictures/GUIWindowSlideShow.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" #include "pvr/PVRPlaybackState.h" #include "pvr/channels/PVRChannel.h" #include "pvr/channels/PVRChannelGroupsContainer.h" #include "pvr/epg/EpgInfoTag.h" +#include "pvr/guilib/PVRGUIActions.h" #include "pvr/recordings/PVRRecordings.h" #include "settings/DisplaySettings.h" #include "utils/Variant.h" diff --git a/xbmc/pvr/CMakeLists.txt b/xbmc/pvr/CMakeLists.txt index 072a99735b..d8c177630a 100644 --- a/xbmc/pvr/CMakeLists.txt +++ b/xbmc/pvr/CMakeLists.txt @@ -1,41 +1,21 @@ -set(SOURCES PVRActionListener.cpp - PVRGUIInfo.cpp - PVRManager.cpp - PVRDatabase.cpp - PVRSettings.cpp +set(SOURCES PVRChannelNumberInputHandler.cpp PVRContextMenus.cpp - PVRGUIActions.cpp - PVRItem.cpp - PVRChannelNumberInputHandler.cpp + PVRDatabase.cpp PVREventLogJob.cpp - PVRGUIChannelIconUpdater.cpp - PVRGUIChannelNavigator.cpp - PVRGUIDirectory.cpp - PVRGUIProgressHandler.cpp - PVRGUITimerInfo.cpp - PVRGUITimesInfo.cpp - PVRStreamProperties.cpp + PVRItem.cpp + PVRManager.cpp PVRPlaybackState.cpp + PVRStreamProperties.cpp PVRThumbLoader.cpp) -set(HEADERS PVRActionListener.h - PVRDatabase.h - PVRGUIInfo.h - PVRManager.h - PVRSettings.h +set(HEADERS PVRChannelNumberInputHandler.h PVRContextMenus.h - PVRGUIActions.h - PVRItem.h - PVRChannelNumberInputHandler.h + PVRDatabase.h PVREventLogJob.h - PVRGUIChannelIconUpdater.h - PVRGUIChannelNavigator.h - PVRGUIDirectory.h - PVRGUIProgressHandler.h - PVRGUITimerInfo.h - PVRGUITimesInfo.h - PVRStreamProperties.h + PVRItem.h + PVRManager.h PVRPlaybackState.h + PVRStreamProperties.h PVRThumbLoader.h) core_add_library(pvr) diff --git a/xbmc/pvr/PVRContextMenus.cpp b/xbmc/pvr/PVRContextMenus.cpp index bdcd072019..5168d8386f 100644 --- a/xbmc/pvr/PVRContextMenus.cpp +++ b/xbmc/pvr/PVRContextMenus.cpp @@ -11,12 +11,12 @@ #include "ContextMenuItem.h" #include "ServiceBroker.h" #include "guilib/LocalizeStrings.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" #include "pvr/addons/PVRClient.h" #include "pvr/addons/PVRClientMenuHooks.h" #include "pvr/channels/PVRChannel.h" #include "pvr/epg/EpgInfoTag.h" +#include "pvr/guilib/PVRGUIActions.h" #include "pvr/recordings/PVRRecording.h" #include "pvr/recordings/PVRRecordings.h" #include "pvr/recordings/PVRRecordingsPath.h" diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp index 2e6a6c3f1d..42b5f71bd5 100644 --- a/xbmc/pvr/PVRManager.cpp +++ b/xbmc/pvr/PVRManager.cpp @@ -13,10 +13,6 @@ #include "interfaces/AnnouncementManager.h" #include "messaging/ApplicationMessenger.h" #include "pvr/PVRDatabase.h" -#include "pvr/PVRGUIActions.h" -#include "pvr/PVRGUIChannelIconUpdater.h" -#include "pvr/PVRGUIInfo.h" -#include "pvr/PVRGUIProgressHandler.h" #include "pvr/PVRPlaybackState.h" #include "pvr/addons/PVRClient.h" #include "pvr/addons/PVRClients.h" @@ -26,6 +22,10 @@ #include "pvr/channels/PVRChannelGroups.h" #include "pvr/channels/PVRChannelGroupsContainer.h" #include "pvr/epg/EpgInfoTag.h" +#include "pvr/guilib/PVRGUIActions.h" +#include "pvr/guilib/PVRGUIChannelIconUpdater.h" +#include "pvr/guilib/PVRGUIProgressHandler.h" +#include "pvr/guilib/guiinfo/PVRGUIInfo.h" #include "pvr/recordings/PVRRecording.h" #include "pvr/recordings/PVRRecordings.h" #include "pvr/timers/PVRTimerInfoTag.h" diff --git a/xbmc/pvr/PVRManager.h b/xbmc/pvr/PVRManager.h index 31ca5b5e68..4f16cadb78 100644 --- a/xbmc/pvr/PVRManager.h +++ b/xbmc/pvr/PVRManager.h @@ -10,9 +10,9 @@ #include "addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h" #include "interfaces/IAnnouncer.h" -#include "pvr/PVRActionListener.h" -#include "pvr/PVRSettings.h" #include "pvr/epg/EpgContainer.h" +#include "pvr/guilib/PVRGUIActionListener.h" +#include "pvr/settings/PVRSettings.h" #include "threads/CriticalSection.h" #include "threads/Event.h" #include "threads/Thread.h" @@ -432,7 +432,7 @@ namespace PVR std::shared_ptr<CPVRPlaybackState> m_playbackState; - CPVRActionListener m_actionListener; + CPVRGUIActionListener m_actionListener; CPVRSettings m_settings; }; } diff --git a/xbmc/pvr/PVRThumbLoader.cpp b/xbmc/pvr/PVRThumbLoader.cpp index 7cfe3a0d02..28306d4df3 100644 --- a/xbmc/pvr/PVRThumbLoader.cpp +++ b/xbmc/pvr/PVRThumbLoader.cpp @@ -13,7 +13,7 @@ #include "TextureCache.h" #include "TextureCacheJob.h" #include "pictures/Picture.h" -#include "pvr/PVRGUIDirectory.h" +#include "pvr/filesystem/PVRGUIDirectory.h" #include "pvr/PVRManager.h" #include "settings/AdvancedSettings.h" #include "settings/Settings.h" diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp index ee431e86e2..d7bb51fad6 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp @@ -24,7 +24,6 @@ #include "input/actions/ActionIDs.h" #include "messaging/helpers/DialogOKHelper.h" #include "profiles/ProfileManager.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" #include "pvr/addons/PVRClient.h" #include "pvr/addons/PVRClients.h" @@ -32,6 +31,7 @@ #include "pvr/channels/PVRChannelGroup.h" #include "pvr/channels/PVRChannelGroupsContainer.h" #include "pvr/dialogs/GUIDialogPVRGroupManager.h" +#include "pvr/guilib/PVRGUIActions.h" #include "settings/Settings.h" #include "settings/SettingsComponent.h" #include "storage/MediaManager.h" diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp index 7ddc2ba6c5..fbc99bc43d 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp @@ -16,7 +16,6 @@ #include "input/actions/Action.h" #include "input/actions/ActionIDs.h" #include "messaging/ApplicationMessenger.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" #include "pvr/PVRPlaybackState.h" #include "pvr/channels/PVRChannel.h" @@ -24,6 +23,7 @@ #include "pvr/channels/PVRChannelGroups.h" #include "pvr/channels/PVRChannelGroupsContainer.h" #include "pvr/epg/EpgContainer.h" +#include "pvr/guilib/PVRGUIActions.h" #include "settings/Settings.h" #include "settings/SettingsComponent.h" diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp index abef8c60e4..363ba45386 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp @@ -20,12 +20,12 @@ #include "input/actions/Action.h" #include "input/actions/ActionIDs.h" #include "messaging/helpers//DialogOKHelper.h" -#include "pvr/PVRGUIDirectory.h" #include "pvr/PVRManager.h" #include "pvr/PVRPlaybackState.h" #include "pvr/channels/PVRChannel.h" #include "pvr/channels/PVRChannelGroups.h" #include "pvr/channels/PVRChannelGroupsContainer.h" +#include "pvr/filesystem/PVRGUIDirectory.h" #include "utils/StringUtils.h" #include "utils/Variant.h" diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.cpp index 014e1df976..0a47b3c649 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.cpp @@ -11,10 +11,10 @@ #include "FileItem.h" #include "ServiceBroker.h" #include "guilib/GUIMessage.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" #include "pvr/addons/PVRClient.h" #include "pvr/epg/EpgInfoTag.h" +#include "pvr/guilib/PVRGUIActions.h" #include "pvr/recordings/PVRRecordings.h" #include "pvr/timers/PVRTimerInfoTag.h" #include "pvr/timers/PVRTimers.h" diff --git a/xbmc/pvr/dialogs/GUIDialogPVRItemsViewBase.cpp b/xbmc/pvr/dialogs/GUIDialogPVRItemsViewBase.cpp index ae148f9ef4..636c15b4e3 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRItemsViewBase.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRItemsViewBase.cpp @@ -14,8 +14,8 @@ #include "dialogs/GUIDialogContextMenu.h" #include "input/actions/Action.h" #include "input/actions/ActionIDs.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" +#include "pvr/guilib/PVRGUIActions.h" #include "view/ViewState.h" #include <utility> diff --git a/xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.cpp b/xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.cpp index 709c742804..9a1065cca0 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.cpp @@ -11,8 +11,8 @@ #include "FileItem.h" #include "ServiceBroker.h" #include "guilib/GUIMessage.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" +#include "pvr/guilib/PVRGUIActions.h" using namespace PVR; diff --git a/xbmc/pvr/epg/EpgContainer.cpp b/xbmc/pvr/epg/EpgContainer.cpp index ba34740e48..de73f192c5 100644 --- a/xbmc/pvr/epg/EpgContainer.cpp +++ b/xbmc/pvr/epg/EpgContainer.cpp @@ -10,13 +10,13 @@ #include "ServiceBroker.h" #include "guilib/LocalizeStrings.h" -#include "pvr/PVRGUIProgressHandler.h" #include "pvr/PVRManager.h" #include "pvr/epg/Epg.h" #include "pvr/epg/EpgChannelData.h" #include "pvr/epg/EpgContainer.h" #include "pvr/epg/EpgDatabase.h" #include "pvr/epg/EpgInfoTag.h" +#include "pvr/guilib/PVRGUIProgressHandler.h" #include "settings/AdvancedSettings.h" #include "settings/Settings.h" #include "settings/SettingsComponent.h" diff --git a/xbmc/pvr/epg/EpgContainer.h b/xbmc/pvr/epg/EpgContainer.h index fd10473b5f..9562b12ca7 100644 --- a/xbmc/pvr/epg/EpgContainer.h +++ b/xbmc/pvr/epg/EpgContainer.h @@ -10,7 +10,7 @@ #include "XBDateTime.h" #include "addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h" -#include "pvr/PVRSettings.h" +#include "pvr/settings/PVRSettings.h" #include "threads/CriticalSection.h" #include "threads/Event.h" #include "threads/Thread.h" diff --git a/xbmc/pvr/filesystem/CMakeLists.txt b/xbmc/pvr/filesystem/CMakeLists.txt new file mode 100644 index 0000000000..823d7839be --- /dev/null +++ b/xbmc/pvr/filesystem/CMakeLists.txt @@ -0,0 +1,5 @@ +set(SOURCES PVRGUIDirectory.cpp) + +set(HEADERS PVRGUIDirectory.h) + +core_add_library(pvr_filesystem) diff --git a/xbmc/pvr/PVRGUIDirectory.cpp b/xbmc/pvr/filesystem/PVRGUIDirectory.cpp index 17fcb01377..17fcb01377 100644 --- a/xbmc/pvr/PVRGUIDirectory.cpp +++ b/xbmc/pvr/filesystem/PVRGUIDirectory.cpp diff --git a/xbmc/pvr/PVRGUIDirectory.h b/xbmc/pvr/filesystem/PVRGUIDirectory.h index bc55c69e93..bc55c69e93 100644 --- a/xbmc/pvr/PVRGUIDirectory.h +++ b/xbmc/pvr/filesystem/PVRGUIDirectory.h diff --git a/xbmc/pvr/guilib/CMakeLists.txt b/xbmc/pvr/guilib/CMakeLists.txt new file mode 100644 index 0000000000..80e27d38b4 --- /dev/null +++ b/xbmc/pvr/guilib/CMakeLists.txt @@ -0,0 +1,17 @@ +set(SOURCES GUIEPGGridContainer.cpp + GUIEPGGridContainerModel.cpp + PVRGUIActionListener.cpp + PVRGUIActions.cpp + PVRGUIChannelIconUpdater.cpp + PVRGUIChannelNavigator.cpp + PVRGUIProgressHandler.cpp) + +set(HEADERS GUIEPGGridContainer.h + GUIEPGGridContainerModel.h + PVRGUIActionListener.h + PVRGUIActions.h + PVRGUIChannelIconUpdater.h + PVRGUIChannelNavigator.h + PVRGUIProgressHandler.h) + +core_add_library(pvr_guilib) diff --git a/xbmc/pvr/windows/GUIEPGGridContainer.cpp b/xbmc/pvr/guilib/GUIEPGGridContainer.cpp index f635a0431e..7ce863b6b6 100644 --- a/xbmc/pvr/windows/GUIEPGGridContainer.cpp +++ b/xbmc/pvr/guilib/GUIEPGGridContainer.cpp @@ -18,7 +18,7 @@ #include "input/actions/ActionIDs.h" #include "pvr/channels/PVRChannel.h" #include "pvr/epg/EpgInfoTag.h" -#include "pvr/windows/GUIEPGGridContainerModel.h" +#include "pvr/guilib/GUIEPGGridContainerModel.h" #include "utils/MathUtils.h" #include "utils/StringUtils.h" #include "utils/Variant.h" diff --git a/xbmc/pvr/windows/GUIEPGGridContainer.dox b/xbmc/pvr/guilib/GUIEPGGridContainer.dox index 1916cdee0b..1916cdee0b 100644 --- a/xbmc/pvr/windows/GUIEPGGridContainer.dox +++ b/xbmc/pvr/guilib/GUIEPGGridContainer.dox diff --git a/xbmc/pvr/windows/GUIEPGGridContainer.h b/xbmc/pvr/guilib/GUIEPGGridContainer.h index 38a40aee3c..38a40aee3c 100644 --- a/xbmc/pvr/windows/GUIEPGGridContainer.h +++ b/xbmc/pvr/guilib/GUIEPGGridContainer.h diff --git a/xbmc/pvr/windows/GUIEPGGridContainerModel.cpp b/xbmc/pvr/guilib/GUIEPGGridContainerModel.cpp index cde5801098..cde5801098 100644 --- a/xbmc/pvr/windows/GUIEPGGridContainerModel.cpp +++ b/xbmc/pvr/guilib/GUIEPGGridContainerModel.cpp diff --git a/xbmc/pvr/windows/GUIEPGGridContainerModel.h b/xbmc/pvr/guilib/GUIEPGGridContainerModel.h index e9dec73c46..e9dec73c46 100644 --- a/xbmc/pvr/windows/GUIEPGGridContainerModel.h +++ b/xbmc/pvr/guilib/GUIEPGGridContainerModel.h diff --git a/xbmc/pvr/PVRActionListener.cpp b/xbmc/pvr/guilib/PVRGUIActionListener.cpp index 3417310db3..9121a2316d 100644 --- a/xbmc/pvr/PVRActionListener.cpp +++ b/xbmc/pvr/guilib/PVRGUIActionListener.cpp @@ -6,7 +6,7 @@ * See LICENSES/README.md for more information. */ -#include "PVRActionListener.h" +#include "PVRGUIActionListener.h" #include "Application.h" #include "ServiceBroker.h" @@ -17,7 +17,6 @@ #include "input/actions/Action.h" #include "input/actions/ActionIDs.h" #include "messaging/ApplicationMessenger.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" #include "pvr/PVRPlaybackState.h" #include "pvr/addons/PVRClients.h" @@ -25,6 +24,7 @@ #include "pvr/channels/PVRChannelGroup.h" #include "pvr/channels/PVRChannelGroups.h" #include "pvr/channels/PVRChannelGroupsContainer.h" +#include "pvr/guilib/PVRGUIActions.h" #include "settings/Settings.h" #include "settings/SettingsComponent.h" #include "settings/lib/Setting.h" @@ -35,7 +35,7 @@ namespace PVR { -CPVRActionListener::CPVRActionListener() +CPVRGUIActionListener::CPVRGUIActionListener() { g_application.RegisterActionListener(this); CServiceBroker::GetSettingsComponent()->GetSettings()->RegisterCallback(this, { @@ -52,23 +52,23 @@ CPVRActionListener::CPVRActionListener() }); } -CPVRActionListener::~CPVRActionListener() +CPVRGUIActionListener::~CPVRGUIActionListener() { CServiceBroker::GetSettingsComponent()->GetSettings()->UnregisterCallback(this); g_application.UnregisterActionListener(this); } -void CPVRActionListener::Init(CPVRManager& mgr) +void CPVRGUIActionListener::Init(CPVRManager& mgr) { - mgr.Events().Subscribe(this, &CPVRActionListener::OnPVRManagerEvent); + mgr.Events().Subscribe(this, &CPVRGUIActionListener::OnPVRManagerEvent); } -void CPVRActionListener::Deinit(CPVRManager& mgr) +void CPVRGUIActionListener::Deinit(CPVRManager& mgr) { mgr.Events().Unsubscribe(this); } -void CPVRActionListener::OnPVRManagerEvent(const PVREvent& event) +void CPVRGUIActionListener::OnPVRManagerEvent(const PVREvent& event) { if (event == PVREvent::AnnounceReminder) { @@ -79,7 +79,7 @@ void CPVRActionListener::OnPVRManagerEvent(const PVREvent& event) } } -ChannelSwitchMode CPVRActionListener::GetChannelSwitchMode(int iAction) +ChannelSwitchMode CPVRGUIActionListener::GetChannelSwitchMode(int iAction) { if ((iAction == ACTION_MOVE_UP || iAction == ACTION_MOVE_DOWN) && CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(CSettings::SETTING_PVRPLAYBACK_CONFIRMCHANNELSWITCH)) @@ -88,7 +88,7 @@ ChannelSwitchMode CPVRActionListener::GetChannelSwitchMode(int iAction) return ChannelSwitchMode::INSTANT_OR_DELAYED_SWITCH; } -bool CPVRActionListener::OnAction(const CAction& action) +bool CPVRGUIActionListener::OnAction(const CAction& action) { bool bIsJumpSMS = false; bool bIsPlayingPVR = CServiceBroker::GetPVRManager().PlaybackState()->IsPlaying() && @@ -271,7 +271,7 @@ bool CPVRActionListener::OnAction(const CAction& action) return false; } -void CPVRActionListener::OnSettingChanged(std::shared_ptr<const CSetting> setting) +void CPVRGUIActionListener::OnSettingChanged(std::shared_ptr<const CSetting> setting) { if (setting == nullptr) return; @@ -296,7 +296,7 @@ void CPVRActionListener::OnSettingChanged(std::shared_ptr<const CSetting> settin } } -void CPVRActionListener::OnSettingAction(std::shared_ptr<const CSetting> setting) +void CPVRGUIActionListener::OnSettingAction(std::shared_ptr<const CSetting> setting) { if (setting == nullptr) return; diff --git a/xbmc/pvr/PVRActionListener.h b/xbmc/pvr/guilib/PVRGUIActionListener.h index 19ff1bc9cd..f84ee97d1b 100644 --- a/xbmc/pvr/PVRActionListener.h +++ b/xbmc/pvr/guilib/PVRGUIActionListener.h @@ -18,11 +18,11 @@ class CPVRManager; enum class ChannelSwitchMode; enum class PVREvent; -class CPVRActionListener : public IActionListener, public ISettingCallback +class CPVRGUIActionListener : public IActionListener, public ISettingCallback { public: - CPVRActionListener(); - ~CPVRActionListener() override; + CPVRGUIActionListener(); + ~CPVRGUIActionListener() override; void Init(CPVRManager& mgr); void Deinit(CPVRManager& mgr); @@ -37,8 +37,8 @@ public: void OnPVRManagerEvent(const PVREvent& event); private: - CPVRActionListener(const CPVRActionListener&) = delete; - CPVRActionListener& operator=(const CPVRActionListener&) = delete; + CPVRGUIActionListener(const CPVRGUIActionListener&) = delete; + CPVRGUIActionListener& operator=(const CPVRGUIActionListener&) = delete; static ChannelSwitchMode GetChannelSwitchMode(int iAction); }; diff --git a/xbmc/pvr/PVRGUIActions.cpp b/xbmc/pvr/guilib/PVRGUIActions.cpp index e120bf9eca..e120bf9eca 100644 --- a/xbmc/pvr/PVRGUIActions.cpp +++ b/xbmc/pvr/guilib/PVRGUIActions.cpp diff --git a/xbmc/pvr/PVRGUIActions.h b/xbmc/pvr/guilib/PVRGUIActions.h index f2b72f1128..c4de9f48d5 100644 --- a/xbmc/pvr/PVRGUIActions.h +++ b/xbmc/pvr/guilib/PVRGUIActions.h @@ -9,8 +9,8 @@ #pragma once #include "pvr/PVRChannelNumberInputHandler.h" -#include "pvr/PVRGUIChannelNavigator.h" -#include "pvr/PVRSettings.h" +#include "pvr/guilib/PVRGUIChannelNavigator.h" +#include "pvr/settings/PVRSettings.h" #include "threads/CriticalSection.h" #include <memory> diff --git a/xbmc/pvr/PVRGUIChannelIconUpdater.cpp b/xbmc/pvr/guilib/PVRGUIChannelIconUpdater.cpp index 533a7e97f3..93599dcb33 100644 --- a/xbmc/pvr/PVRGUIChannelIconUpdater.cpp +++ b/xbmc/pvr/guilib/PVRGUIChannelIconUpdater.cpp @@ -14,9 +14,9 @@ #include "filesystem/Directory.h" #include "filesystem/File.h" #include "guilib/LocalizeStrings.h" -#include "pvr/PVRGUIProgressHandler.h" #include "pvr/channels/PVRChannel.h" #include "pvr/channels/PVRChannelGroup.h" +#include "pvr/guilib/PVRGUIProgressHandler.h" #include "settings/AdvancedSettings.h" #include "settings/Settings.h" #include "settings/SettingsComponent.h" diff --git a/xbmc/pvr/PVRGUIChannelIconUpdater.h b/xbmc/pvr/guilib/PVRGUIChannelIconUpdater.h index d64a41ffe4..d64a41ffe4 100644 --- a/xbmc/pvr/PVRGUIChannelIconUpdater.h +++ b/xbmc/pvr/guilib/PVRGUIChannelIconUpdater.h diff --git a/xbmc/pvr/PVRGUIChannelNavigator.cpp b/xbmc/pvr/guilib/PVRGUIChannelNavigator.cpp index 689aae60c3..ea5e603e63 100644 --- a/xbmc/pvr/PVRGUIChannelNavigator.cpp +++ b/xbmc/pvr/guilib/PVRGUIChannelNavigator.cpp @@ -12,10 +12,10 @@ #include "GUIInfoManager.h" #include "ServiceBroker.h" #include "guilib/GUIComponent.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" #include "pvr/PVRPlaybackState.h" #include "pvr/channels/PVRChannelGroup.h" +#include "pvr/guilib/PVRGUIActions.h" #include "settings/Settings.h" #include "settings/SettingsComponent.h" #include "threads/SingleLock.h" diff --git a/xbmc/pvr/PVRGUIChannelNavigator.h b/xbmc/pvr/guilib/PVRGUIChannelNavigator.h index 3d1cb1b959..3d1cb1b959 100644 --- a/xbmc/pvr/PVRGUIChannelNavigator.h +++ b/xbmc/pvr/guilib/PVRGUIChannelNavigator.h diff --git a/xbmc/pvr/PVRGUIProgressHandler.cpp b/xbmc/pvr/guilib/PVRGUIProgressHandler.cpp index a4316a40d2..a4316a40d2 100644 --- a/xbmc/pvr/PVRGUIProgressHandler.cpp +++ b/xbmc/pvr/guilib/PVRGUIProgressHandler.cpp diff --git a/xbmc/pvr/PVRGUIProgressHandler.h b/xbmc/pvr/guilib/PVRGUIProgressHandler.h index 8c7d297664..8c7d297664 100644 --- a/xbmc/pvr/PVRGUIProgressHandler.h +++ b/xbmc/pvr/guilib/PVRGUIProgressHandler.h diff --git a/xbmc/pvr/guilib/guiinfo/CMakeLists.txt b/xbmc/pvr/guilib/guiinfo/CMakeLists.txt new file mode 100644 index 0000000000..18491ee94a --- /dev/null +++ b/xbmc/pvr/guilib/guiinfo/CMakeLists.txt @@ -0,0 +1,9 @@ +set(SOURCES PVRGUIInfo.cpp + PVRGUITimerInfo.cpp + PVRGUITimesInfo.cpp) + +set(HEADERS PVRGUIInfo.h + PVRGUITimerInfo.h + PVRGUITimesInfo.h) + +core_add_library(pvr_guilib_guiinfo) diff --git a/xbmc/pvr/PVRGUIInfo.cpp b/xbmc/pvr/guilib/guiinfo/PVRGUIInfo.cpp index 87fd7ab3e4..4e564ad16e 100644 --- a/xbmc/pvr/PVRGUIInfo.cpp +++ b/xbmc/pvr/guilib/guiinfo/PVRGUIInfo.cpp @@ -16,7 +16,6 @@ #include "guilib/LocalizeStrings.h" #include "guilib/guiinfo/GUIInfo.h" #include "guilib/guiinfo/GUIInfoLabels.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRItem.h" #include "pvr/PVRManager.h" #include "pvr/PVRPlaybackState.h" @@ -27,6 +26,7 @@ #include "pvr/channels/PVRChannelGroupsContainer.h" #include "pvr/channels/PVRRadioRDSInfoTag.h" #include "pvr/epg/EpgInfoTag.h" +#include "pvr/guilib/PVRGUIActions.h" #include "pvr/recordings/PVRRecording.h" #include "pvr/recordings/PVRRecordings.h" #include "pvr/timers/PVRTimerInfoTag.h" diff --git a/xbmc/pvr/PVRGUIInfo.h b/xbmc/pvr/guilib/guiinfo/PVRGUIInfo.h index 7bebcdfe50..43c362752d 100644 --- a/xbmc/pvr/PVRGUIInfo.h +++ b/xbmc/pvr/guilib/guiinfo/PVRGUIInfo.h @@ -10,9 +10,9 @@ #include "addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h" #include "guilib/guiinfo/GUIInfoProvider.h" -#include "pvr/PVRGUITimerInfo.h" -#include "pvr/PVRGUITimesInfo.h" #include "pvr/addons/PVRClients.h" +#include "pvr/guilib/guiinfo/PVRGUITimerInfo.h" +#include "pvr/guilib/guiinfo/PVRGUITimesInfo.h" #include "threads/CriticalSection.h" #include "threads/Thread.h" diff --git a/xbmc/pvr/PVRGUITimerInfo.cpp b/xbmc/pvr/guilib/guiinfo/PVRGUITimerInfo.cpp index 43cf52bd2c..43cf52bd2c 100644 --- a/xbmc/pvr/PVRGUITimerInfo.cpp +++ b/xbmc/pvr/guilib/guiinfo/PVRGUITimerInfo.cpp diff --git a/xbmc/pvr/PVRGUITimerInfo.h b/xbmc/pvr/guilib/guiinfo/PVRGUITimerInfo.h index 9ebc4454b5..9ebc4454b5 100644 --- a/xbmc/pvr/PVRGUITimerInfo.h +++ b/xbmc/pvr/guilib/guiinfo/PVRGUITimerInfo.h diff --git a/xbmc/pvr/PVRGUITimesInfo.cpp b/xbmc/pvr/guilib/guiinfo/PVRGUITimesInfo.cpp index b6ecbd2db9..b6ecbd2db9 100644 --- a/xbmc/pvr/PVRGUITimesInfo.cpp +++ b/xbmc/pvr/guilib/guiinfo/PVRGUITimesInfo.cpp diff --git a/xbmc/pvr/PVRGUITimesInfo.h b/xbmc/pvr/guilib/guiinfo/PVRGUITimesInfo.h index a516e55968..a516e55968 100644 --- a/xbmc/pvr/PVRGUITimesInfo.h +++ b/xbmc/pvr/guilib/guiinfo/PVRGUITimesInfo.h diff --git a/xbmc/pvr/settings/CMakeLists.txt b/xbmc/pvr/settings/CMakeLists.txt new file mode 100644 index 0000000000..6b32503a69 --- /dev/null +++ b/xbmc/pvr/settings/CMakeLists.txt @@ -0,0 +1,5 @@ +set(SOURCES PVRSettings.cpp) + +set(HEADERS PVRSettings.h) + +core_add_library(pvr_settings) diff --git a/xbmc/pvr/PVRSettings.cpp b/xbmc/pvr/settings/PVRSettings.cpp index 0297537f85..0c957c112f 100644 --- a/xbmc/pvr/PVRSettings.cpp +++ b/xbmc/pvr/settings/PVRSettings.cpp @@ -10,9 +10,9 @@ #include "ServiceBroker.h" #include "guilib/LocalizeStrings.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" #include "pvr/addons/PVRClients.h" +#include "pvr/guilib/PVRGUIActions.h" #include "settings/Settings.h" #include "settings/SettingsComponent.h" #include "settings/lib/SettingsManager.h" diff --git a/xbmc/pvr/PVRSettings.h b/xbmc/pvr/settings/PVRSettings.h index 38770b54fc..38770b54fc 100644 --- a/xbmc/pvr/PVRSettings.h +++ b/xbmc/pvr/settings/PVRSettings.h diff --git a/xbmc/pvr/timers/PVRTimers.h b/xbmc/pvr/timers/PVRTimers.h index 03f8385d0c..8e4a6a16ad 100644 --- a/xbmc/pvr/timers/PVRTimers.h +++ b/xbmc/pvr/timers/PVRTimers.h @@ -9,7 +9,7 @@ #pragma once #include "XBDateTime.h" -#include "pvr/PVRSettings.h" +#include "pvr/settings/PVRSettings.h" #include "threads/Thread.h" #include <map> diff --git a/xbmc/pvr/windows/CMakeLists.txt b/xbmc/pvr/windows/CMakeLists.txt index a4d94ebeee..9f5097ea72 100644 --- a/xbmc/pvr/windows/CMakeLists.txt +++ b/xbmc/pvr/windows/CMakeLists.txt @@ -6,9 +6,7 @@ set(SOURCES GUIViewStatePVR.cpp GUIWindowPVRSearch.cpp GUIWindowPVRTimers.cpp GUIWindowPVRTimersBase.cpp - GUIWindowPVRTimerRules.cpp - GUIEPGGridContainer.cpp - GUIEPGGridContainerModel.cpp) + GUIWindowPVRTimerRules.cpp) set(HEADERS GUIViewStatePVR.h GUIWindowPVRBase.h @@ -18,8 +16,6 @@ set(HEADERS GUIViewStatePVR.h GUIWindowPVRSearch.h GUIWindowPVRTimerRules.h GUIWindowPVRTimers.h - GUIWindowPVRTimersBase.h - GUIEPGGridContainer.h - GUIEPGGridContainerModel.h) + GUIWindowPVRTimersBase.h) core_add_library(pvr_windows) diff --git a/xbmc/pvr/windows/GUIWindowPVRBase.cpp b/xbmc/pvr/windows/GUIWindowPVRBase.cpp index b7a8495a21..5800f9d2c3 100644 --- a/xbmc/pvr/windows/GUIWindowPVRBase.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRBase.cpp @@ -22,13 +22,13 @@ #include "input/actions/ActionIDs.h" #include "messaging/ApplicationMessenger.h" #include "messaging/helpers/DialogOKHelper.h" -#include "pvr/PVRGUIActions.h" -#include "pvr/PVRGUIDirectory.h" #include "pvr/PVRManager.h" #include "pvr/PVRPlaybackState.h" #include "pvr/channels/PVRChannelGroup.h" #include "pvr/channels/PVRChannelGroups.h" #include "pvr/channels/PVRChannelGroupsContainer.h" +#include "pvr/filesystem/PVRGUIDirectory.h" +#include "pvr/guilib/PVRGUIActions.h" #include "utils/Variant.h" #include "utils/log.h" diff --git a/xbmc/pvr/windows/GUIWindowPVRChannels.cpp b/xbmc/pvr/windows/GUIWindowPVRChannels.cpp index 755b51a03d..bb188117b6 100644 --- a/xbmc/pvr/windows/GUIWindowPVRChannels.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRChannels.cpp @@ -22,7 +22,6 @@ #include "guilib/LocalizeStrings.h" #include "input/Key.h" #include "input/actions/Action.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" #include "pvr/channels/PVRChannel.h" #include "pvr/channels/PVRChannelGroup.h" @@ -32,6 +31,7 @@ #include "pvr/dialogs/GUIDialogPVRGroupManager.h" #include "pvr/epg/Epg.h" #include "pvr/epg/EpgContainer.h" +#include "pvr/guilib/PVRGUIActions.h" #include "threads/SingleLock.h" #include "utils/StringUtils.h" #include "utils/Variant.h" diff --git a/xbmc/pvr/windows/GUIWindowPVRGuide.cpp b/xbmc/pvr/windows/GUIWindowPVRGuide.cpp index 0e20fddf49..f0b51ea413 100644 --- a/xbmc/pvr/windows/GUIWindowPVRGuide.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRGuide.cpp @@ -22,7 +22,6 @@ #include "input/actions/ActionIDs.h" #include "messaging/ApplicationMessenger.h" #include "messaging/helpers/DialogHelper.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" #include "pvr/PVRPlaybackState.h" #include "pvr/channels/PVRChannel.h" @@ -31,9 +30,10 @@ #include "pvr/epg/EpgChannelData.h" #include "pvr/epg/EpgContainer.h" #include "pvr/epg/EpgInfoTag.h" +#include "pvr/guilib/GUIEPGGridContainer.h" +#include "pvr/guilib/PVRGUIActions.h" #include "pvr/recordings/PVRRecordings.h" #include "pvr/timers/PVRTimers.h" -#include "pvr/windows/GUIEPGGridContainer.h" #include "settings/Settings.h" #include "settings/SettingsComponent.h" #include "threads/SingleLock.h" diff --git a/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp b/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp index 1e4f0733a1..86a6560d04 100644 --- a/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp @@ -17,8 +17,8 @@ #include "guilib/LocalizeStrings.h" #include "input/actions/Action.h" #include "input/actions/ActionIDs.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" +#include "pvr/guilib/PVRGUIActions.h" #include "pvr/recordings/PVRRecording.h" #include "pvr/recordings/PVRRecordings.h" #include "pvr/recordings/PVRRecordingsPath.h" diff --git a/xbmc/pvr/windows/GUIWindowPVRRecordings.h b/xbmc/pvr/windows/GUIWindowPVRRecordings.h index fdb4657116..b432123acf 100644 --- a/xbmc/pvr/windows/GUIWindowPVRRecordings.h +++ b/xbmc/pvr/windows/GUIWindowPVRRecordings.h @@ -9,7 +9,7 @@ #pragma once #include "dialogs/GUIDialogContextMenu.h" -#include "pvr/PVRSettings.h" +#include "pvr/settings/PVRSettings.h" #include "pvr/windows/GUIWindowPVRBase.h" #include "video/VideoDatabase.h" #include "video/VideoThumbLoader.h" diff --git a/xbmc/pvr/windows/GUIWindowPVRSearch.cpp b/xbmc/pvr/windows/GUIWindowPVRSearch.cpp index 83ae4f2c4a..3b02ecec04 100644 --- a/xbmc/pvr/windows/GUIWindowPVRSearch.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRSearch.cpp @@ -17,13 +17,13 @@ #include "guilib/LocalizeStrings.h" #include "input/actions/ActionIDs.h" #include "messaging/helpers/DialogOKHelper.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRItem.h" #include "pvr/PVRManager.h" #include "pvr/dialogs/GUIDialogPVRGuideSearch.h" #include "pvr/epg/EpgContainer.h" #include "pvr/epg/EpgInfoTag.h" #include "pvr/epg/EpgSearchFilter.h" +#include "pvr/guilib/PVRGUIActions.h" #include "pvr/recordings/PVRRecording.h" #include "threads/IRunnable.h" #include "utils/URIUtils.h" diff --git a/xbmc/pvr/windows/GUIWindowPVRTimersBase.cpp b/xbmc/pvr/windows/GUIWindowPVRTimersBase.cpp index 43869b72f3..c129316cbb 100644 --- a/xbmc/pvr/windows/GUIWindowPVRTimersBase.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRTimersBase.cpp @@ -15,8 +15,8 @@ #include "guilib/GUIMessage.h" #include "input/actions/Action.h" #include "input/actions/ActionIDs.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" +#include "pvr/guilib/PVRGUIActions.h" #include "pvr/timers/PVRTimerInfoTag.h" #include "pvr/timers/PVRTimersPath.h" #include "settings/Settings.h" diff --git a/xbmc/windows/GUIWindowLoginScreen.cpp b/xbmc/windows/GUIWindowLoginScreen.cpp index 1e34d44bff..db27d59869 100644 --- a/xbmc/windows/GUIWindowLoginScreen.cpp +++ b/xbmc/windows/GUIWindowLoginScreen.cpp @@ -24,8 +24,8 @@ #include "profiles/Profile.h" #include "profiles/ProfileManager.h" #include "profiles/dialogs/GUIDialogProfileSettings.h" -#include "pvr/PVRGUIActions.h" #include "pvr/PVRManager.h" +#include "pvr/guilib/PVRGUIActions.h" #include "settings/Settings.h" #include "settings/SettingsComponent.h" #include "utils/StringUtils.h" |