Skip to content

Commit

Permalink
PlaylistEntryDynamic fixes
Browse files Browse the repository at this point in the history
- Call PlaylistEntryBase::Stop() in Dynamic's Stop()
- Allow new FPP Command playlist entry types in dynamic playlists
  • Loading branch information
cpinkham committed Nov 30, 2019
1 parent 19fea91 commit 1665980
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/playlist/PlaylistEntryDynamic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "common.h"
#include "log.h"
#include "PlaylistEntryBoth.h"
#include "PlaylistEntryCommand.h"
#include "PlaylistEntryEffect.h"
#include "PlaylistEntryEvent.h"
#include "PlaylistEntryMedia.h"
Expand Down Expand Up @@ -217,7 +218,7 @@ int PlaylistEntryDynamic::Stop(void)
return 1;
}

return 0;
return PlaylistEntryBase::Stop();
}

/*
Expand Down Expand Up @@ -369,6 +370,8 @@ int PlaylistEntryDynamic::ReadFromString(std::string jsonStr)

if (pe["type"].asString() == "both")
playlistEntry = new PlaylistEntryBoth();
else if (pe["type"].asString() == "command")
playlistEntry = new PlaylistEntryCommand();
else if (pe["type"].asString() == "effect")
playlistEntry = new PlaylistEntryEffect();
else if (pe["type"].asString() == "event")
Expand Down

0 comments on commit 1665980

Please sign in to comment.