Merge branch 't/wma_improvements'

[paraslash.git] / ao_write.c

diff --git a/ao_write.c b/ao_write.c
index 307588f994c02a7dcd8e0db29da3d2666dfcad71..93861ab63f50baf478bf74fe6f216fce6cf39f53 100644 (file)
--- a/ao_write.c
+++ b/ao_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2011-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -9,7 +9,6 @@
 #include <pthread.h>
 #include <ao/ao.h>
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "fd.h"
@@ -210,7 +209,7 @@ __noreturn static void *aow_play(void *priv)
                                if (frames > 0)
                                        break;
                                /* eof and less than a single frame available */
-                               ret = -E_AO_EOF;
+                               ret = -E_WRITE_COMMON_EOF;
                                goto unlock;
                        }
                        //PARA_CRIT_LOG("waiting for data\n");
@@ -376,7 +375,6 @@ void ao_write_init(struct writer *w)
        w->post_select = aow_post_select;
        w->parse_config_or_die = aow_parse_config_or_die;
        w->free_config = aow_free_config;
-       w->shutdown = NULL;
        w->help = (struct ggo_help) {
                .short_help = ao_write_args_info_help,
        };