Index: include/libroar/vio.h
===================================================================
--- include/libroar/vio.h	(revision 5276)
+++ include/libroar/vio.h	(revision 5278)
@@ -43,20 +43,17 @@
 // sys io:
 
+typedef int32_t       roar_vio_ctl_t;
+typedef int_least64_t roar_off_t;
+
 struct roar_vio_calls {
- void * inst;
-/*
- ssize_t (*read) (int fd, void *buf, size_t count, void * inst);
- ssize_t (*write)(int fd, void *buf, size_t count, void * inst);
- off_t   (*lseek)(int fildes, off_t offset, int whence, void * inst);
-*/
- ssize_t (*read    )(struct roar_vio_calls * vio, void *buf, size_t count);
- ssize_t (*write   )(struct roar_vio_calls * vio, void *buf, size_t count);
- off_t   (*lseek   )(struct roar_vio_calls * vio, off_t offset, int whence);
-// int     (*nonblock)(struct roar_vio_calls * vio, int state);
- 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);
- uint32_t flags;
- size_t   refc;
+ size_t           refc;
+ uint32_t         flags;
+ void            *inst;
+ ssize_t        (*read    )(struct roar_vio_calls * vio, void *buf, size_t count);
+ ssize_t        (*write   )(struct roar_vio_calls * vio, void *buf, size_t count);
+ roar_off_t     (*lseek   )(struct roar_vio_calls * vio, roar_off_t offset, int whence);
+ int            (*sync    )(struct roar_vio_calls * vio);
+ int            (*ctl     )(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
+ int            (*close   )(struct roar_vio_calls * vio);
 };
 
@@ -72,8 +69,8 @@
 ssize_t roar_vio_read    (struct roar_vio_calls * vio, void *buf, size_t count) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL;
 ssize_t roar_vio_write   (struct roar_vio_calls * vio, void *buf, size_t count) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL;
-off_t   roar_vio_lseek   (struct roar_vio_calls * vio, off_t offset, int whence) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL;
+roar_off_t   roar_vio_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL;
 int     roar_vio_nonblock(struct roar_vio_calls * vio, int state) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL;
 int     roar_vio_sync    (struct roar_vio_calls * vio) _LIBROAR_ATTR_NONNULL_ALL;
-int     roar_vio_ctl     (struct roar_vio_calls * vio, int cmd, void * data) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL(1);
+int     roar_vio_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL(1);
 int     roar_vio_close   (struct roar_vio_calls * vio) _LIBROAR_ATTR_NONNULL_ALL;
 
@@ -103,7 +100,7 @@
 ssize_t roar_vio_basic_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_basic_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_basic_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
+roar_off_t   roar_vio_basic_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence);
 int     roar_vio_basic_sync    (struct roar_vio_calls * vio);
-int     roar_vio_basic_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_basic_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     roar_vio_basic_close   (struct roar_vio_calls * vio);
 
@@ -118,7 +115,7 @@
 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);
+roar_off_t   roar_vio_pass_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence);
 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_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     roar_vio_pass_close   (struct roar_vio_calls * vio);
 
@@ -128,5 +125,5 @@
 ssize_t roar_vio_re_read (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_re_write(struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_re_lseek(struct roar_vio_calls * vio, off_t offset, int whence);
+roar_off_t   roar_vio_re_lseek(struct roar_vio_calls * vio, roar_off_t offset, int whence);
 
 #endif
Index: include/libroar/vio_bio.h
===================================================================
--- include/libroar/vio_bio.h	(revision 4708)
+++ include/libroar/vio_bio.h	(revision 5278)
@@ -49,6 +49,5 @@
 ssize_t roar_vio_bio_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_bio_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_bio_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
-int     roar_vio_bio_nonblock(struct roar_vio_calls * vio, int state);
+roar_off_t   roar_vio_bio_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence);
 int     roar_vio_bio_sync    (struct roar_vio_calls * vio);
 int     roar_vio_bio_close   (struct roar_vio_calls * vio);
Index: include/libroar/vio_buffer.h
===================================================================
--- include/libroar/vio_buffer.h	(revision 4708)
+++ include/libroar/vio_buffer.h	(revision 5278)
@@ -58,8 +58,7 @@
 ssize_t roar_vio_buffer_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_buffer_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_buffer_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
-int     roar_vio_buffer_nonblock(struct roar_vio_calls * vio, int state);
+roar_off_t   roar_vio_buffer_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence);
 int     roar_vio_buffer_sync    (struct roar_vio_calls * vio);
-int     roar_vio_buffer_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_buffer_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     roar_vio_buffer_close   (struct roar_vio_calls * vio);
 
Index: include/libroar/vio_buffer_store.h
===================================================================
--- include/libroar/vio_buffer_store.h	(revision 4708)
+++ include/libroar/vio_buffer_store.h	(revision 5278)
@@ -46,8 +46,7 @@
 ssize_t roar_vio_buffer_store_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_buffer_store_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_buffer_store_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
-int     roar_vio_buffer_store_nonblock(struct roar_vio_calls * vio, int state);
+roar_off_t   roar_vio_buffer_store_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence);
 int     roar_vio_buffer_store_sync    (struct roar_vio_calls * vio);
-int     roar_vio_buffer_store_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_buffer_store_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     roar_vio_buffer_store_close   (struct roar_vio_calls * vio);
 
Index: include/libroar/vio_cmd.h
===================================================================
--- include/libroar/vio_cmd.h	(revision 4708)
+++ include/libroar/vio_cmd.h	(revision 5278)
@@ -96,19 +96,6 @@
 ssize_t roar_vio_cmd_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_cmd_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-int     roar_vio_cmd_nonblock(struct roar_vio_calls * vio, int state);
 int     roar_vio_cmd_sync    (struct roar_vio_calls * vio);
