Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash/

diff --git a/FEATURES b/FEATURES
index b5b42911a893487146103b62eb88689edb02397a..8c29fde44d0e5398dda95690df58bdd1a6fdd333 100644 (file)
--- a/FEATURES
+++ b/FEATURES
@@ -5,7 +5,7 @@ Features
 
        * Linux and Mac OS support
        * mp3, oggvorbis, aac(m4a) support
-       * local or remote http, dccp, and ortp network streaming
+       * local or remote http, dccp, and ortp network audio streaming
        * volume normalizer
        * stream grabbing at any point in the filter chain
        * stand-alone command line receiver/decoder/normalizer/player

diff --git a/osx_write.c b/osx_write.c
index 4ba173a70200ebd269e2b3602e6b9d609be9df8b..107746c78e83f8f875d640a27114ee0d57eb01fa 100644 (file)
--- a/osx_write.c
+++ b/osx_write.c
@@ -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);
                        /*