Changeset 1117:b7329495fc22 in roaraudio

Timestamp:

01/16/09 17:32:09 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for sync vio streams

Location:

roard

Files:

• roard.c (modified) (3 diffs)
• streams.c (modified) (1 diff)

roard/roard.c

@@ -130 +130 @@
  char * k, * v;
  int codec;
+ int sync = 0;
 
  ROAR_DBG("add_output(drv='%s', dev='%s', opts='%s') = ?", drv, dev, opts);
@@ -174 +175 @@
   } else if ( strcmp(k, "meta") == 0 ) {
    streams_set_flag(stream, ROAR_FLAG_META);
+  } else if ( strcmp(k, "sync") == 0 ) {
+   sync = 1;
   } else {
    ROAR_ERR("add_output(*): unknown option '%s'", k);
@@ -203 +206 @@
  if ( prim )
   streams_mark_primary(stream);
+
+ if ( sync )
+  streams_set_flag(stream, ROAR_FLAG_SYNC);
 
  return 0;

roard/streams.c

@@ -271 +271 @@
 
 int streams_set_sync     (int id, int sync) {
- int fh;
-
- if ( (fh = streams_get_fh(id)) == -1 )
-  return -1;
-
- return roar_socket_nonblock(fh, sync ? ROAR_SOCKET_BLOCK : ROAR_SOCKET_NONBLOCK);
+ int fh = streams_get_fh(id);
+
+ if ( fh != -1 ) {
+  if ( roar_socket_nonblock(fh, sync ? ROAR_SOCKET_BLOCK : ROAR_SOCKET_NONBLOCK) == -1 )
+   return -1;
+
+  return fdatasync(fh);
+ } else {
+  return roar_vio_nonblock(&(g_streams[id]->vio), sync);
+ }
 }