Merge pull request #680 from MartinMueller2003/main

Remote play updates

ESPixelStick/src/WebMgr.cpp

@@ -622,24 +622,22 @@ void c_WebMgr::ProcessXJRequest (AsyncWebServerRequest* client)
     system[F ("SDinstalled")] = FileMgr.SdCardIsInstalled ();
     system[F ("DiscardedRxData")] = DiscardedRxData;
 
-    // DEBUG_V ("");
-
     // Ask WiFi Stats
+    // DEBUG_V ("NetworkMgr.GetStatus");
     NetworkMgr.GetStatus (system);
-    // DEBUG_V ("");
 
+    // DEBUG_V ("FPPDiscovery.GetStatus");
     FPPDiscovery.GetStatus (system);
-    // DEBUG_V ("");
 
+    // DEBUG_V ("InputMgr.GetStatus");
     // Ask Input Stats
     InputMgr.GetStatus (status);
-    // DEBUG_V ("");
 
     // Ask Output Stats
+    // DEBUG_V ("OutputMgr.GetStatus");
     OutputMgr.GetStatus (status);
-    // DEBUG_V ("");
-
     // Get File Manager Stats
+    // DEBUG_V ("FileMgr.GetStatus");
     FileMgr.GetStatus (system);
     // DEBUG_V ("");
 

ESPixelStick/src/input/InputFPPRemote.cpp

@@ -197,13 +197,13 @@ void c_InputFPPRemote::Process ()
     }
     else if (PlayingRemoteFile ())
     {
-        // DEBUG_V ("PlayingRemoteFile");
-        FPPDiscovery.ReadNextFrame ();
+        // DEBUG_V ("Remote File Play");
+        while(Poll ()) {}
     }
     else if (PlayingFile ())
     {
         // DEBUG_V ("Local File Play");
-        pInputFPPRemotePlayItem->Poll ();
+        while(Poll ()) {}
 
         if (pInputFPPRemotePlayItem->IsIdle ())
         {
@@ -216,6 +216,21 @@ void c_InputFPPRemote::Process ()
 
 } // process
 
+//-----------------------------------------------------------------------------
+bool c_InputFPPRemote::Poll ()
+{
+    // DEBUG_START;
+    bool Response = false;
+    if(pInputFPPRemotePlayItem)
+    {
+        Response = pInputFPPRemotePlayItem->Poll ();
+    }
+
+    // DEBUG_END;
+    return Response;
+
+} // Poll
+
 //-----------------------------------------------------------------------------
 void c_InputFPPRemote::ProcessButtonActions(c_ExternalInput::InputValue_t value)
 {
@@ -291,6 +306,7 @@ void c_InputFPPRemote::StopPlaying ()
 
         if(PlayingFile())
         {
+            // DEBUG_V(String("pInputFPPRemotePlayItem: ") = String(uint32_t(pInputFPPRemotePlayItem), HEX));
             pInputFPPRemotePlayItem->Stop ();
 
             while (!pInputFPPRemotePlayItem->IsIdle ())
@@ -302,9 +318,6 @@ void c_InputFPPRemote::StopPlaying ()
             delete pInputFPPRemotePlayItem;
             pInputFPPRemotePlayItem = nullptr;
         }
-
-        FileBeingPlayed = "";
-
     } while (false);
 
     // DEBUG_END;
@@ -320,14 +333,14 @@ void c_InputFPPRemote::StartPlaying (String& FileName)
     {
         // DEBUG_V (String ("FileName: '") + FileName + "'");
         if ((0 == FileName.length ()) ||
-            (FileName == String ("null")))
+            (FileName.equals("null")))
         {
             // DEBUG_V ("No file to play");
             StopPlaying ();
             break;
         }
 
-        if (FileName == No_LocalFileToPlay)
+        if (FileName.equals(No_LocalFileToPlay))
         {
             StartPlayingRemoteFile (FileName);
         }
@@ -358,6 +371,11 @@ void c_InputFPPRemote::StartPlayingLocalFile (String& FileName)
         if (String(CN_Dotpl) == Last_pl_Text)
         {
             // DEBUG_V ("Start Playlist");
+            if(pInputFPPRemotePlayItem)
+            {
+                delete pInputFPPRemotePlayItem;
+                pInputFPPRemotePlayItem = nullptr;
+            }
             pInputFPPRemotePlayItem = new c_InputFPPRemotePlayList (GetInputChannelId ());
             StatusType = F ("PlayList");
         }
@@ -373,6 +391,11 @@ void c_InputFPPRemote::StartPlayingLocalFile (String& FileName)
                 break;
             }
 
