Merge pull request #3819 from arnova/subtitles_for_stacks

changed: Add logic to handle subtitles for stacked files

diff --combined xbmc/Application.cpp
index e851294,c3797f7..d310d47
--- 1/xbmc/Application.cpp
--- 2/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@@ -2630,8 -2630,7 +2630,8 @@@ bool CApplication::OnAction(const CActi
  
    // Now check with the player if action can be handled.
    if (g_windowManager.GetActiveWindow() == WINDOW_FULLSCREEN_VIDEO ||
 -      (g_windowManager.GetActiveWindow() == WINDOW_DIALOG_VIDEO_OSD && (action.GetID() == ACTION_NEXT_ITEM || action.GetID() == ACTION_PREV_ITEM || action.GetID() == ACTION_CHANNEL_UP || action.GetID() == ACTION_CHANNEL_DOWN)))
 +      (g_windowManager.GetActiveWindow() == WINDOW_DIALOG_VIDEO_OSD && (action.GetID() == ACTION_NEXT_ITEM || action.GetID() == ACTION_PREV_ITEM || action.GetID() == ACTION_CHANNEL_UP || action.GetID() == ACTION_CHANNEL_DOWN)) ||
 +      action.GetID() == ACTION_STOP)
    {
      if (m_pPlayer->OnAction(action))
        return true;
@@@ -3479,13 -3478,13 +3479,13 @@@ void CApplication::Stop(int exitCode
  
      CApplicationMessenger::Get().Cleanup();
  
 +    CLog::Log(LOGNOTICE, "stop player");
 +    m_pPlayer->ClosePlayer();
 +
      StopPVRManager();
      StopServices();
      //Sleep(5000);
  
 -    CLog::Log(LOGNOTICE, "stop player");
 -    m_pPlayer->ClosePlayer();
 -
  #if HAS_FILESYTEM_DAAP
      CLog::Log(LOGNOTICE, "stop daap clients");
      g_DaapClient.Release();
@@@ -4518,17 -4517,14 +4518,17 @@@ bool CApplication::WakeUpScreenSaver(bo
      m_iScreenSaveLock = 0;
      ResetScreenSaverTimer();
  
 -    if (m_screenSaver->ID() == "screensaver.xbmc.builtin.dim" || m_screenSaver->ID() == "screensaver.xbmc.builtin.black" || m_screenSaver->ID().empty())
 +    if (m_screenSaver->ID() == "visualization")
 +    {
 +      // we can just continue as usual from vis mode
 +      return false;
 +    }
 +    else if (m_screenSaver->ID() == "screensaver.xbmc.builtin.dim" || m_screenSaver->ID() == "screensaver.xbmc.builtin.black" || m_screenSaver->ID().empty())
        return true;
      else if (!m_screenSaver->ID().empty())
      { // we're in screensaver window
 -      if (g_windowManager.GetActiveWindow() == WINDOW_SCREENSAVER
 -          || g_windowManager.GetActiveWindow() == WINDOW_VISUALISATION)
 +      if (g_windowManager.GetActiveWindow() == WINDOW_SCREENSAVER)
          g_windowManager.PreviousWindow();  // show the previous window
 -
        if (g_windowManager.GetActiveWindow() == WINDOW_SLIDESHOW)
          CApplicationMessenger::Get().SendAction(CAction(ACTION_STOP), WINDOW_SLIDESHOW);
      }
@@@ -4599,12 -4595,6 +4599,12 @@@ void CApplication::CheckScreenSaverAndD
  // the type of screensaver displayed
  void CApplication::ActivateScreenSaver(bool forceType /*= false */)
  {
 +  if (m_pPlayer->IsPlayingAudio() && CSettings::Get().GetBool("screensaver.usemusicvisinstead") && !CSettings::Get().GetString("musicplayer.visualisation").empty())
 +  { // just activate the visualisation if user toggled the usemusicvisinstead option
 +    g_windowManager.ActivateWindow(WINDOW_VISUALISATION);
 +    return;
 +  }
 +
    m_bScreenSave = true;
  
    // Get Screensaver Mode
@@@ -4624,6 -4614,15 +4624,6 @@@
        if (!CAddonMgr::Get().GetAddon("screensaver.xbmc.builtin.dim", m_screenSaver))
          m_screenSaver.reset(new CScreenSaver(""));
      }
 -    // Check if we are Playing Audio and Vis instead Screensaver!
 -    else if (m_pPlayer->IsPlayingAudio() && CSettings::Get().GetBool("screensaver.usemusicvisinstead") && !CSettings::Get().GetString("musicplayer.visualisation").empty())
 -    { // activate the visualisation
 -      m_screenSaver.reset(new CScreenSaver("visualization"));
 -      // prevent music info popup if vis is already running
 -      if (g_windowManager.GetActiveWindow() != WINDOW_VISUALISATION)
 -        g_windowManager.ActivateWindow(WINDOW_VISUALISATION);
 -      return;
 -    }
    }
    if (m_screenSaver->ID() == "screensaver.xbmc.builtin.dim" || m_screenSaver->ID().empty())
      return;
@@@ -5129,7 -5128,6 +5129,7 @@@ void CApplication::ProcessSlow(
      CAddonInstaller::Get().UpdateRepos();
  
    CAEFactory::GarbageCollect();
 +
  }
  
  // Global Idle Time in Seconds
@@@ -5216,6 -5214,14 +5216,14 @@@ CFileItem& CApplication::CurrentFileIte
    return *m_itemCurrentFile;
  }
  
+ CFileItem& CApplication::CurrentUnstackedItem()
+ {
+   if (m_itemCurrentFile->IsStack() && m_currentStack->Size() > 0)
+     return *(*m_currentStack)[m_currentStackPosition];
+   else
+     return *m_itemCurrentFile;
+ }
+ 
  void CApplication::ShowVolumeBar(const CAction *action)
  {
    CGUIDialog *volumeBar = (CGUIDialog *)g_windowManager.GetWindow(WINDOW_DIALOG_VOLUME_BAR);

diff --combined xbmc/video/dialogs/GUIDialogSubtitles.cpp
index 6bf67a8,d4748b3..1be5b6b
--- 1/xbmc/video/dialogs/GUIDialogSubtitles.cpp
--- 2/xbmc/video/dialogs/GUIDialogSubtitles.cpp
+++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
@@@ -30,8 -30,6 +30,8 @@@
  #include "filesystem/PluginDirectory.h"
  #include "filesystem/SpecialProtocol.h"
  #include "guilib/GUIImage.h"
 +#include "guilib/GUIKeyboardFactory.h"
 +#include "guilib/Key.h"
  #include "settings/MediaSettings.h"
  #include "settings/Settings.h"
  #include "settings/VideoSettings.h"
@@@ -54,7 -52,6 +54,7 @@@ using namespace XFILE
  #define CONTROL_SUBSEXIST            130
  #define CONTROL_SUBSTATUS            140
  #define CONTROL_SERVICELIST          150
 +#define CONTROL_MANUALSEARCH         160
  
  /*! \brief simple job to retrieve a directory and store a string (language)
   */
@@@ -115,9 -112,7 +115,9 @@@ CGUIDialogSubtitles::~CGUIDialogSubtitl
  
  bool CGUIDialogSubtitles::OnMessage(CGUIMessage& message)
  {
 -  if  (message.GetMessage() == GUI_MSG_CLICKED)
 +  if  (message.GetMessage() == GUI_MSG_CLICKED &&
 +       (message.GetParam1() == ACTION_SELECT_ITEM ||
 +        message.GetParam1() == ACTION_MOUSE_LEFT_CLICK))
    {
      int iControl = message.GetSenderId();
  
@@@ -143,15 -138,6 +143,15 @@@
  
        return true;
      }
 +    else if (iControl == CONTROL_MANUALSEARCH)
 +    {
 +      //manual search
 +      if (CGUIKeyboardFactory::ShowAndGetInput(m_strManualSearch, g_localizeStrings.Get(24121), true))
 +      {
 +        Search(m_strManualSearch);
 +        return true;
 +      }
 +    }
    }
    else if (message.GetMessage() == GUI_MSG_WINDOW_DEINIT)
    {
@@@ -191,7 -177,7 +191,7 @@@ void CGUIDialogSubtitles::Process(unsig
      std::string status;
      CFileItemList subs;
      {
 -      CSingleLock lock(m_section);
 +      CSingleLock lock(m_critsection);
        status = m_status;
        subs.Assign(*m_subtitles);
      }
@@@ -236,7 -222,7 +236,7 @@@ void CGUIDialogSubtitles::FillServices(
    }
  
    std::string defaultService;
-   const CFileItem &item = g_application.CurrentFileItem();
+   const CFileItem &item = g_application.CurrentUnstackedItem();
    if (item.GetVideoContentType() == VIDEODB_CONTENT_TVSHOWS ||
        item.GetVideoContentType() == VIDEODB_CONTENT_EPISODES)
      // Set default service for tv shows
@@@ -304,7 -290,7 +304,7 @@@ const CFileItemPtr CGUIDialogSubtitles:
    return CFileItemPtr();
  }
  
 -void CGUIDialogSubtitles::Search()
 +void CGUIDialogSubtitles::Search(const std::string &search/*=""*/)
  {
    if (m_currentService.empty())
      return; // no services available
@@@ -313,13 -299,7 +313,13 @@@
    ClearSubtitles();
  
    CURL url("plugin://" + m_currentService + "/");
 -  url.SetOption("action", "search");
 +  if (!search.empty())
 +  {
 +    url.SetOption("action", "manualsearch");
 +    url.SetOption("searchstring", search);
 +  }
 +  else
 +    url.SetOption("action", "search");
  
    const CSetting *setting = CSettings::Get().GetSetting("subtitles.languages");
    if (setting)
@@@ -333,7 -313,7 +333,7 @@@ void CGUIDialogSubtitles::OnJobComplete
    const CURL &url             = ((CSubtitlesJob *)job)->GetURL();
    const CFileItemList *items  = ((CSubtitlesJob *)job)->GetItems();
    const std::string &language = ((CSubtitlesJob *)job)->GetLanguage();
 -  if (url.GetOption("action") == "search")
 +  if (url.GetOption("action") == "search" || url.GetOption("action") == "manualsearch")
      OnSearchComplete(items);
    else
      OnDownloadComplete(items, language);
@@@ -342,7 -322,7 +342,7 @@@
  
  void CGUIDialogSubtitles::OnSearchComplete(const CFileItemList *items)
  {
 -  CSingleLock lock(m_section);
 +  CSingleLock lock(m_critsection);
    m_subtitles->Assign(*items);
    UpdateStatus(SEARCH_COMPLETE);
    m_updateSubsList = true;
@@@ -351,7 -331,7 +351,7 @@@
  
  void CGUIDialogSubtitles::UpdateStatus(STATUS status)
  {
 -  CSingleLock lock(m_section);
 +  CSingleLock lock(m_critsection);
    std::string label;
    switch (status)
    {
@@@ -406,6 -386,8 +406,8 @@@ void CGUIDialogSubtitles::OnDownloadCom
  
    CStdString strFileName;
    CStdString strDestPath;
+ #if 0
+   // TODO: Code to download all subtitles for all stack items in one run
    if (g_application.CurrentFileItem().IsStack())
    {
      for (int i = 0; i < items->Size(); i++)
@@@ -414,17 -396,22 +416,22 @@@
  //    CLog::Log(LOGDEBUG, "Stack Subs [%s} Found", vecItems[i]->GetLabel().c_str());
      }
    }
-   else if (StringUtils::StartsWith(g_application.CurrentFile(), "http://"))
+ #endif
+ 
+   // Get (unstacked) path
+   const CStdString &strCurrentFile = g_application.CurrentUnstackedItem().GetPath();
+ 
+   if (StringUtils::StartsWith(strCurrentFile, "http://"))
    {
      strFileName = "TemporarySubs";
      strDestPath = "special://temp/";
    }
    else
    {
-     strFileName = URIUtils::GetFileName(g_application.CurrentFile());
+     strFileName = URIUtils::GetFileName(strCurrentFile);
      if (CSettings::Get().GetBool("subtitles.savetomoviefolder"))
      {
-       strDestPath = URIUtils::GetDirectory(g_application.CurrentFile());
+       strDestPath = URIUtils::GetDirectory(strCurrentFile);
        if (!CUtil::SupportsWriteFileOperations(strDestPath))
          strDestPath.clear();
      }
@@@ -471,7 -458,7 +478,7 @@@ void CGUIDialogSubtitles::ClearSubtitle
  {
    CGUIMessage msg(GUI_MSG_LABEL_RESET, GetID(), CONTROL_SUBLIST);
    OnMessage(msg);
 -  CSingleLock lock(m_section);
 +  CSingleLock lock(m_critsection);
    m_subtitles->Clear();
  }