Merge branch 'maint' into next
[paraslash.git] / osx_write.c
index df10221..bc11e61 100644 (file)
  * <skortze@sourceforge.net>
  */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <CoreAudio/CoreAudio.h>
+
 #include "para.h"
 #include "fd.h"
 #include "string.h"
@@ -82,7 +84,7 @@ static void init_buffers(struct writer_node *wn)
 
        ptrptr = &powd->to;
        for (i = 0; i < conf->numbuffers_arg; i++) {
-               *ptrptr = malloc(sizeof(struct osx_buffer));
+               *ptrptr = para_malloc(sizeof(struct osx_buffer));
                (*ptrptr)->size = 0;
                (*ptrptr)->remaining = 0;
                (*ptrptr)->buffer = NULL;
@@ -279,7 +281,7 @@ static int osx_write_post_select(__a_unused struct sched *s,
 {
        struct private_osx_write_data *powd = wn->private_data;
        struct writer_node_group *wng = wn->wng;
-       short *data = (short*)wng->buf;
+       short *data = (short*)*wng->bufp;
 
        if (!need_new_buffer(wn))
                return 1;