Changeset 2952:ce25506bc479 in roaraudio

Timestamp:

10/17/09 09:27:33 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support for the true meaning of ROAR_FLAG_IMMUTABLE

Location:

roard

Files:

• mixer.c (modified) (1 diff)
• req.c (modified) (1 diff)
• streams.c (modified) (2 diffs)

roard/mixer.c

@@ -65 +65 @@
  }
 
- if ( streams_set_flag(stream, ROAR_FLAG_PRIMARY) == -1 ) {
+ if ( streams_set_flag(stream, ROAR_FLAG_IMMUTABLE) == -1 ) {
   _err();
  }

roard/req.c

@@ -685 +685 @@
   clients_delete(info[1]);
  } else if ( info[0] == ROAR_OT_STREAM ) {
+  if ( streams_get_flag(info[1], ROAR_FLAG_IMMUTABLE) == 1 )
+   return -1;
+
   streams_delete(info[1]);
  } else if ( info[0] == ROAR_OT_SOURCE ) {
+  if ( streams_get_flag(info[1], ROAR_FLAG_IMMUTABLE) == 1 )
+   return -1;
+
   if ( streams_get_flag(info[1], ROAR_FLAG_SOURCE) == 1 ) {
    streams_delete(info[1]);

roard/streams.c

@@ -615 +615 @@
  _CHECK_SID(id);
 
+ if ( flag & ROAR_FLAG_IMMUTABLE )
+  flag |= ROAR_FLAG_PRIMARY;
+
  if ( flag & ROAR_FLAG_MMAP )
   if ( streams_set_mmap(id, 0) == -1 )
@@ -692 +695 @@
 int streams_reset_flag   (int id, int flag) {
  _CHECK_SID(id);
+
+ if ( g_streams[id]->flags & ROAR_FLAG_IMMUTABLE ) {
+  flag |= ROAR_FLAG_PRIMARY;
+  flag -= ROAR_FLAG_PRIMARY;
+ }
 
  if ( flag & ROAR_FLAG_RECSOURCE )