Changeset 4540:afaf515bb76a in roaraudio

Timestamp:

10/23/10 13:37:57 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

more strict testing if a flag can be set or not

File:

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

roard/streams.c

@@ -790 +790 @@
   flag |= ROAR_FLAG_PRIMARY;
 
- if ( flag & ROAR_FLAG_MMAP )
-  if ( streams_set_mmap(id, 0) == -1 )
+ if ( flag & ROAR_FLAG_MMAP ) {
+  if ( streams_set_mmap(id, 0) == -1 ) {
    flag -= ROAR_FLAG_MMAP;
+   return -1;
+  }
+ }
 
  if ( flag & ROAR_FLAG_PRIMARY ) {
@@ -800 +803 @@
 
  if ( flag & ROAR_FLAG_SINGLESINK ) {
-  if ( streams_set_single_sink(id, 0) == -1 )
+  if ( streams_set_single_sink(id, 0) == -1 ) {
    flag -= ROAR_FLAG_SINGLESINK;
+   return -1;
+  }
  }
 
@@ -882 +887 @@
    streams_recsource_id = -1;
 
- if ( flag & ROAR_FLAG_MMAP )
-  if ( streams_set_mmap(id, 1) == -1 )
+ if ( flag & ROAR_FLAG_MMAP ) {
+  if ( streams_set_mmap(id, 1) == -1 ) {
    flag -= ROAR_FLAG_MMAP;
+   return -1;
+  }
+ }
 
  if ( flag & ROAR_FLAG_PRIMARY ) {
@@ -892 +900 @@
 
  if ( flag & ROAR_FLAG_SINGLESINK ) {
-  if ( streams_set_single_sink(id, 1) == -1 )
+  if ( streams_set_single_sink(id, 1) == -1 ) {
    flag -= ROAR_FLAG_SINGLESINK;
+   return -1;
+  }
  }