Removed chance of messing up FSM by async calls from Internet activit…

…ies. Always invoke stop through the fsm ponter.
forkineye · Sep 26, 2023 · 30599c5 · 30599c5
1 parent a4b5b8b
commit 30599c5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/ESPixelStick/src/input/InputFPPRemotePlayEffectFsm.cpp b/ESPixelStick/src/input/InputFPPRemotePlayEffectFsm.cpp
@@ -127,7 +127,7 @@ void fsm_PlayEffect_state_PlayingEffect::Poll ()
     if (p_InputFPPRemotePlayEffect->PlayEffectTimer.IsExpired())
     {
         // DEBUG_V ("");
-        Stop ();
+         p_InputFPPRemotePlayEffect->Stop ();
     }
 
     // DEBUG_END;

diff --git a/ESPixelStick/src/input/InputFPPRemotePlayFileFsm.cpp b/ESPixelStick/src/input/InputFPPRemotePlayFileFsm.cpp
@@ -207,7 +207,7 @@ void fsm_PlayFile_state_PlayingFile::Poll ()
             {
                 // DEBUG_V (String ("TotalNumberOfFramesInSequence: ") + String (p_Parent->TotalNumberOfFramesInSequence));
                 // DEBUG_V (String ("      Done Playing:: FileName: '") + p_Parent->GetFileName () + "'");
-                Stop ();
+                p_Parent->Stop ();
                 break;
             }
         }
@@ -285,7 +285,7 @@ IRAM_ATTR void fsm_PlayFile_state_PlayingFile::TimerPoll ()
                 // xDEBUG_V (String ("                 CurrentFrame: ") + String (CurrentFrame));
 
                 // logcon (F ("File Playback Failed to read enough data"));
-                Stop ();
+                p_Parent->Stop ();
             }
         }
 
@@ -316,7 +316,7 @@ void fsm_PlayFile_state_PlayingFile::Init (c_InputFPPRemotePlayFile* Parent)
         // DEBUG_V (String ("RemainingPlayCount: ") + p_Parent->RemainingPlayCount);
         if (0 == p_Parent->RemainingPlayCount)
         {
-            Stop ();
+            p_Parent->Stop ();
             break;
         }
 
@@ -355,7 +355,7 @@ void fsm_PlayFile_state_PlayingFile::Start (String& FileName, float ElapsedSecon
     // DEBUG_V (String ("TotalNumberOfFramesInSequence: ") + String (p_Parent->TotalNumberOfFramesInSequence));
     // DEBUG_V (String ("RemainingPlayCount: ") + p_Parent->RemainingPlayCount);
 
-    Stop ();
+    p_Parent->Stop ();
     p_Parent->Start (FileName, ElapsedSeconds, PlayCount);
 
     // DEBUG_END;
@@ -393,7 +393,7 @@ bool fsm_PlayFile_state_PlayingFile::Sync (String& FileName, float ElapsedSecond
         if (FileName != p_Parent->GetFileName ())
         {
             // DEBUG_V ("Sync: Filename change");
-            Stop ();
+            p_Parent->Stop ();
             p_Parent->Start (FileName, ElapsedSeconds, 1);
             break;
         }

diff --git a/ESPixelStick/src/input/InputFPPRemotePlayListFsm.cpp b/ESPixelStick/src/input/InputFPPRemotePlayListFsm.cpp
@@ -160,7 +160,7 @@ void fsm_PlayList_state_PlayingFile::Poll ()
     if (pInputFPPRemotePlayList->pInputFPPRemotePlayItem->IsIdle ())
     {
         // DEBUG_V ("Done with all entries");
-        Stop ();
+        pInputFPPRemotePlayList->Stop ();
     }
 
     // DEBUG_END;
@@ -236,7 +236,7 @@ void fsm_PlayList_state_PlayingEffect::Poll ()
     if (pInputFPPRemotePlayList->pInputFPPRemotePlayItem->IsIdle ())
     {
         // DEBUG_V ("Effect Processing Done");
-        Stop ();
+        pInputFPPRemotePlayList->Stop ();
     }
 
     // DEBUG_END;
@@ -311,7 +311,7 @@ void fsm_PlayList_state_Paused::Poll ()
 
     if (pInputFPPRemotePlayList->PauseDelayTimer.IsExpired())
     {
-        Stop();
+        pInputFPPRemotePlayList->Stop();
     }
 
     // DEBUG_END;