Changeset 4847:8af3ac8d139a in roaraudio

Timestamp:

04/08/11 13:40:15 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

correctly reset RECSOURCE flag in case of stream delete

File:

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

roard/streams.c

@@ -263 +263 @@
  roar_notify_core_emit_snoargs(ROAR_OE_BASICS_DELETE, -1, id, ROAR_OT_STREAM);
 
+ prim = s->primary;
+
+ if ( prim )
+  alive = 0;
+
  if ( s->flags & ROAR_FLAG_SINGLESINK )
   streams_set_single_sink(id, 1);
@@ -338 +343 @@
 #endif
 
+ // all IO is no disconnected:
+ s->ready = 0;
+
+ // re-try reset after all IO is disconnected.
+ if ( streams_get_flag(id, ROAR_FLAG_RECSOURCE) == 1 )
+  streams_reset_flag(id, ROAR_FLAG_RECSOURCE);
+
  //roardsp_fchain_uninit(&(s->fc));
 
@@ -364 +376 @@
  if ( !no_vio_close )
   roar_vio_close(s->viop);
-
- prim = s->primary;
 
  if ( s->name != NULL )
@@ -1112 +1122 @@
 #endif
 
- ROAR_DBG("streams_set_flag(id=%i, flag=0x%.8X) = ?", id, flag);
+ ROAR_DBG("streams_set_flag(id=%i, flag=0x%.8X) = 0", id, flag);
 
  return 0;
@@ -1130 +1140 @@
 int streams_reset_flag   (int id, uint32_t flag) {
  int tmp;
+
+ ROAR_DBG("streams_reset_flag(id=%i, flag=0x%.8X) = ?", id, flag);
 
  _CHECK_SID(id);
@@ -1144 +1156 @@
  flag &= g_streams[id]->flags;
 
+ ROAR_DBG("streams_reset_flag(id=%i, flag=0x%.8X) = ?", id, flag);
+
  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 )
+   if ( stream_vio_ctl(id, ROAR_VIO_CTL_SET_RECORD, &tmp) == -1 ) {
+    if ( alive ) { // do not warn if we are shutting down anyway.
+     ROAR_WARN("streams_reset_flag(id=%i, flag=0x%.8X): Driver refused to reset record flag.", id, flag);
+    }
+    ROAR_DBG("streams_reset_flag(id=%i, flag=0x%.8X) = -1", id, flag);
     return -1;
+   }
   }
 
   streams_recsource_id = -1;
  }
+
+ ROAR_DBG("streams_reset_flag(id=%i, flag=0x%.8X) = ?", id, flag);
 
 
@@ -1192 +1213 @@
  g_streams[id]->flags |= flag;
  g_streams[id]->flags -= flag;
+
+ ROAR_DBG("streams_reset_flag(id=%i, flag=0x%.8X) = 0", id, flag);
 
  return 0;