From: Andre Date: Sun, 28 May 2006 18:59:39 +0000 (+0200) Subject: audiod: kill close_writer() X-Git-Tag: v0.2.14~101^2~16 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=633f7c0f0194cd8ec3a478d820f55dd6a752d915;hp=86733a1bedc2e9358c9ac06ff8368217de3243e3 audiod: kill close_writer() This is better handled by the wng event handler. --- diff --git a/audiod.c b/audiod.c index c93a05fe..4ed9cc97 100644 --- a/audiod.c +++ b/audiod.c @@ -494,26 +494,16 @@ static void close_receiver(int slot_num) s->receiver_node = NULL; set_restart_barrier(s->format, NULL); } -static void close_writer(int slot_num) -{ - struct slot_info *s = &slot[slot_num]; - if (s->wng) { - PARA_INFO_LOG("slot %d: closing writer node group\n", - slot_num); - wng_close(s->wng); - s->wng = NULL; - } - if (s->fc) - *s->fc->output_eof = 1; /* FIXME */ -} - static void kill_all_decoders(void) { int i; - FOR_EACH_SLOT(i) - close_writer(i); + FOR_EACH_SLOT(i) { + struct slot_info *s = &slot[i]; + if (s->receiver_node) + s->receiver_node->eof = 1; + } } static void check_sigchld(void)