Changeset 2713:0b9af3059649 in roaraudio

Timestamp:

09/15/09 00:26:30 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

new debug lions, fixed bug with CCB for close

File:

• roard/container_framework.c (modified) (3 diffs)

roard/container_framework.c

@@ -59 +59 @@
  int i;
 
+ ROAR_DBG("cont_fw_delete(inst=%p) = ?", inst);
+
  if ( inst == NULL )
   return -1;
+
+ ROAR_DBG("cont_fw_delete(inst=%p) = ?", inst);
 
  // check if there are streams to close...
  for (i = 0; i < CONT_FW_MAX_CHILDS; i++) {
   if ( inst->child[i] != NULL ) {
+   ROAR_DBG("cont_fw_delete(inst=%p) = -1 // there are still open childs", inst);
    return -1;
   }
  }
+
+ ROAR_DBG("cont_fw_delete(inst=%p) = ?", inst);
 
  if ( inst->pcb.close != NULL )
@@ -73 +80 @@
 
  free(inst);
+
+ ROAR_DBG("cont_fw_delete(inst=%p) = 0", inst);
 
  return 0;
@@ -205 +214 @@
 
  if ( inst->parent->ccb.close != NULL )
-  return inst->parent->ccb.close(inst->parent, inst);
+  if ( inst->parent->ccb.close(inst->parent, inst) == -1 )
+   r = -1;
 
  for (i = 0; i < CONT_FW_MAX_CHILDS; i++) {