Changeset 4815:df2ef6edb97f in roaraudio for roard/streams.c

Timestamp:

03/27/11 20:04:27 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to roard for record streams.

File:

• roard/streams.c (modified) (11 diffs)

roard/streams.c

@@ -590 +590 @@
   return -1;
 
- if ( ss->ready ) {
+ if ( ss->ready && !(s->fh == -1 && fh == -2) ) {
   ROAR_DBG("streams_set_fh(id=%i, fh=%i) = -1 // try to set fh for stream which is already ready", id, fh);
   return -1;
  }
 
- dir = ROAR_STREAM(ss)->dir;
+ dir = s->dir;
 
  ROAR_DBG("streams_set_fh(id=%i, fh=%i): g_streams[id]->id=%i", id, fh, s->id);
@@ -902 +902 @@
 int streams_set_flag     (int id, uint32_t flag) {
  int parent;
+ int tmp;
 
  _CHECK_SID(id);
@@ -978 +979 @@
   }
 
+  if ( g_streams[id]->ready ) {
+   tmp = 1;
+   if ( stream_vio_ctl(id, ROAR_VIO_CTL_SET_RECORD, &tmp) == -1 )
+    return -1;
+  }
+
   streams_recsource_id = id;
  }
@@ -1000 +1007 @@
 
 int streams_reset_flag   (int id, uint32_t flag) {
+ int tmp;
+
  _CHECK_SID(id);
 
@@ -1011 +1020 @@
  }
 
- if ( flag & ROAR_FLAG_RECSOURCE )
-  if ( streams_recsource_id == id )
-   streams_recsource_id = -1;
+ if ( (flag & ROAR_FLAG_RECSOURCE) && streams_recsource_id == id ) {
+  if ( g_streams[id]->ready ) {
+   tmp = 0;
+   if ( stream_vio_ctl(id, ROAR_VIO_CTL_SET_RECORD, &tmp) == -1 )
+    return -1;
+  }
+
+  streams_recsource_id = -1;
+ }
+
 
  if ( flag & ROAR_FLAG_MMAP ) {
@@ -1959 +1975 @@
   case ROAR_DIR_BIDIR:
    break;
+  case ROAR_DIR_OUTPUT:
+    if ( !streams_get_flag(id, ROAR_FLAG_RECSOURCE) )
+     return 0;
+   break;
   default:
 /*
@@ -2057 +2077 @@
  struct roar_buffer        *  bufbuf = NULL;
  struct roar_remove_state     removalstate;
- void  * ip;
+ void  * ip              = g_output_buffer;
  void  * obuf;
  int     olen;
@@ -2130 +2150 @@
    break;
 
+  case ROAR_DIR_RECORD:
+    ip = g_input_buffer;
+   break;
   default:
     return 0;
@@ -2161 +2184 @@
   ROAR_DBG("streams_send_mon(id=%i): obuf=%p, olen=%i", id, obuf, olen);
  } else {
-  obuf = g_output_buffer;
+  obuf = ip;
   olen = g_output_buffer_len;
  }
-
- ip = g_output_buffer;
 
  if ( antiecho ) {
@@ -2335 +2356 @@
 }
 
+int     stream_vio_ctl  (int stream, int cmd,   void * data) {
+ _CHECK_SID(stream);
+
+ return stream_vio_s_ctl(g_streams[stream], cmd, data);
+}
 
 ssize_t stream_vio_s_read (struct roar_stream_server * stream, void *buf, size_t count) {
@@ -2443 +2469 @@
 }
 
+int     stream_vio_s_ctl  (struct roar_stream_server * stream, int cmd,   void * data) {
+ if ( stream == NULL )
+  return -1;
+
+ return roar_vio_ctl(stream->viop, cmd, data);
+}
+
 //ll