From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Fri, 23 Nov 2007 12:21:51 +0000 (+0000)
Subject: Remove post_move_cleanup().  The effect is that new chosen tracks are
X-Git-Tag: debian-1_5_99dev9~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/4ae37ed2ea26b8123a0a868b74d6149014e1e2d2

Remove post_move_cleanup().  The effect is that new chosen tracks are
always added just before the final block of random tracks, and there
is no longer any invisible state in the queue.
---

diff --git a/server/server.c b/server/server.c
index 603b7db..3ffede6 100644
--- a/server/server.c
+++ b/server/server.c
@@ -805,19 +805,6 @@ static int c_log(struct conn *c,
   return 0;
 }
 
-static void post_move_cleanup(void) {
-  struct queue_entry *q;
-
-  /* If we have caused any random tracks to not be at the end then we make them
-   * no longer be random. */
-  for(q = qhead.next; q != &qhead; q = q->next)
-    if(q->state == playing_random && q->next != &qhead)
-      q->state = playing_unplayed;
-  /* That might mean we need to add a new random track. */
-  add_random_track();
-  queue_write();
-}
-
 static int c_move(struct conn *c,
 		  char **vec,
 		  int attribute((unused)) nvec) {
@@ -836,7 +823,6 @@ static int c_move(struct conn *c,
     return 1;
   }
   n = queue_move(q, atoi(vec[1]), c->who);
-  post_move_cleanup();
   sink_printf(ev_writer_sink(c->w), "252 %d\n", n);
   /* If we've moved to the head of the queue then prepare the track. */
   if(q == qhead.next)
@@ -873,7 +859,6 @@ static int c_moveafter(struct conn *c,
       return 1;
     }
   queue_moveafter(q, nvec, qs, c->who);
-  post_move_cleanup();
   sink_printf(ev_writer_sink(c->w), "250 Moved tracks\n");
   /* If we've moved to the head of the queue then prepare the track. */
   if(q == qhead.next)