Implement Prev/Next commands

FalconChristmas · Oct 27, 2018 · 452a5b3 · 452a5b3
1 parent 6cdc641
commit 452a5b3
Showing 1 changed file with 50 additions and 7 deletions.
diff --git a/src/playlist/Playlist.cpp b/src/playlist/Playlist.cpp
@@ -835,21 +835,64 @@ void Playlist::Dump(void)
  */
 void Playlist::NextItem(void)
 {
-	if (m_currentState == "idle")
+    if (m_currentState == "idle") {
 		return;
-
-	// FIXME PLAYLIST
+    }
+    if (FPPstatus != FPP_STATUS_PLAYLIST_PLAYING) {
+        return;
+    }
+
+    int pos = GetPosition() - 1;
+    if (m_currentSectionStr == "MainPlaylist") {
+        if (pos < (m_leadIn.size() + m_mainPlaylist.size())) {
+            pos++;
+        } else {
+            pos = m_leadIn.size();
+        }
+    }
+
+
+    std::string name = m_name;
+    std::string desc = m_desc;
+    int repeat = m_repeat;
+    StopNow();
+    m_absolutePosition = pos;
+    m_repeat = repeat;
+    m_desc = desc;
+    m_name = name;
+    Start();
 }
 
 /*
  *
  */
 void Playlist::PrevItem(void)
 {
-	if (m_currentState == "idle")
-		return;
-
-	// FIXME PLAYLIST
+    if (m_currentState == "idle") {
+        return;
+    }
+    if (FPPstatus != FPP_STATUS_PLAYLIST_PLAYING) {
+        return;
+    }
+
+    int pos = GetPosition() - 1;
+    if (m_currentSectionStr == "MainPlaylist") {
+        if (pos > m_leadIn.size()) {
+            pos--;
+        } else {
+            pos = m_leadIn.size() + m_mainPlaylist.size() - 1;
+        }
+    }
+
+    std::string name = m_name;
+    std::string desc = m_desc;
+    int repeat = m_repeat;
+    StopNow();
+    m_absolutePosition = pos;
+    m_repeat = repeat;
+    m_desc = desc;
+    m_name = name;
+    Start();
 }
 
 /*