configure.ac: print optional executables in configuration output

[paraslash.git] / osx_write.c

diff --git a/osx_write.c b/osx_write.c
index 885c05d1a535a0b3b4eb65e894bd73e2d5d038bb..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;

 
 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,20 +87,14 @@ 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;
 
        if (b->remaining) /* Non empty buffer, must still be playing */
                return;
 {
        float *dest;
 
        if (b->remaining) /* Non empty buffer, must still be playing */
                return;

-       PARA_INFO_LOG("%ld\n", size);

        if (b->size != size) {
        if (b->size != size) {

-               /*
-                * Hey! What's that? Coudn't this buffer size be fixed
-                * once (well, perhaps we just didn't allocate it yet)
-                */
-               free(b->buffer);
-               b->buffer = malloc(size * sizeof(float));
+               b->buffer = para_realloc(b->buffer, size * sizeof(float));

                b->size = size;
        }
        dest = b->buffer;
                b->size = size;
        }
        dest = b->buffer;


@@ -151,7 +135,7 @@ static OSStatus osx_callback(void * inClientData,
                                        /* wait for the results */
                                        usleep(2000);
                        }
                                        /* wait for the results */
                                        usleep(2000);
                        }

-                       PARA_INFO_LOG("buf %p: n = %ld, m= %ld\n", powd->from->buffer, n, m);
+//                     PARA_INFO_LOG("buf %p: n = %ld, m= %ld\n", powd->from->buffer, n, m);

                        /*
                         * we dump what we can. In fact, just the necessary
                         * should be sufficient
                        /*
                         * we dump what we can. In fact, just the necessary
                         * should be sufficient


@@ -201,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.


@@ -235,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,


@@ -313,8 +296,28 @@ static int osx_write_post_select(__a_unused struct sched *s,
 
 static int osx_write_pre_select(struct sched *s, __a_unused struct writer_node *wn)
 {
 
 static int osx_write_pre_select(struct sched *s, __a_unused struct writer_node *wn)
 {

+       struct private_osx_write_data *powd = wn->private_data;
+       struct writer_node_group *wng = wn->wng;
+       size_t numbytes = powd->to->remaining * sizeof(short);
+       struct timeval tmp = {.tv_sec = 1, .tv_usec = 0}, delay = tmp;
+       unsigned long divisor;
+
+       if (!numbytes && *wng->loaded >= sizeof(short))
+               goto min_delay; /* there's a buffer to fill */
+       if (!numbytes)
+               return 1;
+       divisor = powd->samplerate * powd->channels * 2 / numbytes;
+       if (divisor)
+               tv_divide(divisor, &tmp, &delay);
+       if (tv_diff(&s->timeout, &delay, NULL) > 0)
+               s->timeout = delay;
+//     PARA_DEBUG_LOG("delay: %lu:%lu\n", (long unsigned) s->timeout.tv_sec,
+//             (long unsigned) s->timeout.tv_usec);
+       return 1;
+min_delay:
+       PARA_DEBUG_LOG("%s\n", "minimal delay");

        s->timeout.tv_sec = 0;
        s->timeout.tv_sec = 0;

-       s->timeout.tv_usec = 20;
+       s->timeout.tv_usec = 1;

        return 1;
 }
 
        return 1;
 }