Changeset 5388:e5cc8e03a3e1 in roaraudio for libroar/vio.c

Timestamp:

01/17/12 11:27:07 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support for refcount based VIOs as well as dynamically allocated VIOs (non-stack or global VIOs) (Closes: #127)

File:

• libroar/vio.c (modified) (5 diffs)

libroar/vio.c

@@ -53 +53 @@
  memset((void*)calls, 0, sizeof(struct roar_vio_calls));
  calls->flags = ROAR_VIO_FLAGS_NONE;
- calls->refc  = 0;
+ calls->refc  = 1;
 
  return 0;
@@ -202 +202 @@
 }
 
-int     roar_vio_close    (struct roar_vio_calls * vio) {
+
+int     roar_vio_ref      (struct roar_vio_calls * vio) {
+ if ( vio == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ vio->refc++;
+
+ return 0;
+}
+
+int     roar_vio_unref    (struct roar_vio_calls * vio) {
  int ret;
 
- ROAR_DBG("roar_vio_close(vio=%p) = ?", vio);
-
- if ( vio == NULL ) {
-  roar_err_set(ROAR_ERROR_FAULT);
-  return -1;
- }
-
- if ( vio->close == NULL ) {
+ ROAR_DBG("roar_vio_unref(vio=%p) = ?", vio);
+
+ if ( vio == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ if ( vio->refc == 1 && vio->close == NULL ) {
   roar_err_set(ROAR_ERROR_NOSYS);
   return -1;
  }
+
+ vio->refc--;
+
+ if ( vio->refc )
+  return 0;
 
  roar_err_clear_all();
@@ -221 +238 @@
  roar_err_update();
 
+ if ( vio->flags & ROAR_VIO_FLAGS_FREESELF )
+  roar_mm_free(vio);
+
  return ret;
 }
@@ -257 +277 @@
 
  memset((void*)calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
 
  calls->read     = roar_vio_basic_read;
@@ -642 +664 @@
 
  memset((void*)calls, 0, sizeof(struct roar_vio_calls));
+ calls->flags    = ROAR_VIO_FLAGS_NONE;
+ calls->refc     = 1;
 
  calls->read     = roar_vio_pass_read;