Changeset 1116:ff626395ea76 in roaraudio

Timestamp:

01/14/09 22:14:13 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for sync flag on sysio streams: (re)set nonblocking

Files:

• roarclients/roarctl.c (modified) (1 diff)
• roard/include/streams.h (modified) (1 diff)
• roard/streams.c (modified) (3 diffs)

roarclients/roarctl.c

@@ -394 +394 @@
   } else if ( !strcmp(c, "primary") ) {
    f |= ROAR_FLAG_PRIMARY;
+  } else if ( !strcmp(c, "sync") ) {
+   f |= ROAR_FLAG_SYNC;
   } else {
    fprintf(stderr, "Error: unknown flag: %s\n", c);

roard/include/streams.h

@@ -78 +78 @@
 int streams_set_primary  (int id, int prim);
 int streams_mark_primary (int id);
+int streams_set_sync     (int id, int sync);
 int streams_set_flag     (int id, int flag);
 int streams_reset_flag   (int id, int flag);

roard/streams.c

@@ -270 +270 @@
 }
 
+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 streams_set_flag     (int id, int flag) {
  if ( g_streams[id] == NULL )
@@ -279 +288 @@
  }
 
+ if ( flag & ROAR_FLAG_SYNC ) {
+  streams_set_sync(id, 1);
+  flag -= ROAR_FLAG_SYNC;
+ }
+
  g_streams[id]->flags |= flag;
 
@@ -294 +308 @@
   streams_set_primary(id, 0);
   flag -= ROAR_FLAG_PRIMARY;
+ }
+
+ if ( flag & ROAR_FLAG_SYNC ) {
+  streams_set_sync(id, 0);
+  flag -= ROAR_FLAG_SYNC;
  }