Makefile.in: Add ao_write.ggo to ggos.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 40a35c6a601cf5839b044e44be35992b6e8036d3..6a4c9dbead6c61bbaaedfb484369749404dbe7b5 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -7,7 +7,6 @@
 /** \file audiod.c the paraslash's audio daemon */
 #include <regex.h>
 #include <sys/types.h>
 /** \file audiod.c the paraslash's audio daemon */
 #include <regex.h>
 #include <sys/types.h>

-#include <dirent.h>

 #include <signal.h>
 #include <stdbool.h>
 
 #include <signal.h>
 #include <stdbool.h>
 


@@ -32,6 +31,7 @@
 #include "write.h"
 #include "write_common.h"
 #include "signal.h"
 #include "write.h"
 #include "write_common.h"
 #include "signal.h"

+#include "version.h"

 
 /** define the array of error lists needed by para_audiod */
 INIT_AUDIOD_ERRLISTS;
 
 /** define the array of error lists needed by para_audiod */
 INIT_AUDIOD_ERRLISTS;


@@ -429,22 +429,15 @@ static void kill_btrn(struct btr_node *btrn, struct task *t, int error)
 
 static void kill_all_decoders(int error)
 {
 
 static void kill_all_decoders(int error)
 {

-       int i, j;
+       int i;

 
        FOR_EACH_SLOT(i) {
 
        FOR_EACH_SLOT(i) {

-               struct slot_info *s = &slot[i];
-               struct audio_format_info *a;
+               struct slot_info *s = slot + i;

                if (s->format < 0)
                        continue;
                if (s->format < 0)
                        continue;

-               a = afi + s->format;
-               if (s->wns)
-                       for (j = 0; j < a->num_writers; j++)
-                               kill_btrn(s->wns[j].btrn, &s->wns[j].task, error);
-               if (s->fns)
-                       for (j = 0; j < a->num_writers; j++)
-                               kill_btrn(s->fns[j].btrn, &s->wns[j].task, error);
-               if (s->receiver_node)
-                       kill_btrn(s->receiver_node->btrn, &s->receiver_node->task,
+               if (!s->receiver_node)
+                       continue;
+               kill_btrn(s->receiver_node->btrn, &s->receiver_node->task,

                                error);
        }
 }
                                error);
        }
 }