Merge pull request #10560 from tamland/splash_text_pt2

splash text improvements
xbmc · Sep 28, 2016 · 31886da · 31886da
2 parents f75cc2c + 32554c2
commit 31886da
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -1142,9 +1142,10 @@ bool CApplication::Initialize()
 
     g_windowManager.CreateWindows();
 
-    CSplash::GetInstance().Show(g_localizeStrings.Get(24151));
     m_confirmSkinChange = false;
-    m_incompatibleAddons = CAddonSystemSettings::GetInstance().MigrateAddons();
+    m_incompatibleAddons = CAddonSystemSettings::GetInstance().MigrateAddons([](){
+      CSplash::GetInstance().Show(g_localizeStrings.Get(24151));
+    });
     m_confirmSkinChange = true;
     CSplash::GetInstance().Show();
 

diff --git a/xbmc/addons/AddonSystemSettings.cpp b/xbmc/addons/AddonSystemSettings.cpp
@@ -126,7 +126,7 @@ bool CAddonSystemSettings::UnsetActive(const AddonPtr& addon)
 }
 
 
-std::vector<std::string> CAddonSystemSettings::MigrateAddons()
+std::vector<std::string> CAddonSystemSettings::MigrateAddons(std::function<void(void)> onMigrate)
 {
   auto getIncompatible = [](){
     VECADDONS incompatible;
@@ -141,6 +141,8 @@ std::vector<std::string> CAddonSystemSettings::MigrateAddons()
 
   if (CSettings::GetInstance().GetInt(CSettings::SETTING_ADDONS_AUTOUPDATES) == AUTO_UPDATES_ON)
   {
+    onMigrate();
+
     if (CRepositoryUpdater::GetInstance().CheckForUpdates())
       CRepositoryUpdater::GetInstance().Await();
 

diff --git a/xbmc/addons/AddonSystemSettings.h b/xbmc/addons/AddonSystemSettings.h
@@ -21,6 +21,7 @@
 
 #include "addons/IAddon.h"
 #include "settings/lib/ISettingCallback.h"
+#include <functional>
 #include <string>
 
 namespace ADDON
@@ -48,9 +49,12 @@ class CAddonSystemSettings : public ISettingCallback
   bool UnsetActive(const AddonPtr& addon);
 
   /*!
-   * Attempt to migrate installed addons. Returns a list of addons that was modified.
+   * Check compatibility of installed addons and attempt to migrate.
+   *
+   * @param onMigrate Called when a long running migration task takes place.
+   * @return list of addons that was modified.
    */
-  std::vector<std::string> MigrateAddons();
+  std::vector<std::string> MigrateAddons(std::function<void(void)> onMigrate);
 
 private:
   CAddonSystemSettings();

diff --git a/xbmc/utils/Splash.cpp b/xbmc/utils/Splash.cpp
@@ -46,18 +46,18 @@ void CSplash::Show()
 
 void CSplash::Show(const std::string& message)
 {
-  if (g_advancedSettings.m_splashImage)
+  if (!g_advancedSettings.m_splashImage)
+    return;
+
+  if (!m_image)
   {
-    if (!m_image)
-    {
-      std::string splashImage = "special://home/media/Splash.png";
-      if (!XFILE::CFile::Exists(splashImage))
-        splashImage = "special://xbmc/media/Splash.png";
+    std::string splashImage = "special://home/media/Splash.png";
+    if (!XFILE::CFile::Exists(splashImage))
+      splashImage = "special://xbmc/media/Splash.png";
 
-      m_image = std::unique_ptr<CGUIImage>(new CGUIImage(0, 0, 0, 0, g_graphicsContext.GetWidth(),
-          g_graphicsContext.GetHeight(), CTextureInfo(splashImage)));
-      m_image->SetAspectRatio(CAspectRatio::AR_SCALE);
-    }
+    m_image = std::unique_ptr<CGUIImage>(new CGUIImage(0, 0, 0, 0, g_graphicsContext.GetWidth(),
+        g_graphicsContext.GetHeight(), CTextureInfo(splashImage)));
+    m_image->SetAspectRatio(CAspectRatio::AR_SCALE);
   }
 
   g_graphicsContext.Lock();
@@ -69,12 +69,9 @@ void CSplash::Show(const std::string& message)
   //render splash image
   g_Windowing.BeginRender();
 
-  if (m_image)
-  {
-    m_image->AllocResources();
-    m_image->Render();
-    m_image->FreeResources();
-  }
+  m_image->AllocResources();
+  m_image->Render();
+  m_image->FreeResources();
 
   if (!message.empty())
   {