Merge pull request xbmc#24291 from enen92/slideshow_delegator_design_…

…pattern

[Pictures] Implement Slideshow delegator design pattern

xbmc/ServiceBroker.cpp

@@ -271,6 +271,11 @@ CDatabaseManager& CServiceBroker::GetDatabaseManager()
   return g_application.m_ServiceManager->GetDatabaseManager();
 }
 
+CSlideShowDelegator& CServiceBroker::GetSlideShowDelegator()
+{
+  return g_application.m_ServiceManager->GetSlideShowDelegator();
+}
+
 CEventLog* CServiceBroker::GetEventLog()
 {
   if (!g_serviceBroker.m_pSettingsComponent)

xbmc/ServiceBroker.h

@@ -80,6 +80,7 @@ class CPlatform;
 class CTextureCache;
 class CJobManager;
 class CKeyboardLayoutManager;
+class CSlideShowDelegator;
 
 namespace WSDiscovery
 {
@@ -148,6 +149,7 @@ class CServiceBroker
   static CDataCacheCore& GetDataCacheCore();
   static CPlatform& GetPlatform();
   static PLAYLIST::CPlayListPlayer& GetPlaylistPlayer();
+  static CSlideShowDelegator& GetSlideShowDelegator();
   static KODI::GAME::CControllerManager& GetGameControllerManager();
   static KODI::GAME::CGameServices& GetGameServices();
   static KODI::RETRO::CGUIGameRenderManager& GetGameRenderManager();
@@ -235,6 +237,7 @@ class CServiceBroker
   std::shared_ptr<KODI::MESSAGING::CApplicationMessenger> m_appMessenger;
   std::shared_ptr<CKeyboardLayoutManager> m_keyboardLayoutManager;
   std::shared_ptr<speech::ISpeechRecognition> m_speechRecognition;
+  std::shared_ptr<CSlideShowDelegator> m_slideshowDelegator;
 };
 
 XBMC_GLOBAL_REF(CServiceBroker, g_serviceBroker);

xbmc/ServiceManager.cpp

@@ -43,6 +43,7 @@
 #if !defined(TARGET_WINDOWS) && defined(HAS_OPTICAL_DRIVE)
 #include "storage/DetectDVDType.h"
 #endif
+#include "pictures/SlideShowDelegator.h"
 #include "storage/MediaManager.h"
 #include "utils/FileExtensionProvider.h"
 #include "utils/log.h"
@@ -109,6 +110,7 @@ bool CServiceManager::InitStageOne()
 #endif
 
   m_playlistPlayer = std::make_unique<PLAYLIST::CPlayListPlayer>();
+  m_slideShowDelegator = std::make_unique<CSlideShowDelegator>();
 
   m_network = CNetworkBase::GetNetwork();
 
@@ -273,6 +275,7 @@ void CServiceManager::DeinitStageOne()
 
   m_network.reset();
   m_playlistPlayer.reset();
+  m_slideShowDelegator.reset();
 #ifdef HAS_PYTHON
   CScriptInvocationManager::GetInstance().UnregisterLanguageInvocationHandler(m_XBPython.get());
   m_XBPython.reset();
@@ -427,3 +430,8 @@ CMediaManager& CServiceManager::GetMediaManager()
 {
   return *m_mediaManager;
 }
+
+CSlideShowDelegator& CServiceManager::GetSlideShowDelegator()
+{
+  return *m_slideShowDelegator;
+}

xbmc/ServiceManager.h

@@ -48,6 +48,7 @@ class CNetworkBase;
 class CWinSystemBase;
 class CPowerManager;
 class CWeatherManager;
+class CSlideShowDelegator;
 
 namespace KODI
 {
@@ -127,6 +128,7 @@ class CServiceManager
   PERIPHERALS::CPeripherals& GetPeripherals();
 
   PLAYLIST::CPlayListPlayer& GetPlaylistPlayer();
+  CSlideShowDelegator& GetSlideShowDelegator();
   int init_level = 0;
 
   CFavouritesService& GetFavouritesService();
@@ -182,4 +184,5 @@ class CServiceManager
 #if !defined(TARGET_WINDOWS) && defined(HAS_OPTICAL_DRIVE)
   std::unique_ptr<MEDIA_DETECT::CDetectDVDMedia> m_DetectDVDType;
 #endif
+  std::unique_ptr<CSlideShowDelegator> m_slideShowDelegator;
 };

xbmc/application/Application.cpp

@@ -103,7 +103,7 @@
 #include "network/upnp/UPnP.h"
 #endif
 #include "peripherals/Peripherals.h"
-#include "pictures/GUIWindowSlideShow.h"
+#include "pictures/SlideShowDelegator.h"
 #include "platform/Environment.h"
 #include "playlists/PlayList.h"
 #include "playlists/PlayListFactory.h"
@@ -962,10 +962,9 @@ bool CApplication::OnAction(const CAction &action)
   // playing or ACTION_PLAYER_PLAY if we are seeking (FF/RW) or not playing.
   if (action.GetID() == ACTION_PLAYER_PLAYPAUSE)
   {
-    CGUIWindowSlideShow* pSlideShow = CServiceBroker::GetGUI()->
-                         GetWindowManager().GetWindow<CGUIWindowSlideShow>(WINDOW_SLIDESHOW);
+    CSlideShowDelegator& slideShow = CServiceBroker::GetSlideShowDelegator();
     if ((appPlayer->IsPlaying() && appPlayer->GetPlaySpeed() == 1) ||
-        (pSlideShow && pSlideShow->InSlideShow() && !pSlideShow->IsPaused()))
+        (slideShow.InSlideShow() && !slideShow.IsPaused()))
       return OnAction(CAction(ACTION_PAUSE));
     else
       return OnAction(CAction(ACTION_PLAYER_PLAY));
@@ -1636,8 +1635,7 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
 
   case TMSG_PICTURE_SHOW:
   {
-    CGUIWindowSlideShow *pSlideShow = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIWindowSlideShow>(WINDOW_SLIDESHOW);
-    if (!pSlideShow) return;
+    CSlideShowDelegator& slideShow = CServiceBroker::GetSlideShowDelegator();
 
     // stop playing file
     if (appPlayer->IsPlayingVideo())
@@ -1664,33 +1662,32 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
       CUtil::GetRecursiveListing(pathToUrl.Get(), items, CServiceBroker::GetFileExtensionProvider().GetPictureExtensions(), XFILE::DIR_FLAG_NO_FILE_DIRS);
       if (items.Size() > 0)
       {
-        pSlideShow->Reset();
+        slideShow.Reset();
         for (int i = 0; i<items.Size(); ++i)
         {
-          pSlideShow->Add(items[i].get());
+          slideShow.Add(items[i].get());
         }
-        pSlideShow->Select(items[0]->GetPath());
+        slideShow.Select(items[0]->GetPath());
       }
     }
     else
     {
       CFileItem item(pMsg->strParam, false);
-      pSlideShow->Reset();
-      pSlideShow->Add(&item);
-      pSlideShow->Select(pMsg->strParam);
+      slideShow.Reset();
+      slideShow.Add(&item);
+      slideShow.Select(pMsg->strParam);
     }
   }
   break;
 
   case TMSG_PICTURE_SLIDESHOW:
   {
-    CGUIWindowSlideShow *pSlideShow = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIWindowSlideShow>(WINDOW_SLIDESHOW);
-    if (!pSlideShow) return;
+    CSlideShowDelegator& slideShow = CServiceBroker::GetSlideShowDelegator();
 
     if (appPlayer->IsPlayingVideo())
       StopPlaying();
 
-    pSlideShow->Reset();
+    slideShow.Reset();
 
     CFileItemList items;
     std::string strPath = pMsg->strParam;
@@ -1702,8 +1699,8 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
     if (items.Size() > 0)
     {
       for (int i = 0; i<items.Size(); ++i)
-        pSlideShow->Add(items[i].get());
-      pSlideShow->StartSlideShow(); //Start the slideshow!
+        slideShow.Add(items[i].get());
+      slideShow.StartSlideShow(); //Start the slideshow!
     }
 
     if (CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() != WINDOW_SLIDESHOW)

xbmc/guilib/guiinfo/PicturesGUIInfo.cpp

@@ -15,8 +15,8 @@
 #include "guilib/GUIWindowManager.h"
 #include "guilib/guiinfo/GUIInfo.h"
 #include "guilib/guiinfo/GUIInfoLabels.h"
-#include "pictures/GUIWindowSlideShow.h"
 #include "pictures/PictureInfoTag.h"
+#include "pictures/SlideShowDelegator.h"
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
 #include "utils/log.h"
@@ -180,10 +180,10 @@ bool CPicturesGUIInfo::GetLabel(std::string& value, const CFileItem *item, int c
       }
       case SLIDESHOW_INDEX:
       {
-        CGUIWindowSlideShow *slideshow = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIWindowSlideShow>(WINDOW_SLIDESHOW);
-        if (slideshow && slideshow->NumSlides())
+        CSlideShowDelegator& slideshow = CServiceBroker::GetSlideShowDelegator();
+        if (slideshow.NumSlides() > 0)
         {
-          value = StringUtils::Format("{}/{}", slideshow->CurrentSlide(), slideshow->NumSlides());
+          value = StringUtils::Format("{}/{}", slideshow.CurrentSlide(), slideshow.NumSlides());
           return true;
         }
         break;
@@ -232,26 +232,26 @@ bool CPicturesGUIInfo::GetBool(bool& value, const CGUIListItem *gitem, int conte
     ///////////////////////////////////////////////////////////////////////////////////////////////
     case SLIDESHOW_ISPAUSED:
     {
-      CGUIWindowSlideShow *slideShow = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIWindowSlideShow>(WINDOW_SLIDESHOW);
-      value = (slideShow && slideShow->IsPaused());
+      CSlideShowDelegator& slideShow = CServiceBroker::GetSlideShowDelegator();
+      value = slideShow.IsPaused();
       return true;
     }
     case SLIDESHOW_ISRANDOM:
     {
-      CGUIWindowSlideShow *slideShow = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIWindowSlideShow>(WINDOW_SLIDESHOW);
-      value = (slideShow && slideShow->IsShuffled());
+      CSlideShowDelegator& slideShow = CServiceBroker::GetSlideShowDelegator();
+      value = slideShow.IsShuffled();
       return true;
     }
     case SLIDESHOW_ISACTIVE:
     {
-      CGUIWindowSlideShow *slideShow = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIWindowSlideShow>(WINDOW_SLIDESHOW);
-      value = (slideShow && slideShow->InSlideShow());
+      CSlideShowDelegator& slideShow = CServiceBroker::GetSlideShowDelegator();
+      value = slideShow.InSlideShow();
       return true;
     }
     case SLIDESHOW_ISVIDEO:
     {
-      CGUIWindowSlideShow *slideShow = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIWindowSlideShow>(WINDOW_SLIDESHOW);
-      value = (slideShow && slideShow->GetCurrentSlide() && slideShow->GetCurrentSlide()->IsVideo());
+      CSlideShowDelegator& slideShow = CServiceBroker::GetSlideShowDelegator();
+      value = slideShow.GetCurrentSlide() && slideShow.GetCurrentSlide()->IsVideo();
       return true;
     }
   }