Fix false-positive error (Audio playback timeout)

changelog.md

@@ -2,6 +2,8 @@
 
 ## DEV-branch
 
+* 12.12.2023: Long press behaviour, execute cmd directly after longpress-time (#279), thanks to @Joe91 ! 
+* 12.12.2023: Fix false-positive error (Audio playback timeout)
 * 10.12.2023: Distribute vTaskDelay() in main loop to avoid rare audio dropouts
 * 10.12.2023: Fix wrong states on PE output pins (and SD-card failure on restart) #278, thanks to @36b6fp6s ! 
 * 09.12.2023: Fix webstream playlist abort when track fails (#276), thanks to @laszloh !

src/AudioPlayer.cpp

@@ -840,13 +840,19 @@ void AudioPlayer_Task(void *parameter) {
 		}
 
 		// If error occured: move to the next track in the playlist
-		if (gPlayProperties.playMode != NO_PLAYLIST && gPlayProperties.playMode != BUSY && !audio->isRunning() && !gPlayProperties.pausePlay) {
-			if ((millis() - playbackTimeoutStart) > playbackTimeout) {
-				// Audio playback timed out, move on to the next
-				System_IndicateError();
-				gPlayProperties.trackFinished = true;
-				playbackTimeoutStart = millis();
+		if (gPlayProperties.playMode != NO_PLAYLIST && gPlayProperties.playMode != BUSY) {
+			// we check for timeout
+			if (!audio->isRunning() && !gPlayProperties.pausePlay) {
+				if ((millis() - playbackTimeoutStart) > playbackTimeout) {
+					// Audio playback timed out, move on to the next
+					System_IndicateError();
+					gPlayProperties.trackFinished = true;
+					playbackTimeoutStart = millis();
+				}
 			}
+		} else {
+			// we are idle, update timeout so that we do not get a spurious error when launching into a playlist
+			playbackTimeoutStart = millis();
 		}
 		if ((System_GetOperationMode() == OPMODE_BLUETOOTH_SOURCE) && audio->isRunning()) {
 			// do not delay here, audio task is time critical in BT-Source mode

src/revision.h

@@ -1,4 +1,4 @@
 #pragma once
 
 #include "gitrevision.h"
-constexpr const char softwareRevision[] = "Software-revision: 20231210-1-DEV";
+constexpr const char softwareRevision[] = "Software-revision: 20231212-1-DEV";