Changeset 1157:5a1850d8ec0f in roaraudio

Timestamp:

01/23/09 20:43:07 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

allow overruns in sync streams, make new driver API more stable (network drivers/SIGSOP/SIGCONT)

Files:

• ChangeLog (modified) (1 diff)
• roard/streams.c (modified) (2 diffs)

ChangeLog

@@ -5 +5 @@
         * added basic support to report latency
         * added vio support for ctl()s
+        * allow overruns in sync output streams
 
 v. 0.1beta5 - Wed Jan 21 2009

roard/streams.c

@@ -795 +795 @@
  struct roar_stream        *   s;
  struct roar_stream_server *  ss;
- void * obuf;
- int    olen;
- int    need_to_free = 0;
+ void  * obuf;
+ int     olen;
+ int     need_to_free = 0;
+ ssize_t ret;
 
  if ( g_streams[id] == NULL )
@@ -846 +847 @@
    return 0;
 
-  if ( stream_vio_s_write(ss, obuf, olen) == olen ) {
+  if ( (ret = stream_vio_s_write(ss, obuf, olen)) == olen ) {
    if ( need_to_free ) free(obuf);
    s->pos = ROAR_MATH_OVERFLOW_ADD(s->pos, ROAR_OUTPUT_CALC_OUTBUFSAMP(&(s->info), olen)*s->info.channels);
+   return 0;
+  }
+
+  if ( ret > 0 && errno == 0 ) {
+   ROAR_WARN("streams_send_mon(id=%i): Overrun in stream: write %i of %i bytes, %i bytes missing", id, ret, olen, olen-ret);
+   if ( need_to_free ) free(obuf);
+   s->pos = ROAR_MATH_OVERFLOW_ADD(s->pos, ROAR_OUTPUT_CALC_OUTBUFSAMP(&(s->info), ret)*s->info.channels);
    return 0;
   }