Move player/decoder PIDs back into the main queue_entry structure, now

[disorder] / lib / queue.h

diff --git a/lib/queue.h b/lib/queue.h
index f62ccac3225c17a490b5af521867c28757364155..02937f6b1d0769dad87a3e0b7580b05dc5d154bd 100644 (file)
--- a/lib/queue.h
+++ b/lib/queue.h
@@ -31,15 +31,16 @@ enum playing_state {
   /** @brief Track failed to play */
   playing_failed,
 
   /** @brief Track failed to play */
   playing_failed,
 

-  /** @brief Track is a scratch and has not been played yet
+  /** @brief OBSOLETE

    *
    *

-   * Going to become obsolete.
+   * Formerly denoted an unplayed scratch.  This is now indicated by @p
+   * playing_unplayed and @p origin_scratch.

    */
   playing_isscratch,
 
    */
   playing_isscratch,
 

-  /** @brief Could not find a player
+  /** @brief OBSOLETE

    *
    *

-   * Obsolete - nothing sets this any more
+   * Formerly meant that no player could be found.  Nothing sets this any more.

    */
   playing_no_player,
 
    */
   playing_no_player,
 


@@ -93,8 +94,7 @@ extern const char *const playing_states[];
 enum track_origin {
   /** @brief Track was picked at random and then adopted by a user
    *
 enum track_origin {
   /** @brief Track was picked at random and then adopted by a user
    *

-   * @c submitter identifies who adopted it.  This isn't implemented
-   * yet.
+   * @c submitter identifies who adopted it.

    */
   origin_adopted,
 
    */
   origin_adopted,
 


@@ -203,6 +203,9 @@ struct queue_entry {
 
   /** @brief Owning queue (for Disobedience only) */
   struct queuelike *ql;
 
   /** @brief Owning queue (for Disobedience only) */
   struct queuelike *ql;

+  
+  /** @brief Decoder (or player) process ID */
+  pid_t pid;

 };
 
 void queue_insert_entry(struct queue_entry *b, struct queue_entry *n);
 };
 
 void queue_insert_entry(struct queue_entry *b, struct queue_entry *n);