NEWS update

[paraslash.git] / osx_write.c

diff --git a/osx_write.c b/osx_write.c
index 95a84f2a548cbe153cff31f1ae831ecb1cebae6a..f13ec6e1988e00ebce5a9639167650fceea24d6d 100644 (file)
--- a/osx_write.c
+++ b/osx_write.c
@@ -44,7 +44,7 @@ struct osx_buffer {
        float *buffer;
        /** the size of this buffer */
        long size;
-       /* current position in the buffer */
+       /** current position in the buffer */
        float *ptr;
        /** number of floats not yet consuned */
        long remaining;
@@ -60,7 +60,7 @@ struct private_osx_write_data {
        char play;
        /** callback reads audio data from this buffer */
        struct osx_buffer *from;
-       /* the post_select writes audio data here */
+       /** the post_select writes audio data here */
        struct osx_buffer *to;
        /** sample rate of the current audio stream */
        unsigned samplerate;
@@ -111,14 +111,8 @@ static void fill_buffer(struct osx_buffer *b, short *source, long size)
                b->size = size;
        }
        dest = b->buffer;
-       while (size--) {
-               char *tmp = (char *)source;
-               char c = *tmp;
-               *tmp = *(tmp + 1);
-               *(tmp + 1) = c;
-               /* *dest++ = ((*source++) + 32768) / 65536.0; */
+       while (size--)
                *dest++ = (*source++) / 32768.0;
-       }
        b->ptr = b->buffer;
        b->remaining = b->size;
 }
@@ -143,10 +137,7 @@ static OSStatus osx_callback(void * inClientData,
                while (m > 0) {
                        if ((n = powd->from->remaining) <= 0) {
                                PARA_INFO_LOG("%s", "buffer underrun\n");
-                               /* no more bytes in the current read buffer! */
-                               while ((n = powd->from->remaining) <= 0)
-                                       /* wait for the results */
-                                       usleep(2000);
+                               return 0;
                        }
 //                     PARA_INFO_LOG("buf %p: n = %ld, m= %ld\n", powd->from->buffer, n, m);
                        /*