+            if(pInputFPPRemotePlayItem)
+            {
+                delete pInputFPPRemotePlayItem;
+                pInputFPPRemotePlayItem = nullptr;
+            }
             // DEBUG_V ("Start Local FSEQ file player");
             pInputFPPRemotePlayItem = new c_InputFPPRemotePlayFile (GetInputChannelId ());
             StatusType = CN_File;
@@ -407,6 +430,11 @@ void c_InputFPPRemote::StartPlayingRemoteFile (String& FileName)
         StopPlaying ();
 
         // DEBUG_V ("Instantiate an FSEQ file player");
+        if(pInputFPPRemotePlayItem)
+        {
+            delete pInputFPPRemotePlayItem;
+            pInputFPPRemotePlayItem = nullptr;
+        }
         pInputFPPRemotePlayItem = new c_InputFPPRemotePlayFile (GetInputChannelId ());
         pInputFPPRemotePlayItem->SetSyncOffsetMS (SyncOffsetMS);
         pInputFPPRemotePlayItem->SetSendFppSync (SendFppSync);
@@ -466,7 +494,7 @@ bool c_InputFPPRemote::PlayingRemoteFile ()
             break;
         }
 
-        if (FileBeingPlayed != No_LocalFileToPlay)
+        if (!FileBeingPlayed.equals(No_LocalFileToPlay))
         {
             break;
         }

ESPixelStick/src/input/InputFPPRemote.h

@@ -63,13 +63,14 @@ class c_InputFPPRemote : public c_InputCommon
     bool PlayingFile ();
     bool PlayingRemoteFile ();
     void PlayNextFile ();
+    bool Poll ();
 
     void load ();          ///< Load configuration from File System
     void save ();          ///< Save configuration to File System
 
     int32_t SyncOffsetMS = 0;
     bool    SendFppSync = false;
-    String  FileBeingPlayed;
+    String  FileBeingPlayed = No_LocalFileToPlay;
 
 #   define JSON_NAME_FILE_TO_PLAY CN_fseqfilename
 

ESPixelStick/src/input/InputFPPRemotePlayEffect.cpp

@@ -82,11 +82,11 @@ void c_InputFPPRemotePlayEffect::Sync (String& FileName, float SecondsElapsed)
 } // Sync
 
 //-----------------------------------------------------------------------------
-void c_InputFPPRemotePlayEffect::Poll ()
+bool c_InputFPPRemotePlayEffect::Poll ()
 {
     // DEBUG_START;
 
-    pCurrentFsmState->Poll ();
+    return pCurrentFsmState->Poll ();
 
     // DEBUG_END;
 

ESPixelStick/src/input/InputFPPRemotePlayEffect.hpp

@@ -33,7 +33,7 @@ class c_InputFPPRemotePlayEffect : public c_InputFPPRemotePlayItem
     virtual void Start     (String & FileName, float duration, uint32_t PlayCount);
     virtual void Stop      ();
     virtual void Sync      (String & FileName, float SecondsElapsed);
-    virtual void Poll      ();
+    virtual bool Poll      ();
     virtual void GetStatus (JsonObject & jsonStatus);
     virtual bool IsIdle    () { return (pCurrentFsmState == &fsm_PlayEffect_state_Idle_imp); }
 

ESPixelStick/src/input/InputFPPRemotePlayEffectFsm.cpp

@@ -23,14 +23,15 @@
 #include "../utility/SaferStringConversion.hpp"
 
 //-----------------------------------------------------------------------------
-void fsm_PlayEffect_state_Idle::Poll ()
+bool fsm_PlayEffect_state_Idle::Poll ()
 {
     // DEBUG_START;
 
     // do nothing
 
     // DEBUG_END;
-
+    return false;
+
 } // fsm_PlayEffect_state_Idle::Poll
 
 //-----------------------------------------------------------------------------
@@ -117,7 +118,7 @@ void fsm_PlayEffect_state_Idle::GetStatus (JsonObject& jsonStatus)
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void fsm_PlayEffect_state_PlayingEffect::Poll ()
+bool fsm_PlayEffect_state_PlayingEffect::Poll ()
 {
     // DEBUG_START;
 
@@ -131,6 +132,7 @@ void fsm_PlayEffect_state_PlayingEffect::Poll ()
     }
 
     // DEBUG_END;
+    return false;
 
 } // fsm_PlayEffect_state_PlayingEffect::Poll
 

