projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'maint' into next
[paraslash.git]
/
osx_write.c
diff --git
a/osx_write.c
b/osx_write.c
index f67a63ac1cae42eea3e7a4776e3b3353aadfedcb..bc11e61aea24a22596c88a3e4e14f5d7b9ad746c 100644
(file)
--- a/
osx_write.c
+++ b/
osx_write.c
@@
-11,14
+11,17
@@
* <skortze@sourceforge.net>
*/
* <skortze@sourceforge.net>
*/
+#include <regex.h>
#include <sys/types.h>
#include <dirent.h>
#include <CoreAudio/CoreAudio.h>
#include <sys/types.h>
#include <dirent.h>
#include <CoreAudio/CoreAudio.h>
+
#include "para.h"
#include "fd.h"
#include "string.h"
#include "list.h"
#include "sched.h"
#include "para.h"
#include "fd.h"
#include "string.h"
#include "list.h"
#include "sched.h"
+#include "ggo.h"
#include "write.h"
#include "osx_write.cmdline.h"
#include "error.h"
#include "write.h"
#include "osx_write.cmdline.h"
#include "error.h"
@@
-81,7
+84,7
@@
static void init_buffers(struct writer_node *wn)
ptrptr = &powd->to;
for (i = 0; i < conf->numbuffers_arg; i++) {
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;
(*ptrptr)->size = 0;
(*ptrptr)->remaining = 0;
(*ptrptr)->buffer = NULL;
@@
-278,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;
{
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;
if (!need_new_buffer(wn))
return 1;