-int     roar_vio_cmd_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
-
-/*
-// pass
-int     roar_vio_open_pass    (struct roar_vio_calls * calls, struct roar_vio_calls * dst);
-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);
-*/
+int     roar_vio_cmd_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 
 // MISC:
Index: include/libroar/vio_jumbo.h
===================================================================
--- include/libroar/vio_jumbo.h	(revision 4708)
+++ include/libroar/vio_jumbo.h	(revision 5278)
@@ -49,8 +49,7 @@
 ssize_t roar_vio_jumbo_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_jumbo_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_jumbo_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
-int     roar_vio_jumbo_nonblock(struct roar_vio_calls * vio, int state);
+roar_off_t   roar_vio_jumbo_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence);
 int     roar_vio_jumbo_sync    (struct roar_vio_calls * vio);
-int     roar_vio_jumbo_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_jumbo_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     roar_vio_jumbo_close   (struct roar_vio_calls * vio);
 
Index: include/libroar/vio_magic.h
===================================================================
--- include/libroar/vio_magic.h	(revision 4708)
+++ include/libroar/vio_magic.h	(revision 5278)
@@ -39,4 +39,5 @@
 #include "libroar.h"
 
+#if 0
 struct roar_vio_magic {
  struct roar_buffer * inp;
@@ -45,10 +46,5 @@
 
 int     roar_vio_open_magic    (struct roar_vio_calls * calls, struct roar_vio_calls * dst, int * codec);
-ssize_t roar_vio_magic_read    (struct roar_vio_calls * vio, void *buf, size_t count);
-ssize_t roar_vio_magic_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_magic_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
-int     roar_vio_magic_nonblock(struct roar_vio_calls * vio, int state);
-int     roar_vio_magic_sync    (struct roar_vio_calls * vio);
-int     roar_vio_magic_close   (struct roar_vio_calls * vio);
+#endif
 #endif
 
Index: include/libroar/vio_pipe.h
===================================================================
--- include/libroar/vio_pipe.h	(revision 4708)
+++ include/libroar/vio_pipe.h	(revision 5278)
@@ -67,7 +67,6 @@
 ssize_t roar_vio_pipe_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_pipe_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-int     roar_vio_pipe_nonblock(struct roar_vio_calls * vio, int state);
 int     roar_vio_pipe_sync    (struct roar_vio_calls * vio);
-int     roar_vio_pipe_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_pipe_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     roar_vio_pipe_close   (struct roar_vio_calls * vio);
 
Index: include/libroar/vio_proto.h
===================================================================
--- include/libroar/vio_proto.h	(revision 5254)
+++ include/libroar/vio_proto.h	(revision 5278)
@@ -67,8 +67,6 @@
 ssize_t roar_vio_proto_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_proto_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_proto_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
-int     roar_vio_proto_nonblock(struct roar_vio_calls * vio, int state);
 int     roar_vio_proto_sync    (struct roar_vio_calls * vio);
-int     roar_vio_proto_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_proto_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     roar_vio_proto_close   (struct roar_vio_calls * vio);
 
Index: include/libroar/vio_rtp.h
===================================================================
--- include/libroar/vio_rtp.h	(revision 4708)
+++ include/libroar/vio_rtp.h	(revision 5278)
@@ -122,8 +122,6 @@
 ssize_t roar_vio_rtp_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_rtp_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_rtp_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
-int     roar_vio_rtp_nonblock(struct roar_vio_calls * vio, int state);
 int     roar_vio_rtp_sync    (struct roar_vio_calls * vio);
-int     roar_vio_rtp_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_rtp_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     roar_vio_rtp_close   (struct roar_vio_calls * vio);
 
Index: include/libroar/vio_stack.h
===================================================================
--- include/libroar/vio_stack.h	(revision 4975)
+++ include/libroar/vio_stack.h	(revision 5278)
@@ -57,8 +57,7 @@
 ssize_t roar_vio_stack_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_stack_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_stack_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
-int     roar_vio_stack_nonblock(struct roar_vio_calls * vio, int state);
+roar_off_t   roar_vio_stack_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence);
 int     roar_vio_stack_sync    (struct roar_vio_calls * vio);
-int     roar_vio_stack_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_stack_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     roar_vio_stack_close   (struct roar_vio_calls * vio);
 
Index: include/libroar/vio_stdio.h
===================================================================
--- include/libroar/vio_stdio.h	(revision 5088)
+++ include/libroar/vio_stdio.h	(revision 5278)
@@ -59,7 +59,7 @@
 ssize_t roar_vio_stdio_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_stdio_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_stdio_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
+roar_off_t   roar_vio_stdio_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence);
 int     roar_vio_stdio_sync    (struct roar_vio_calls * vio);
-int     roar_vio_stdio_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_stdio_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     roar_vio_stdio_close   (struct roar_vio_calls * vio);
 
Index: include/libroar/vio_winsock.h
===================================================================
--- include/libroar/vio_winsock.h	(revision 5276)
+++ include/libroar/vio_winsock.h	(revision 5278)
@@ -43,5 +43,5 @@
 ssize_t roar_vio_winsock_write   (struct roar_vio_calls * vio, void *buf, size_t count);
 int     roar_vio_winsock_sync    (struct roar_vio_calls * vio);
-int     roar_vio_winsock_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_winsock_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     roar_vio_winsock_close   (struct roar_vio_calls * vio);
 #endif
