Changeset 5278:b3e0dd3f3141 in roaraudio for libroar/vio_magic.c

Timestamp:

11/21/11 00:42:20 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

last parts of merging _nonblock into _ctl and fixed sizeof(cmd) of _ctls

File:

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

libroar/vio_magic.c

@@ -36 +36 @@
 #include "libroar.h"
 
-int     roar_vio_open_magic    (struct roar_vio_calls * calls, struct roar_vio_calls * dst, int * codec);
-int     roar_vio_magic_close   (struct roar_vio_calls * vio);
+#if 0
 
-ssize_t roar_vio_magic_read    (struct roar_vio_calls * vio, void *buf, size_t count) {
+static int     roar_vio_magic_close   (struct roar_vio_calls * vio);
+
+static ssize_t roar_vio_magic_read    (struct roar_vio_calls * vio, void *buf, size_t count) {
  struct roar_vio_magic * self = (struct roar_vio_magic *)(vio->inst);
  struct roar_buffer    * inp;
@@ -75 +76 @@
 }
 
-ssize_t roar_vio_magic_write   (struct roar_vio_calls * vio, void *buf, size_t count) {
+static ssize_t roar_vio_magic_write   (struct roar_vio_calls * vio, void *buf, size_t count) {
  struct roar_vio_magic * self = (struct roar_vio_magic *)(vio->inst);
  void * calls;
@@ -88 +89 @@
 }
 
-off_t   roar_vio_magic_lseek   (struct roar_vio_calls * vio, off_t offset, int whence) {
+static roar_off_t   roar_vio_magic_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence) {
  struct roar_vio_magic * self = (struct roar_vio_magic *)(vio->inst);
  void * calls;
@@ -101 +102 @@
 }
 
-int     roar_vio_magic_nonblock(struct roar_vio_calls * vio, int state) {
- struct roar_vio_magic * self = (struct roar_vio_magic *)(vio->inst);
- void * calls;
-
- if (self == NULL)
-  return -1;
-
- if ( roar_stack_get_cur(&(self->vios), &calls) == -1 )
-  return -1;
-
- return roar_vio_nonblock((struct roar_vio_calls*)calls, state);
-}
-
-int     roar_vio_magic_sync    (struct roar_vio_calls * vio) {
+static int     roar_vio_magic_sync    (struct roar_vio_calls * vio) {
  struct roar_vio_magic * self = (struct roar_vio_magic *)(vio->inst);
  void * calls;
@@ -127 +115 @@
 }
 
+int     roar_vio_open_magic    (struct roar_vio_calls * calls, struct roar_vio_calls * dst, int * codec);
+
+#endif
+
 //ll