Changeset 5380:0504bc7766aa in roaraudio for roard/streams.c

Timestamp:

01/04/12 21:36:22 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support for stream direction RECPLAY.

File:

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

roard/streams.c

@@ -427 +427 @@
  _CHECK_SID(id);
 
- if ( (ss = g_streams[id]) == NULL )
-  return -1;
+ if ( (ss = g_streams[id]) == NULL ) {
+  ROAR_ERR("streams_set_dir(id=%i, dir=%i, defaults=%i) = -1 // error=NOENT", id, dir, defaults);
+  roar_err_set(ROAR_ERROR_NOENT);
+  return -1;
+ }
 
  ROAR_STREAM(ss)->dir = dir;
@@ -436 +439 @@
 
  if ( defaults ) {
-  if ( dir <= 0 || dir >= ROAR_DIR_DIRIDS )
+  if ( dir <= 0 || dir >= ROAR_DIR_DIRIDS ) {
+   ROAR_ERR("streams_set_dir(id=%i, dir=%i, defaults=%i) = -1 // error=INVAL", id, dir, defaults);
+   roar_err_set(ROAR_ERROR_INVAL);
    return -1;
+  }
 
   ROAR_DBG("streams_set_dir(*): g_config->streams[dir=%i].flags = 0x%.4x", dir, g_config->streams[dir].flags);
 
   if ( streams_set_flag(id, g_config->streams[dir].flags) == -1 ) {
-   ROAR_DBG("streams_set_dir(*) = -1 // can not set stream flags");
+   ROAR_WARN("streams_set_dir(*) = -1 // can not set stream flags");
    return -1;
   }
@@ -649 +655 @@
   case ROAR_DIR_OUTPUT:
   case ROAR_DIR_BIDIR:
+  case ROAR_DIR_RECPLAY:
     return ROAR_SUBSYS_WAVEFORM;
    break;
@@ -705 +712 @@
   case ROAR_DIR_FILTER:
   case ROAR_DIR_BIDIR:
+  case ROAR_DIR_RECPLAY:
     return STREAM_DIR_BIDIR;
    break;
@@ -1901 +1909 @@
     case ROAR_DIR_PLAY:
     case ROAR_DIR_BIDIR:
+    case ROAR_DIR_RECPLAY:
      break;
     case ROAR_DIR_BRIDGE:
@@ -2189 +2198 @@
   case ROAR_DIR_PLAY:
   case ROAR_DIR_BIDIR:
+  case ROAR_DIR_RECPLAY:
    break;
   case ROAR_DIR_OUTPUT:
@@ -2366 +2376 @@
 
   case ROAR_DIR_RECORD:
+  case ROAR_DIR_RECPLAY:
     ip = g_input_buffer;
    break;