Changeset 5278:b3e0dd3f3141 in roaraudio for roard/container_framework.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:

• roard/container_framework.c (modified) (4 diffs)

roard/container_framework.c

@@ -197 +197 @@
 }
 
-off_t   cont_fw_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
+roar_off_t   cont_fw_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence);
 
 int     cont_fw_sync    (struct roar_vio_calls * vio) {
@@ -233 +233 @@
 }
 
-int     cont_fw_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     cont_fw_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 
 // VIO Parent:
@@ -260 +260 @@
 }
 
-off_t   cont_pvio_lseek   (struct roar_vio_calls * vio, off_t offset, int whence) {
+roar_off_t   cont_pvio_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence) {
  return roar_vio_lseek(&(((struct cont_fw_parent_inst*)(vio->inst))->stream.stream->vio), offset, whence);
 }
@@ -268 +268 @@
 }
 
-int     cont_pvio_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
+int     cont_pvio_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) {
  return roar_vio_ctl(&(((struct cont_fw_parent_inst*)(vio->inst))->stream.stream->vio), cmd, data);
 }