configure.ac: print optional executables in configuration output

[paraslash.git] / osx_write.c

diff --git a/osx_write.c b/osx_write.c
index 287601c7639b5bdf4d393988de56fdc308cb9871..b3049c5aadf375abd365e49dafc8a26ff123bd91 100644 (file)
--- a/osx_write.c
+++ b/osx_write.c
@@ -44,33 +44,21 @@ struct osx_buffer {
        long remaining;
        struct osx_buffer *next;
 };
        long remaining;
        struct osx_buffer *next;
 };

-typedef struct osx_buffer osx_buffer; /* FIXME */

 
 struct private_osx_write_data {
        long size;
 
 struct private_osx_write_data {
        long size;

-       short *ptr;

        AudioUnit output;
        char play;
        AudioUnit output;
        char play;

-       osx_buffer *from; /* Current buffers */
-       osx_buffer *to;
+       struct osx_buffer *from; /* Current buffers */
+       struct osx_buffer *to;

        unsigned samplerate;
        unsigned channels;
 };
 
        unsigned samplerate;
        unsigned channels;
 };
 

-
-/*
- * Tried with 3 buffers, but then any little window move is sufficient to
- * stop the sound (OK, on a G3 400 with a Public Beta. Perhaps now we can
- * go down to 2 buffers). With 16 buffers we have 1.5 seconds music
- * buffered (or, if you're pessimistic, 1.5 seconds latency). Note 0
- * buffers don't work much further than the Bus error.
- */
-#define NUMBER_BUFFERS 2
-

 static void destroy_buffers(struct private_osx_write_data *powd)
 {
 static void destroy_buffers(struct private_osx_write_data *powd)
 {

-       osx_buffer *ptr;
-       osx_buffer *ptr2;
+       struct osx_buffer *ptr;
+       struct osx_buffer *ptr2;

        ptr = powd->to->next;
        powd->to->next = NULL;
        while (ptr) {
        ptr = powd->to->next;
        powd->to->next = NULL;
        while (ptr) {


@@ -81,14 +69,16 @@ static void destroy_buffers(struct private_osx_write_data *powd)
        }
 }
 
        }
 }
 

-static void init_buffers(struct private_osx_write_data *powd)
+static void init_buffers(struct writer_node *wn)

 {
 {

+       struct private_osx_write_data *powd = wn->private_data;
+       struct osx_write_args_info *conf = wn->conf;
+       struct osx_buffer **ptrptr;

        int i;
 
        int i;
 

-       osx_buffer ** ptrptr;

        ptrptr = &powd->to;
        ptrptr = &powd->to;

-       for (i = 0; i < NUMBER_BUFFERS; i++) {
-               *ptrptr = malloc(sizeof(osx_buffer));
+       for (i = 0; i < conf->numbuffers_arg; i++) {
+               *ptrptr = malloc(sizeof(struct osx_buffer));

                (*ptrptr)->size = 0;
                (*ptrptr)->remaining = 0;
                (*ptrptr)->buffer = NULL;
                (*ptrptr)->size = 0;
                (*ptrptr)->remaining = 0;
                (*ptrptr)->buffer = NULL;


@@ -97,7 +87,7 @@ static void init_buffers(struct private_osx_write_data *powd)
        *ptrptr = powd->from = powd->to;
 }
 
        *ptrptr = powd->from = powd->to;
 }
 

-static void fill_buffer(osx_buffer *b, short *source, long size)
+static void fill_buffer(struct osx_buffer *b, short *source, long size)

 {
        float *dest;
 
 {
        float *dest;
 


@@ -195,7 +185,6 @@ static int osx_write_open(struct writer_node *wn)
        if (AudioUnitInitialize(powd->output))
                goto e1;
        powd->size = 0;
        if (AudioUnitInitialize(powd->output))
                goto e1;
        powd->size = 0;

-       powd->ptr = NULL;

        powd->play = 0;
        /* Hmmm, let's choose PCM format */
        /* We tell the Output Unit what format we're going to supply data to it.
        powd->play = 0;
        /* Hmmm, let's choose PCM format */
        /* We tell the Output Unit what format we're going to supply data to it.


@@ -229,7 +218,7 @@ static int osx_write_open(struct writer_node *wn)
                        kAudioUnitScope_Input, 0, &format,
                        sizeof(AudioStreamBasicDescription)))
                goto e2;
                        kAudioUnitScope_Input, 0, &format,
                        sizeof(AudioStreamBasicDescription)))
                goto e2;

-       init_buffers(powd);
+       init_buffers(wn);

        ret = -E_ADD_CALLBACK;
        if (AudioUnitSetProperty(powd->output, kAudioUnitProperty_SetRenderCallback,
                        kAudioUnitScope_Input, 0, &inputCallback,
        ret = -E_ADD_CALLBACK;
        if (AudioUnitSetProperty(powd->output, kAudioUnitProperty_SetRenderCallback,
                        kAudioUnitScope_Input, 0, &inputCallback,