when loading sound files, initialize channel map data properly

[pulseaudio] / src / polypcore / ioline.c

diff --git a/src/polypcore/ioline.c b/src/polypcore/ioline.c
index 5b669f5c55967e48c807fac8d1adeb37ef51633c..eb8fdda5351167e6df97c99095f64a7cf0520273 100644 (file)
--- a/src/polypcore/ioline.c
+++ b/src/polypcore/ioline.c
@@ -29,9 +29,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "ioline.h"
-#include "xmalloc.h"
-#include "log.h"
 
 #define BUFFER_LIMIT (64*1024)
 #define READ_SIZE (1024)
@@ -273,7 +274,7 @@ static int do_read(pa_ioline *l) {
             pa_ioline_puts(l, "\nExiting.\n");
             do_write(l);
         } else if (r < 0) {
-            pa_log(__FILE__": read() failed: %s\n", strerror(errno));
+            pa_log(__FILE__": read() failed: %s", strerror(errno));
             failure(l);
             return -1;
         }
@@ -295,7 +296,7 @@ static int do_write(pa_ioline *l) {
     while (!l->dead && pa_iochannel_is_writable(l->io) && l->wbuf_valid_length) {
         
         if ((r = pa_iochannel_write(l->io, l->wbuf+l->wbuf_index, l->wbuf_valid_length)) < 0) {
-            pa_log(__FILE__": write() failed: %s\n", r < 0 ? strerror(errno) : "EOF");
+            pa_log(__FILE__": write() failed: %s", r < 0 ? strerror(errno) : "EOF");
             failure(l);
             return -1;
         }