vss.c: Kill check for get_file_info == NULL

[paraslash.git] / osx_write.c

diff --git a/osx_write.c b/osx_write.c
index 95a84f2a548cbe153cff31f1ae831ecb1cebae6a..107746c78e83f8f875d640a27114ee0d57eb01fa 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;
@@ -143,10 +143,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);
                        /*