Changeset 2667:7b1b15ee7541 in roaraudio

Timestamp:

09/12/09 22:21:16 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

child vs. parent callbacks

Location:

roard

Files:

• container_framework.c (modified) (4 diffs)
• include/container_framework.h (modified) (1 diff)

roard/container_framework.c

@@ -109 +109 @@
  _BASIC();
 
- if ( inst->parent->cb.read != NULL )
-  return inst->parent->cb.read(inst->parent, inst->inst, buf, count);
+ if ( inst->parent->ccb.read != NULL )
+  return inst->parent->ccb.read(inst->parent, inst->inst, buf, count);
 
  return -1;
@@ -118 +118 @@
  _BASIC();
 
- if ( inst->parent->cb.write != NULL )
-  return inst->parent->cb.write(inst->parent, inst->inst, buf, count);
+ if ( inst->parent->ccb.write != NULL )
+  return inst->parent->ccb.write(inst->parent, inst->inst, buf, count);
 
  return -1;
@@ -130 +130 @@
  _BASIC();
 
- if ( inst->parent->cb.flush != NULL )
-  return inst->parent->cb.flush(inst->parent, inst->inst);
+ if ( inst->parent->ccb.flush != NULL )
+  return inst->parent->ccb.flush(inst->parent, inst->inst);
 
  return 0;
@@ -145 +145 @@
   r = -1;
 
- return -1;
+ if ( inst->parent->ccb.close != NULL )
+  return inst->parent->ccb.close(inst->parent, inst->inst);
+
  return  r;
 }

roard/include/container_framework.h

@@ -51 +51 @@
   int     (*flush)(struct cont_fw_parent_inst * self, struct cont_fw_child * child);
   int     (*close)(struct cont_fw_parent_inst * self, struct cont_fw_child * child);
- } scb;
+ } ccb;
  struct {
   int     (*close)(struct cont_fw_parent_inst * self);