Changeset 2696:26ceae3107d4 in roaraudio

Timestamp:

09/13/09 03:26:00 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

get basics working together with RAUM

Location:

roard

Files:

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

roard/container_framework.c

@@ -49 +49 @@
  memset(self, 0, sizeof(struct cont_fw_parent_inst));
 
+ self->stream.id = -1;
+ self->state     = ROAR_STREAMSTATE_INITING;
+
  *inst = self;
  return 0;
@@ -225 +228 @@
   return -1;
 
+ self->stream.codec  = codec;
+ self->stream.id     = ROAR_STREAM(info)->id;
+ self->stream.stream = info;
+ self->stream.filter = filter;
+
  ROAR_DBG("cont_fw_cf_open(*) = ?");
 
@@ -236 +244 @@
  ROAR_DBG("cont_fw_cf_open(*) = ?");
 
- if ( self->pcb.open != NULL ) {
-  if ( self->pcb.open(self, codec, info, filter) == -1 ) {
-   cont_fw_delete(self);
-   return -1;
-  }
- }
-
- ROAR_DBG("cont_fw_cf_open(*) = ?");
-
  *inst = self;
 
@@ -261 +260 @@
 // no direct read or writing...
 int cont_fw_cf_write(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
- ROAR_DBG("cont_fw_cf_write(*) = -1");
- return -1;
+ struct cont_fw_parent_inst * self = (void*)inst;
+
+ ROAR_DBG("cont_fw_cf_write(*) = ?");
+
+ if ( self->state == ROAR_STREAMSTATE_INITING ) {
+  if ( self->pcb.open != NULL ) {
+   if ( self->pcb.open(self, self->stream.codec, self->stream.stream, self->stream.filter) == -1 ) {
+    return -1;
+   }
+  }
+  self->state = ROAR_STREAMSTATE_NEW;
+
+  ROAR_DBG("cont_fw_cf_write(*) = 0");
+  return 0;
+ } else {
+  ROAR_DBG("cont_fw_cf_write(*) = -1");
+  return -1;
+ }
 }
 

roard/include/container_framework.h

@@ -43 +43 @@
  struct cont_fw_child_vio_inst * child[CONT_FW_MAX_CHILDS];
  void * u_inst;
+ int state;
+ struct {
+  int id;
+  int codec;
+  struct roar_stream_server  * stream;
+  struct roar_codecfilter    * filter;
+ } stream;
  struct {
   ssize_t (*read) (struct cont_fw_parent_inst * self, struct cont_fw_child_vio_inst * child, void *buf, size_t len);