[PVR] Add CPVRGUIActionsDatabase to PVR components.

5 files changed, 18 insertions, 8 deletions

diff --git a/xbmc/pvr/PVRComponentRegistration.cpp b/xbmc/pvr/PVRComponentRegistration.cpp
index 13d80e22d9..8661bb6684 100644
--- a/xbmc/pvr/PVRComponentRegistration.cpp
+++ b/xbmc/pvr/PVRComponentRegistration.cpp
@@ -10,6 +10,7 @@
 
 #include "pvr/guilib/PVRGUIActionsChannels.h"
 #include "pvr/guilib/PVRGUIActionsClients.h"
+#include "pvr/guilib/PVRGUIActionsDatabase.h"
 
 #include <memory>
 
@@ -19,10 +20,12 @@ CPVRComponentRegistration::CPVRComponentRegistration()
 {
   RegisterComponent(std::make_shared<CPVRGUIActionsChannels>());
   RegisterComponent(std::make_shared<CPVRGUIActionsClients>());
+  RegisterComponent(std::make_shared<CPVRGUIActionsDatabase>());
 }
 
 CPVRComponentRegistration::~CPVRComponentRegistration()
 {
+  DeregisterComponent(typeid(CPVRGUIActionsDatabase));
   DeregisterComponent(typeid(CPVRGUIActionsClients));
   DeregisterComponent(typeid(CPVRGUIActionsChannels));
 }
diff --git a/xbmc/pvr/guilib/PVRGUIActionListener.cpp b/xbmc/pvr/guilib/PVRGUIActionListener.cpp
index 10fa783bd5..dcfcb1323f 100644
--- a/xbmc/pvr/guilib/PVRGUIActionListener.cpp
+++ b/xbmc/pvr/guilib/PVRGUIActionListener.cpp
@@ -27,6 +27,7 @@
 #include "pvr/guilib/PVRGUIActions.h"
 #include "pvr/guilib/PVRGUIActionsChannels.h"
 #include "pvr/guilib/PVRGUIActionsClients.h"
+#include "pvr/guilib/PVRGUIActionsDatabase.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
 #include "settings/lib/Setting.h"
@@ -335,11 +336,11 @@ void CPVRGUIActionListener::OnSettingAction(const std::shared_ptr<const CSetting
   const std::string& settingId = setting->GetId();
   if (settingId == CSettings::SETTING_PVRMANAGER_RESETDB)
   {
-    CServiceBroker::GetPVRManager().GUIActions()->ResetPVRDatabase(false);
+    CServiceBroker::GetPVRManager().Get<PVR::GUI::Database>().ResetDatabase(false);
   }
   else if (settingId == CSettings::SETTING_EPG_RESETEPG)
   {
-    CServiceBroker::GetPVRManager().GUIActions()->ResetPVRDatabase(true);
+    CServiceBroker::GetPVRManager().Get<PVR::GUI::Database>().ResetDatabase(true);
   }
   else if (settingId == CSettings::SETTING_PVRMANAGER_CLIENTPRIORITIES)
   {
diff --git a/xbmc/pvr/guilib/PVRGUIActions.h b/xbmc/pvr/guilib/PVRGUIActions.h
index 6d7821b0c2..4ca03503de 100644
--- a/xbmc/pvr/guilib/PVRGUIActions.h
+++ b/xbmc/pvr/guilib/PVRGUIActions.h
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "pvr/guilib/PVRGUIActionsDatabase.h"
 #include "pvr/guilib/PVRGUIActionsEPG.h"
 #include "pvr/guilib/PVRGUIActionsParentalControl.h"
 #include "pvr/guilib/PVRGUIActionsPlayback.h"
@@ -19,8 +18,7 @@
 
 namespace PVR
 {
-class CPVRGUIActions : public CPVRGUIActionsDatabase,
-                       public CPVRGUIActionsEPG,
+class CPVRGUIActions : public CPVRGUIActionsEPG,
                        public CPVRGUIActionsParentalControl,
                        public CPVRGUIActionsPlayback,
                        public CPVRGUIActionsPowerManagement,
diff --git a/xbmc/pvr/guilib/PVRGUIActionsDatabase.cpp b/xbmc/pvr/guilib/PVRGUIActionsDatabase.cpp
index 4e9d05842b..0f63b210cc 100644
--- a/xbmc/pvr/guilib/PVRGUIActionsDatabase.cpp
+++ b/xbmc/pvr/guilib/PVRGUIActionsDatabase.cpp
@@ -153,7 +153,7 @@ private:
 
 } // unnamed namespace
 
-bool CPVRGUIActionsDatabase::ResetPVRDatabase(bool bResetEPGOnly)
+bool CPVRGUIActionsDatabase::ResetDatabase(bool bResetEPGOnly)
 {
   CGUIDialogProgress* pDlgProgress =
       CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogProgress>(
diff --git a/xbmc/pvr/guilib/PVRGUIActionsDatabase.h b/xbmc/pvr/guilib/PVRGUIActionsDatabase.h
index a5592233fa..f4d807fe77 100644
--- a/xbmc/pvr/guilib/PVRGUIActionsDatabase.h
+++ b/xbmc/pvr/guilib/PVRGUIActionsDatabase.h
@@ -8,9 +8,11 @@
 
 #pragma once
 
+#include "pvr/IPVRComponent.h"
+
 namespace PVR
 {
-class CPVRGUIActionsDatabase
+class CPVRGUIActionsDatabase : public IPVRComponent
 {
 public:
   CPVRGUIActionsDatabase() = default;
@@ -22,11 +24,17 @@ public:
    * database.
    * @return true on success, false otherwise.
    */
-  bool ResetPVRDatabase(bool bResetEPGOnly);
+  bool ResetDatabase(bool bResetEPGOnly);
 
 private:
   CPVRGUIActionsDatabase(const CPVRGUIActionsDatabase&) = delete;
   CPVRGUIActionsDatabase const& operator=(CPVRGUIActionsDatabase const&) = delete;
 };
 
+namespace GUI
+{
+// pretty scope and name
+using Database = CPVRGUIActionsDatabase;
+} // namespace GUI
+
 } // namespace PVR