Merge branch 't/writer_setup_cleanup'

diff --cc NEWS
index 05c866b4a4a745d7acbbc5abdc0ad663cfc7d5f2,40c30bf9ea19c70095c489d5a6cd41c7c29e9b03..946524b2c033a89475f4dbcfd10949b3cad81f2c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -20,8 -20,7 +20,9 @@@ are the highlights of this release
          tarballs. This reduces the size of the tarballs but requires
          gengetopt to build the tarball.
        - Compiles cleanly also with llvm/clang.
-       - The alsa writer used poll fds instead of computing timeouts.
        - Corrupt mp3 files are handled more gracefully.
++      - The alsa writer uses poll fds instead of computing timeouts.
++      - Cleanup of the generic writer API.
        - sched: Optimized zero timeouts.
        - vss timeout cleanups.
  

diff --cc error.h
Simple merge