Set direction to forward when starting a slideshow by action.

ulion · May 2, 2013 · cc769b0 · cc769b0
1 parent 010b3d5
commit cc769b0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/xbmc/pictures/GUIWindowSlideShow.cpp b/xbmc/pictures/GUIWindowSlideShow.cpp
@@ -388,6 +388,16 @@ void CGUIWindowSlideShow::StartSlideShow()
     AnnouncePlayerPlay(m_slides->Get(m_iCurrentSlide));
 }
 
+void CGUIWindowSlideShow::SetDirection(int direction)
+{
+  direction = direction >= 0 ? 1 : -1;
+  if (m_iDirection != direction)
+  {
+    m_iDirection = direction;
+    m_iNextSlide = GetNextSlide();
+  }
+}
+
 void CGUIWindowSlideShow::Process(unsigned int currentTime, CDirtyRegionList &regions)
 {
   // reset the screensaver if we're in a slideshow
@@ -830,14 +840,18 @@ bool CGUIWindowSlideShow::OnAction(const CAction &action)
       if (!m_bPlayingVideo)
       {
         if (m_bSlideShow)
+        {
+          SetDirection(1);
           m_bPause = false;
+        }
         PlayVideo();
       }
     }
     else if (!m_bSlideShow || m_bPause)
     {
       m_bSlideShow = true;
       m_bPause = false;
+      SetDirection(1);
       if (m_Image[m_iCurrentPic].IsLoaded())
       {
         CSlideShowPic::DISPLAY_EFFECT effect = GetDisplayEffect(m_iCurrentSlide);

diff --git a/xbmc/pictures/GUIWindowSlideShow.h b/xbmc/pictures/GUIWindowSlideShow.h
@@ -98,6 +98,7 @@ class CGUIWindowSlideShow : public CGUIWindow
   bool IsPaused() const { return m_bPause; }
   bool IsShuffled() const { return m_bShuffled; }
   int GetDirection() const { return m_iDirection; }
+  void SetDirection(int direction); // -1: rewind, 1: forward
 private:
   typedef std::set<CStdString> path_set;  // set to track which paths we're adding
   void AddItems(const CStdString &strPath, path_set *recursivePaths,