Obsolete playing_random state

diff --git a/lib/queue.h b/lib/queue.h
index 6baf9162c6b265173938e6b4b1f363f12634c6e2..f62ccac3225c17a490b5af521867c28757364155 100644 (file)
--- a/lib/queue.h
+++ b/lib/queue.h
@@ -60,10 +60,11 @@ enum playing_state {
   /** @brief Track is playing but the server is quitting */
   playing_quitting,
 
   /** @brief Track is playing but the server is quitting */
   playing_quitting,
 

-  /** @brief Track was randomly chosen and has not been played
+  /** @brief OBSOLETE

    *
    *

-   * This is going to become obsolete eventually; it's equivalent to @ref
-   * playing_unplayed but for tracks with a different origin.
+   * Formerly this meant a track that was picked at random and has not yet been
+   * played.  This situation is now indicated by @p playing_unplayed and @p
+   * origin_random (or @p origin_adopted).

    */
   playing_random,
 
    */
   playing_random,
 

diff --git a/server/play.c b/server/play.c
index 9a04a98860e3325c0f739f8ac17006f459ca0564..8b798433d1e9819d5f25070df6c5795b69cfcccd 100644 (file)
--- a/server/play.c
+++ b/server/play.c
@@ -492,7 +492,6 @@ static void chosen_random_track(ev_source *ev,
     return;
   /* Add the track to the queue */
   q = queue_add(track, 0, WHERE_END, origin_random);
     return;
   /* Add the track to the queue */
   q = queue_add(track, 0, WHERE_END, origin_random);

-  q->state = playing_random;

   D(("picked %p (%s) at random", (void *)q, q->track));
   queue_write();
   /* Maybe a track can now be played */
   D(("picked %p (%s) at random", (void *)q, q->track));
   queue_write();
   /* Maybe a track can now be played */

diff --git a/server/server-queue.c b/server/server-queue.c
index 38af0556f5239f48a478ed72e39e499cc1a4b22f..779e5e175b6bd318f0bb06ca547344bdd8970129 100644 (file)
--- a/server/server-queue.c
+++ b/server/server-queue.c
@@ -85,8 +85,16 @@ static void queue_do_read(struct queue_entry *head, const char *path) {
       /* Fix up origin field as best we can; will be wrong in some cases but
        * hopefully not too horribly so. */
       q->origin = q->submitter ? origin_picked : origin_random;
       /* Fix up origin field as best we can; will be wrong in some cases but
        * hopefully not too horribly so. */
       q->origin = q->submitter ? origin_picked : origin_random;

-      if(q->state == playing_isscratch)
+      switch(q->state) {
+      case playing_isscratch:

         q->origin = origin_scratch;
         q->origin = origin_scratch;

+        break;
+      case playing_random:
+        q->state = playing_unplayed;
+        break;
+      default:
+        break;
+      }

     }
     if(head == &qhead
        && (!q->track
     }
     if(head == &qhead
        && (!q->track