From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Mon, 1 Oct 2007 15:09:22 +0000 (+0100)
Subject: set DISORDER_PLAYING bit off event log properly
X-Git-Tag: debian-1_5_99dev8~176
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/e56e1cc07358e9be80aaca18efc58ae5d8652d78

set DISORDER_PLAYING bit off event log properly
---

diff --git a/lib/eclient.c b/lib/eclient.c
index e33cb7c..e5b723d 100644
--- a/lib/eclient.c
+++ b/lib/eclient.c
@@ -1292,6 +1292,9 @@ static const struct {
   { DISORDER_PLAYING_ENABLED, "enable_play", "disable_play" },
   { DISORDER_RANDOM_ENABLED, "enable_random", "disable_random" },
   { DISORDER_TRACK_PAUSED, "pause", "resume" },
+  { DISORDER_PLAYING, "playing", "completed" },
+  { DISORDER_PLAYING, 0, "scratched" },
+  { DISORDER_PLAYING, 0, "failed" },
 };
 #define NSTATES (int)(sizeof statestrings / sizeof *statestrings)
 
@@ -1300,10 +1303,10 @@ static void logentry_state(disorder_eclient *c,
   int n;
 
   for(n = 0; n < NSTATES; ++n)
-    if(!strcmp(vec[0], statestrings[n].enable)) {
+    if(statestrings[n].enable && !strcmp(vec[0], statestrings[n].enable)) {
       c->statebits |= statestrings[n].bit;
       break;
-    } else if(!strcmp(vec[0], statestrings[n].disable)) {
+    } else if(statestrings[n].disable && !strcmp(vec[0], statestrings[n].disable)) {
       c->statebits &= ~statestrings[n].bit;
       break;
     }