Changeset 4964:bba084fba0fa in roaraudio

Timestamp:

05/14/11 05:17:28 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

avoide most external uses of roar_vio_init_calls()

Files:

• libroar/vio_dstr.c (modified) (2 diffs)
• libroaross/libroaross.c (modified) (1 diff)
• roard/sources.c (modified) (1 diff)
• roard/streams.c (modified) (2 diffs)

libroar/vio_dstr.c

@@ -780 +780 @@
   }
 
-  if ( roar_vio_init_calls(tc) == -1 ) {
+  if ( roar_vio_clear_calls(tc) == -1 ) {
    free(tc);
    _ret(-1);
@@ -813 +813 @@
    }
 
-   if ( roar_vio_init_calls(tc) == -1 ) {
+   if ( roar_vio_clear_calls(tc) == -1 ) {
     free(tc);
     _ret(-1);

libroaross/libroaross.c

@@ -793 +793 @@
  handle->sysio_flags = flags;
 
- if ( roar_vio_init_calls(&(handle->stream_vio)) == -1 ) {
+ if ( roar_vio_clear_calls(&(handle->stream_vio)) == -1 ) {
   _close_handle(handle);
   return -1;

roard/sources.c

@@ -348 +348 @@
  //if ( roar_vio_open_file(vio, device, O_RDONLY, 0644) == -1 ) {
  if ( roar_vio_open_dstr(vio, device, &def, 1) == -1 ) {
-  roar_vio_init_calls(vio); // clear the VIO object again
+  roar_vio_clear_calls(vio); // clear the VIO object again
                             // from things roar_vio_open_dstr() left.
   _ret(-1);

roard/streams.c

@@ -222 +222 @@
 #endif
 
-   roar_vio_init_calls(&(s->vio));
-   roar_vio_init_calls(&(s->jumbo));
+   roar_vio_clear_calls(&(s->vio));
+   roar_vio_clear_calls(&(s->jumbo));
    s->viop      = &(s->vio);
    s->driver_id = -1;
@@ -340 +340 @@
  if ( s->driver_id != -1 ) {
   driver_closevio(&(s->vio), s->driver_id);
-  roar_vio_init_calls(&(s->vio));
+  roar_vio_clear_calls(&(s->vio));
   s->driver_id = -1;
   no_vio_close =  1;