Changeset 5278:b3e0dd3f3141 in roaraudio for libroar/vio_buffer.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_buffer.c (modified) (5 diffs)

libroar/vio_buffer.c

@@ -146 +146 @@
  struct roar_vio_buffer * self = vio->inst;
  struct roar_vio_calls  * backend;
- off_t dst = 0;
+ roar_off_t dst = 0;
 
  if ( self->use_re ) {
@@ -182 +182 @@
 
  // do the seek:
- if ( roar_vio_lseek(backend, dst, SEEK_CUR) == (off_t)-1 )
+ if ( roar_vio_lseek(backend, dst, SEEK_CUR) == (roar_off_t)-1 )
   return -1;
 
@@ -207 +207 @@
 }
 
-off_t   roar_vio_buffer_lseek   (struct roar_vio_calls * vio, off_t offset, int whence) {
+roar_off_t   roar_vio_buffer_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence) {
  struct roar_vio_buffer * self = vio->inst;
  size_t newoff;
- off_t  ret;
- off_t  invoff;
+ roar_off_t  ret;
+ roar_off_t  invoff;
 
  // in-memory seeking is only supported for SEEK_CUR:
@@ -286 +286 @@
  }
 
- if (ret != (off_t)-1)
+ if (ret != (roar_off_t)-1)
   self->abspos = ret;
 
@@ -292 +292 @@
 }
 
-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) {
  struct roar_vio_buffer * self;