ESPixelStick/src/input/InputFPPRemotePlayEffectFsm.hpp

@@ -35,7 +35,7 @@ class fsm_PlayEffect_state
     fsm_PlayEffect_state() {}
     virtual ~fsm_PlayEffect_state() {}
 
-    virtual void Poll () = 0;
+    virtual bool Poll () = 0;
     virtual void Init (c_InputFPPRemotePlayEffect * Parent) = 0;
     virtual void GetStateName (String & sName) = 0;
     virtual void Start (String & FileName, float SecondsElapsed) = 0;
@@ -56,7 +56,7 @@ class fsm_PlayEffect_state_Idle : public fsm_PlayEffect_state
     fsm_PlayEffect_state_Idle() {}
     virtual ~fsm_PlayEffect_state_Idle() {}
 
-    virtual void Poll ();
+    virtual bool Poll ();
     virtual void Init (c_InputFPPRemotePlayEffect* Parent);
     virtual void GetStateName (String & sName) { sName = CN_Idle; }
     virtual void Start (String & FileName, float SecondsElapsed);
@@ -73,7 +73,7 @@ class fsm_PlayEffect_state_PlayingEffect : public fsm_PlayEffect_state
     fsm_PlayEffect_state_PlayingEffect() {}
     virtual ~fsm_PlayEffect_state_PlayingEffect() {}
 
-    virtual void Poll ();
+    virtual bool Poll ();
     virtual void Init (c_InputFPPRemotePlayEffect* Parent);
     virtual void GetStateName (String & sName) { sName = CN_Effect; }
     virtual void Start (String & FileName, float SecondsElapsed);

ESPixelStick/src/input/InputFPPRemotePlayFile.cpp

@@ -121,12 +121,7 @@ void c_InputFPPRemotePlayFile::Stop ()
 {
     // DEBUG_START;
 
-    while (pCurrentFsmState != &fsm_PlayFile_state_Idle_imp)
-    {
-        pCurrentFsmState->Stop ();
-        pCurrentFsmState->Poll ();
-        pCurrentFsmState->TimerPoll ();
-    }
+    pCurrentFsmState->Stop ();
 
     // DEBUG_END;
 } // Stop
@@ -148,16 +143,16 @@ void c_InputFPPRemotePlayFile::Sync (String & FileName, float SecondsElapsed)
 } // Sync
 
 //-----------------------------------------------------------------------------
-void c_InputFPPRemotePlayFile::Poll ()
+bool c_InputFPPRemotePlayFile::Poll ()
 {
     // xDEBUG_START;
 
-    // TimerPoll ();
-    pCurrentFsmState->Poll ();
-
     // Show that we have received a poll
     PollDetectionCounter = 0;
 
+    // TimerPoll ();
+    return pCurrentFsmState->Poll ();
+
     // xDEBUG_END;
 
 } // Poll

ESPixelStick/src/input/InputFPPRemotePlayFile.hpp

@@ -39,7 +39,7 @@ class c_InputFPPRemotePlayFile : public c_InputFPPRemotePlayItem
     virtual void Start (String & FileName, float SecondsElapsed, uint32_t RemainingPlayCount);
     virtual void Stop ();
     virtual void Sync (String& FileName, float SecondsElapsed);
-    virtual void Poll ();
+    virtual bool Poll ();
     virtual void GetStatus (JsonObject & jsonStatus);
     virtual bool IsIdle () { return (pCurrentFsmState == &fsm_PlayFile_state_Idle_imp); }