Merge branch 't/sched_improvements'

diff --combined audiod.c
index e66373cc87ed475682655a9dac17baec92144496,486a33ff5a26f9c5147e14a8c3eabd7c0246e816..e5db0cd2b075c726e931f22ea854d0b916b7e8ef
--- 1/audiod.c
--- 2/audiod.c
+++ b/audiod.c
@@@ -167,7 -167,7 +167,7 @@@ struct command_task 
   * \return The audio format number on success, -E_UNSUPPORTED_AUDIO_FORMAT if
   * \a name is not a supported audio format.
   */
 -int get_audio_format_num(const char *name)
 +static int get_audio_format_num(const char *name)
  {
        int i;
  
@@@ -469,6 -469,20 +469,6 @@@ static int get_empty_slot(void
        return -E_NO_MORE_SLOTS;
  }
  
 -/**
 - * get the number of filters
 - *
 - * \param audio_format_num the number identifying the audio format
 - *
 - * \return the number of filters for the given audio format
 - *
 - * \sa struct filter;
 - */
 -int num_filters(int audio_format_num)
 -{
 -      return afi[audio_format_num].num_filters;
 -}
 -
  static void open_filters(struct slot_info *s)
  {
        struct audio_format_info *a = afi + s->format;
@@@ -1083,17 -1097,17 +1083,17 @@@ static void try_to_close_slot(int slot_
  
        if (s->format < 0)
                return;
-       if (s->receiver_node && s->receiver_node->task.error != -E_TASK_UNREGISTERED)
+       if (s->receiver_node && s->receiver_node->task.error >= 0)
                return;
        for (i = 0; i < a->num_filters; i++)
-               if (s->fns && s->fns[i].task.error != -E_TASK_UNREGISTERED)
+               if (s->fns && s->fns[i].task.error >= 0)
                        return;
        if (a->num_writers > 0) {
                for (i = 0; i < a->num_writers; i++)
-                       if (s->wns && s->wns[i].task.error != -E_TASK_UNREGISTERED)
+                       if (s->wns && s->wns[i].task.error >= 0)
                                return;
        } else {
-               if (s->wns && s->wns[0].task.error != -E_TASK_UNREGISTERED)
+               if (s->wns && s->wns[0].task.error >= 0)
                        return;
        }
        PARA_INFO_LOG("closing slot %d\n", slot_num);
@@@ -1174,7 -1188,7 +1174,7 @@@ static void status_post_select(__a_unus
                        kill_btrn(st->ct->btrn, &st->ct->task, -E_AUDIOD_OFF);
                        goto out;
                }
-               if (st->ct->task.error != -E_TASK_UNREGISTERED)
+               if (st->ct->task.error >= 0)
                        goto out;
                close_stat_pipe();
                st->clock_diff_count = conf.clock_diff_count_arg;
@@@ -1185,7 -1199,7 +1185,7 @@@
                size_t sz;
                int ret;
                if (st->ct->task.error < 0) {
-                       if (st->ct->task.error != -E_TASK_UNREGISTERED)
+                       if (st->ct->task.error >= 0)
                                goto out;
                        close_stat_pipe();
                        goto out;

diff --combined audiod.cmd
index 759f19173c111ac3aeff55b660eefc1c8b1d58da,23bcfbd164d19a91f8b2bc64bc57ff7ac7751565..c58907448f12eeb44551b98d113c3ef52ba9979f
--- 1/audiod.cmd
--- 2/audiod.cmd
+++ b/audiod.cmd
@@@ -14,7 -14,7 +14,7 @@@ H: on -> standby -> off -> o
  N: grab
  D: grab the audio stream
  L:
 -U: -- grab [-m[{s|p|a}]] [-p=<parent>] [-n=<name>] [-o]
 +U: -- grab [-m[{s|p|a}]] [-p=PARENT] [-n=NAME] [-o]
  H:
  H: grab ('splice') the audio stream at any position in the buffer
  H: tree and send that data back to the client.
@@@ -35,7 -35,7 +35,7 @@@ H:    ready for writing (i.e. would block)
  H:    the write, pedantic mode aborts and aggressive mode tries
  H:    to write anyway.
  H:
 -H: -p Grab output of node <parent> of the buffer tree.
 +H: -p Grab output of node PARENT of the buffer tree.
  H:
  H: -n Name of the new buffer tree node. Defaults to 'grab'.
  H:
@@@ -49,11 -49,6 +49,6 @@@ H: in any way. But now these days are g
  H: I've changed my mind and opened up the doors.
  H:                                                              -- Beatles: Help
  ---
- N: kill
- D: kill an active audiod task
- U: kill task_id [task_id ...]
- H: Simulate an error condition for the given task(s)
- ---
  N: off
  D: deactivate para_audiod
  U: off