Changeset 1241:9544b62432cb in roaraudio

Timestamp:

02/26/09 12:38:58 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added some more basic vio calls

Files:

• include/libroar/vio.h (modified) (3 diffs)
• libroar/vio.c (modified) (4 diffs)

include/libroar/vio.h

@@ -78 +78 @@
  int     (*sync    )(struct roar_vio_calls * vio);
  int     (*ctl     )(struct roar_vio_calls * vio, int cmd, void * data);
+ int     (*close   )(struct roar_vio_calls * vio);
 };
 
@@ -93 +94 @@
 int     roar_vio_sync    (struct roar_vio_calls * vio);
 int     roar_vio_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_close   (struct roar_vio_calls * vio);
 
 
@@ -103 +105 @@
 int     roar_vio_basic_nonblock(struct roar_vio_calls * vio, int state);
 int     roar_vio_basic_sync    (struct roar_vio_calls * vio);
+int     roar_vio_basic_close   (struct roar_vio_calls * vio);
 
 // null
-// this is read an write in one!
+// this is a read and write in one!
 ssize_t roar_vio_null_rw    (struct roar_vio_calls * vio, void *buf, size_t count);
 
 // pass
 
-ssize_t roar_vio_pass_read (struct roar_vio_calls * vio, void *buf, size_t count);
-ssize_t roar_vio_pass_write(struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_pass_lseek(struct roar_vio_calls * vio, off_t offset, int whence);
+ssize_t roar_vio_pass_read    (struct roar_vio_calls * vio, void *buf, size_t count);
+ssize_t roar_vio_pass_write   (struct roar_vio_calls * vio, void *buf, size_t count);
+off_t   roar_vio_pass_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
+int     roar_vio_pass_nonblock(struct roar_vio_calls * vio, int state);
+int     roar_vio_pass_sync    (struct roar_vio_calls * vio);
+int     roar_vio_pass_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_pass_close   (struct roar_vio_calls * vio);
 
 // re-read/write

libroar/vio.c

@@ -52 +52 @@
  calls->nonblock = roar_vio_basic_nonblock;
  calls->sync     = roar_vio_basic_sync;
+ calls->close    = roar_vio_basic_close;
 
  return 0;
@@ -135 +136 @@
 
  return vio->ctl(vio, cmd, data);
+}
+
+int     roar_vio_close    (struct roar_vio_calls * vio) {
+ if ( vio == NULL )
+  return -1;
+
+ if ( vio->sync == NULL )
+  return -1;
+
+ return vio->close(vio);
 }
 
@@ -168 +179 @@
 }
 
+int     roar_vio_basic_close    (struct roar_vio_calls * vio) {
+ return close(roar_vio_get_fh(vio));
+}
+
 // null
 ssize_t roar_vio_null_rw    (struct roar_vio_calls * vio, void *buf, size_t count) {
@@ -187 +202 @@
 off_t   roar_vio_pass_lseek(struct roar_vio_calls * vio, off_t offset, int whence) {
  return roar_vio_lseek((struct roar_vio_calls *) vio->inst, offset, whence);
+}
+
+int     roar_vio_pass_nonblock(struct roar_vio_calls * vio, int state) {
+ return roar_vio_nonblock((struct roar_vio_calls *) vio->inst, state);
+}
+
+int     roar_vio_pass_sync    (struct roar_vio_calls * vio) {
+ return roar_vio_sync((struct roar_vio_calls *) vio->inst);
+}
+
+int     roar_vio_pass_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
+ return roar_vio_ctl((struct roar_vio_calls *) vio->inst, cmd, data);
+}
+
+int     roar_vio_pass_close   (struct roar_vio_calls * vio) {
+ return roar_vio_close((struct roar_vio_calls *) vio->inst);
 }