log: more general error message formatting

[disorder] / lib / queue.h

diff --git a/lib/queue.h b/lib/queue.h
index c7dbfd230268b653e4055b60304d893f5a77704b..9bad76e11d6b9b6658583d7aad0e16695b0e7937 100644 (file)
--- a/lib/queue.h
+++ b/lib/queue.h
@@ -188,6 +188,13 @@ struct queue_entry {
   /** @brief How much of track has been played so far (seconds) */
   long sofar;
 
+  /** @brief True if track preparation is underway
+   *
+   * This is set when a decoder has been started and is expected to connect to
+   * the speaker, but the speaker has not sent as @ref SM_ARRIVED message back
+   * yet. */
+  int preparing;
+
   /** @brief True if decoder is connected to speaker 
    *
    * This is not a @ref playing_state for a couple of reasons
@@ -213,6 +220,12 @@ struct queue_entry {
   
   /** @brief Decoder (or player) process ID */
   pid_t pid;
+
+  /** @brief Termination signal sent to subprocess
+   *
+   * Used to supress 'terminated' messages.
+   */
+  int killed;
 };
 
 void queue_insert_entry(struct queue_entry *b, struct queue_entry *n);