Changeset 5278:b3e0dd3f3141 in roaraudio
- Timestamp:
- 11/21/11 00:42:20 (12 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 57 edited
Legend:
- Unmodified
- Added
- Removed
-
include/libroar/vio.h
r5276 r5278 43 43 // sys io: 44 44 45 typedef int32_t roar_vio_ctl_t; 46 typedef int_least64_t roar_off_t; 47 45 48 struct roar_vio_calls { 46 void * inst; 47 /* 48 ssize_t (*read) (int fd, void *buf, size_t count, void * inst); 49 ssize_t (*write)(int fd, void *buf, size_t count, void * inst); 50 off_t (*lseek)(int fildes, off_t offset, int whence, void * inst); 51 */ 52 ssize_t (*read )(struct roar_vio_calls * vio, void *buf, size_t count); 53 ssize_t (*write )(struct roar_vio_calls * vio, void *buf, size_t count); 54 off_t (*lseek )(struct roar_vio_calls * vio, off_t offset, int whence); 55 // int (*nonblock)(struct roar_vio_calls * vio, int state); 56 int (*sync )(struct roar_vio_calls * vio); 57 int (*ctl )(struct roar_vio_calls * vio, int cmd, void * data); 58 int (*close )(struct roar_vio_calls * vio); 59 uint32_t flags; 60 size_t refc; 49 size_t refc; 50 uint32_t flags; 51 void *inst; 52 ssize_t (*read )(struct roar_vio_calls * vio, void *buf, size_t count); 53 ssize_t (*write )(struct roar_vio_calls * vio, void *buf, size_t count); 54 roar_off_t (*lseek )(struct roar_vio_calls * vio, roar_off_t offset, int whence); 55 int (*sync )(struct roar_vio_calls * vio); 56 int (*ctl )(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 57 int (*close )(struct roar_vio_calls * vio); 61 58 }; 62 59 … … 72 69 ssize_t roar_vio_read (struct roar_vio_calls * vio, void *buf, size_t count) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL; 73 70 ssize_t roar_vio_write (struct roar_vio_calls * vio, void *buf, size_t count) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL; 74 off_t roar_vio_lseek (struct roar_vio_calls * vio,off_t offset, int whence) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL;71 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; 75 72 int roar_vio_nonblock(struct roar_vio_calls * vio, int state) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL; 76 73 int roar_vio_sync (struct roar_vio_calls * vio) _LIBROAR_ATTR_NONNULL_ALL; 77 int roar_vio_ctl (struct roar_vio_calls * vio, int cmd, void * data) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL(1);74 int roar_vio_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL(1); 78 75 int roar_vio_close (struct roar_vio_calls * vio) _LIBROAR_ATTR_NONNULL_ALL; 79 76 … … 103 100 ssize_t roar_vio_basic_read (struct roar_vio_calls * vio, void *buf, size_t count); 104 101 ssize_t roar_vio_basic_write (struct roar_vio_calls * vio, void *buf, size_t count); 105 off_t roar_vio_basic_lseek (struct roar_vio_calls * vio,off_t offset, int whence);102 roar_off_t roar_vio_basic_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence); 106 103 int roar_vio_basic_sync (struct roar_vio_calls * vio); 107 int roar_vio_basic_ctl (struct roar_vio_calls * vio, int cmd, void * data);104 int roar_vio_basic_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 108 105 int roar_vio_basic_close (struct roar_vio_calls * vio); 109 106 … … 118 115 ssize_t roar_vio_pass_read (struct roar_vio_calls * vio, void *buf, size_t count); 119 116 ssize_t roar_vio_pass_write (struct roar_vio_calls * vio, void *buf, size_t count); 120 off_t roar_vio_pass_lseek (struct roar_vio_calls * vio,off_t offset, int whence);117 roar_off_t roar_vio_pass_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence); 121 118 int roar_vio_pass_sync (struct roar_vio_calls * vio); 122 int roar_vio_pass_ctl (struct roar_vio_calls * vio, int cmd, void * data);119 int roar_vio_pass_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 123 120 int roar_vio_pass_close (struct roar_vio_calls * vio); 124 121 … … 128 125 ssize_t roar_vio_re_read (struct roar_vio_calls * vio, void *buf, size_t count); 129 126 ssize_t roar_vio_re_write(struct roar_vio_calls * vio, void *buf, size_t count); 130 off_t roar_vio_re_lseek(struct roar_vio_calls * vio,off_t offset, int whence);127 roar_off_t roar_vio_re_lseek(struct roar_vio_calls * vio, roar_off_t offset, int whence); 131 128 132 129 #endif -
include/libroar/vio_bio.h
r4708 r5278 49 49 ssize_t roar_vio_bio_read (struct roar_vio_calls * vio, void *buf, size_t count); 50 50 ssize_t roar_vio_bio_write (struct roar_vio_calls * vio, void *buf, size_t count); 51 off_t roar_vio_bio_lseek (struct roar_vio_calls * vio, off_t offset, int whence); 52 int roar_vio_bio_nonblock(struct roar_vio_calls * vio, int state); 51 roar_off_t roar_vio_bio_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence); 53 52 int roar_vio_bio_sync (struct roar_vio_calls * vio); 54 53 int roar_vio_bio_close (struct roar_vio_calls * vio); -
include/libroar/vio_buffer.h
r4708 r5278 58 58 ssize_t roar_vio_buffer_read (struct roar_vio_calls * vio, void *buf, size_t count); 59 59 ssize_t roar_vio_buffer_write (struct roar_vio_calls * vio, void *buf, size_t count); 60 off_t roar_vio_buffer_lseek (struct roar_vio_calls * vio, off_t offset, int whence); 61 int roar_vio_buffer_nonblock(struct roar_vio_calls * vio, int state); 60 roar_off_t roar_vio_buffer_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence); 62 61 int roar_vio_buffer_sync (struct roar_vio_calls * vio); 63 int roar_vio_buffer_ctl (struct roar_vio_calls * vio, int cmd, void * data);62 int roar_vio_buffer_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 64 63 int roar_vio_buffer_close (struct roar_vio_calls * vio); 65 64 -
include/libroar/vio_buffer_store.h
r4708 r5278 46 46 ssize_t roar_vio_buffer_store_read (struct roar_vio_calls * vio, void *buf, size_t count); 47 47 ssize_t roar_vio_buffer_store_write (struct roar_vio_calls * vio, void *buf, size_t count); 48 off_t roar_vio_buffer_store_lseek (struct roar_vio_calls * vio, off_t offset, int whence); 49 int roar_vio_buffer_store_nonblock(struct roar_vio_calls * vio, int state); 48 roar_off_t roar_vio_buffer_store_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence); 50 49 int roar_vio_buffer_store_sync (struct roar_vio_calls * vio); 51 int roar_vio_buffer_store_ctl (struct roar_vio_calls * vio, int cmd, void * data);50 int roar_vio_buffer_store_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 52 51 int roar_vio_buffer_store_close (struct roar_vio_calls * vio); 53 52 -
include/libroar/vio_cmd.h
r4708 r5278 96 96 ssize_t roar_vio_cmd_read (struct roar_vio_calls * vio, void *buf, size_t count); 97 97 ssize_t roar_vio_cmd_write (struct roar_vio_calls * vio, void *buf, size_t count); 98 int roar_vio_cmd_nonblock(struct roar_vio_calls * vio, int state);99 98 int roar_vio_cmd_sync (struct roar_vio_calls * vio); 100 int roar_vio_cmd_ctl (struct roar_vio_calls * vio, int cmd, void * data); 101 102 /* 103 // pass 104 int roar_vio_open_pass (struct roar_vio_calls * calls, struct roar_vio_calls * dst); 105 ssize_t roar_vio_pass_read (struct roar_vio_calls * vio, void *buf, size_t count); 106 ssize_t roar_vio_pass_write (struct roar_vio_calls * vio, void *buf, size_t count); 107 off_t roar_vio_pass_lseek (struct roar_vio_calls * vio, off_t offset, int whence); 108 int roar_vio_pass_nonblock(struct roar_vio_calls * vio, int state); 109 int roar_vio_pass_sync (struct roar_vio_calls * vio); 110 int roar_vio_pass_ctl (struct roar_vio_calls * vio, int cmd, void * data); 111 int roar_vio_pass_close (struct roar_vio_calls * vio); 112 */ 99 int roar_vio_cmd_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 113 100 114 101 // MISC: -
include/libroar/vio_jumbo.h
r4708 r5278 49 49 ssize_t roar_vio_jumbo_read (struct roar_vio_calls * vio, void *buf, size_t count); 50 50 ssize_t roar_vio_jumbo_write (struct roar_vio_calls * vio, void *buf, size_t count); 51 off_t roar_vio_jumbo_lseek (struct roar_vio_calls * vio, off_t offset, int whence); 52 int roar_vio_jumbo_nonblock(struct roar_vio_calls * vio, int state); 51 roar_off_t roar_vio_jumbo_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence); 53 52 int roar_vio_jumbo_sync (struct roar_vio_calls * vio); 54 int roar_vio_jumbo_ctl (struct roar_vio_calls * vio, int cmd, void * data);53 int roar_vio_jumbo_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 55 54 int roar_vio_jumbo_close (struct roar_vio_calls * vio); 56 55 -
include/libroar/vio_magic.h
r4708 r5278 39 39 #include "libroar.h" 40 40 41 #if 0 41 42 struct roar_vio_magic { 42 43 struct roar_buffer * inp; … … 45 46 46 47 int roar_vio_open_magic (struct roar_vio_calls * calls, struct roar_vio_calls * dst, int * codec); 47 ssize_t roar_vio_magic_read (struct roar_vio_calls * vio, void *buf, size_t count); 48 ssize_t roar_vio_magic_write (struct roar_vio_calls * vio, void *buf, size_t count); 49 off_t roar_vio_magic_lseek (struct roar_vio_calls * vio, off_t offset, int whence); 50 int roar_vio_magic_nonblock(struct roar_vio_calls * vio, int state); 51 int roar_vio_magic_sync (struct roar_vio_calls * vio); 52 int roar_vio_magic_close (struct roar_vio_calls * vio); 48 #endif 53 49 #endif 54 50 -
include/libroar/vio_pipe.h
r4708 r5278 67 67 ssize_t roar_vio_pipe_read (struct roar_vio_calls * vio, void *buf, size_t count); 68 68 ssize_t roar_vio_pipe_write (struct roar_vio_calls * vio, void *buf, size_t count); 69 int roar_vio_pipe_nonblock(struct roar_vio_calls * vio, int state);70 69 int roar_vio_pipe_sync (struct roar_vio_calls * vio); 71 int roar_vio_pipe_ctl (struct roar_vio_calls * vio, int cmd, void * data);70 int roar_vio_pipe_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 72 71 int roar_vio_pipe_close (struct roar_vio_calls * vio); 73 72 -
include/libroar/vio_proto.h
r5254 r5278 67 67 ssize_t roar_vio_proto_read (struct roar_vio_calls * vio, void *buf, size_t count); 68 68 ssize_t roar_vio_proto_write (struct roar_vio_calls * vio, void *buf, size_t count); 69 off_t roar_vio_proto_lseek (struct roar_vio_calls * vio, off_t offset, int whence);70 int roar_vio_proto_nonblock(struct roar_vio_calls * vio, int state);71 69 int roar_vio_proto_sync (struct roar_vio_calls * vio); 72 int roar_vio_proto_ctl (struct roar_vio_calls * vio, int cmd, void * data);70 int roar_vio_proto_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 73 71 int roar_vio_proto_close (struct roar_vio_calls * vio); 74 72 -
include/libroar/vio_rtp.h
r4708 r5278 122 122 ssize_t roar_vio_rtp_read (struct roar_vio_calls * vio, void *buf, size_t count); 123 123 ssize_t roar_vio_rtp_write (struct roar_vio_calls * vio, void *buf, size_t count); 124 off_t roar_vio_rtp_lseek (struct roar_vio_calls * vio, off_t offset, int whence);125 int roar_vio_rtp_nonblock(struct roar_vio_calls * vio, int state);126 124 int roar_vio_rtp_sync (struct roar_vio_calls * vio); 127 int roar_vio_rtp_ctl (struct roar_vio_calls * vio, int cmd, void * data);125 int roar_vio_rtp_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 128 126 int roar_vio_rtp_close (struct roar_vio_calls * vio); 129 127 -
include/libroar/vio_stack.h
r4975 r5278 57 57 ssize_t roar_vio_stack_read (struct roar_vio_calls * vio, void *buf, size_t count); 58 58 ssize_t roar_vio_stack_write (struct roar_vio_calls * vio, void *buf, size_t count); 59 off_t roar_vio_stack_lseek (struct roar_vio_calls * vio, off_t offset, int whence); 60 int roar_vio_stack_nonblock(struct roar_vio_calls * vio, int state); 59 roar_off_t roar_vio_stack_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence); 61 60 int roar_vio_stack_sync (struct roar_vio_calls * vio); 62 int roar_vio_stack_ctl (struct roar_vio_calls * vio, int cmd, void * data);61 int roar_vio_stack_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 63 62 int roar_vio_stack_close (struct roar_vio_calls * vio); 64 63 -
include/libroar/vio_stdio.h
r5088 r5278 59 59 ssize_t roar_vio_stdio_read (struct roar_vio_calls * vio, void *buf, size_t count); 60 60 ssize_t roar_vio_stdio_write (struct roar_vio_calls * vio, void *buf, size_t count); 61 off_t roar_vio_stdio_lseek (struct roar_vio_calls * vio,off_t offset, int whence);61 roar_off_t roar_vio_stdio_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence); 62 62 int roar_vio_stdio_sync (struct roar_vio_calls * vio); 63 int roar_vio_stdio_ctl (struct roar_vio_calls * vio, int cmd, void * data);63 int roar_vio_stdio_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 64 64 int roar_vio_stdio_close (struct roar_vio_calls * vio); 65 65 -
include/libroar/vio_winsock.h
r5276 r5278 43 43 ssize_t roar_vio_winsock_write (struct roar_vio_calls * vio, void *buf, size_t count); 44 44 int roar_vio_winsock_sync (struct roar_vio_calls * vio); 45 int roar_vio_winsock_ctl (struct roar_vio_calls * vio, int cmd, void * data);45 int roar_vio_winsock_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 46 46 int roar_vio_winsock_close (struct roar_vio_calls * vio); 47 47 #endif -
include/libroardsp/vio_transcode.h
r4708 r5278 41 41 int roar_vio_open_xcode (struct roar_vio_calls * calls, int encoder, struct roar_audio_info * info, struct roar_vio_calls * dst); 42 42 ssize_t roar_vio_xcode_proc (struct roar_vio_calls * vio, void *buf, size_t count); 43 off_t roar_vio_xcode_lseek (struct roar_vio_calls * vio, off_t offset, int whence);44 int roar_vio_xcode_nonblock(struct roar_vio_calls * vio, int state);45 43 int roar_vio_xcode_sync (struct roar_vio_calls * vio); 46 int roar_vio_xcode_ctl (struct roar_vio_calls * vio, int cmd, void * data);47 44 int roar_vio_xcode_close (struct roar_vio_calls * vio); 48 45 … … 50 47 ssize_t roar_vio_bixcode_read (struct roar_vio_calls * vio, void *buf, size_t count); 51 48 ssize_t roar_vio_bixcode_write (struct roar_vio_calls * vio, void *buf, size_t count); 52 off_t roar_vio_bixcode_lseek (struct roar_vio_calls * vio, off_t offset, int whence);53 int roar_vio_bixcode_nonblock(struct roar_vio_calls * vio, int state);54 49 int roar_vio_bixcode_sync (struct roar_vio_calls * vio); 55 int roar_vio_bixcode_ctl (struct roar_vio_calls * vio, int cmd, void * data);56 50 int roar_vio_bixcode_close (struct roar_vio_calls * vio); 57 51 -
libroar/vio.c
r5276 r5278 56 56 memset((void*)calls, 0, sizeof(struct roar_vio_calls)); 57 57 58 /*59 calls->read = (ssize_t (*)(int fd, void *buf, size_t count, void * inst))read;60 calls->write = (ssize_t (*)(int fd, void *buf, size_t count, void * inst))write;61 calls->lseek = (off_t (*)(int fildes, off_t offset, int whence, void * inst))lseek;62 */63 64 58 calls->read = roar_vio_basic_read; 65 59 calls->write = roar_vio_basic_write; … … 155 149 } 156 150 157 off_t roar_vio_lseek(struct roar_vio_calls * vio,off_t offset, int whence) {158 off_t ret;159 160 ROAR_DBG("roar_vio_lseek(vio=%p, offset=% u, whence=%i) = ?", vio, (unsignedint)offset, whence);151 roar_off_t roar_vio_lseek(struct roar_vio_calls * vio, roar_off_t offset, int whence) { 152 roar_off_t ret; 153 154 ROAR_DBG("roar_vio_lseek(vio=%p, offset=%li, whence=%i) = ?", vio, (long int)offset, whence); 161 155 162 156 if ( vio == NULL ) { … … 210 204 } 211 205 212 int roar_vio_ctl (struct roar_vio_calls * vio, int cmd, void * data) {206 int roar_vio_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 213 207 int ret; 214 208 … … 394 388 } 395 389 396 off_t roar_vio_basic_lseek(struct roar_vio_calls * vio,off_t offset, int whence) {390 roar_off_t roar_vio_basic_lseek(struct roar_vio_calls * vio, roar_off_t offset, int whence) { 397 391 #ifdef _CAN_OPERATE 398 392 return lseek(roar_vio_get_fh(vio), offset, whence); … … 411 405 } 412 406 413 int roar_vio_basic_ctl (struct roar_vio_calls * vio, int cmd, void * data) {407 int roar_vio_basic_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 414 408 #ifdef ROAR_HAVE_H_SYS_IOCTL 415 409 struct roar_vio_sysio_ioctl * sysioctl; … … 715 709 } 716 710 717 off_t roar_vio_pass_lseek(struct roar_vio_calls * vio,off_t offset, int whence) {711 roar_off_t roar_vio_pass_lseek(struct roar_vio_calls * vio, roar_off_t offset, int whence) { 718 712 return roar_vio_lseek((struct roar_vio_calls *) vio->inst, offset, whence); 719 713 } … … 723 717 } 724 718 725 int roar_vio_pass_ctl (struct roar_vio_calls * vio, int cmd, void * data) {719 int roar_vio_pass_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 726 720 if (vio == NULL) { 727 721 roar_err_set(ROAR_ERROR_FAULT); … … 841 835 842 836 // TODO: we should do a some more intelgent thing here. 843 off_t roar_vio_re_lseek(struct roar_vio_calls * vio,off_t offset, int whence) {837 roar_off_t roar_vio_re_lseek(struct roar_vio_calls * vio, roar_off_t offset, int whence) { 844 838 return roar_vio_lseek((struct roar_vio_calls *) vio->inst, offset, whence); 845 839 } -
libroar/vio_bio.c
r4708 r5278 46 46 calls->write = roar_vio_bio_write; 47 47 calls->lseek = roar_vio_bio_lseek; 48 calls->nonblock = roar_vio_bio_nonblock;49 48 calls->sync = roar_vio_bio_sync; 50 49 calls->close = roar_vio_bio_close; … … 82 81 } 83 82 84 off_t roar_vio_bio_lseek (struct roar_vio_calls * vio,off_t offset, int whence) {83 roar_off_t roar_vio_bio_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence) { 85 84 return -1; 86 85 } 87 86 88 int roar_vio_bio_nonblock(struct roar_vio_calls * vio, int state) {89 return -1;90 }91 87 int roar_vio_bio_sync (struct roar_vio_calls * vio) { 92 88 return -1; -
libroar/vio_buffer.c
r5276 r5278 146 146 struct roar_vio_buffer * self = vio->inst; 147 147 struct roar_vio_calls * backend; 148 off_t dst = 0;148 roar_off_t dst = 0; 149 149 150 150 if ( self->use_re ) { … … 182 182 183 183 // do the seek: 184 if ( roar_vio_lseek(backend, dst, SEEK_CUR) == ( off_t)-1 )184 if ( roar_vio_lseek(backend, dst, SEEK_CUR) == (roar_off_t)-1 ) 185 185 return -1; 186 186 … … 207 207 } 208 208 209 off_t roar_vio_buffer_lseek (struct roar_vio_calls * vio,off_t offset, int whence) {209 roar_off_t roar_vio_buffer_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence) { 210 210 struct roar_vio_buffer * self = vio->inst; 211 211 size_t newoff; 212 off_t ret;213 off_t invoff;212 roar_off_t ret; 213 roar_off_t invoff; 214 214 215 215 // in-memory seeking is only supported for SEEK_CUR: … … 286 286 } 287 287 288 if (ret != ( off_t)-1)288 if (ret != (roar_off_t)-1) 289 289 self->abspos = ret; 290 290 … … 292 292 } 293 293 294 int roar_vio_buffer_ctl (struct roar_vio_calls * vio, int cmd, void * data) {294 int roar_vio_buffer_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 295 295 struct roar_vio_buffer * self; 296 296 -
libroar/vio_buffer_store.c
r5276 r5278 132 132 } 133 133 134 off_t roar_vio_buffer_store_lseek (struct roar_vio_calls * vio,off_t offset, int whence) {134 roar_off_t roar_vio_buffer_store_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence) { 135 135 // TODO: implement support to seek forward as wide as the buffer allows us to seek. 136 return ( off_t)-1;136 return (roar_off_t)-1; 137 137 } 138 138 … … 141 141 } 142 142 143 int roar_vio_buffer_store_ctl (struct roar_vio_calls * vio, int cmd, void * data) {143 int roar_vio_buffer_store_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 144 144 if (vio == NULL || cmd == -1) 145 145 return -1; -
libroar/vio_cmd.c
r5276 r5278 251 251 calls->read = roar_vio_2popen_read; 252 252 calls->write = roar_vio_2popen_write; 253 calls->nonblock = roar_vio_2popen_nonblock;254 253 calls->sync = roar_vio_2popen_sync; 255 254 calls->ctl = roar_vio_2popen_ctl; … … 536 535 } 537 536 538 int roar_vio_cmd_ctl (struct roar_vio_calls * vio, int cmd, void * data) {537 int roar_vio_cmd_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 539 538 struct roar_vio_cmd_state * state = (struct roar_vio_cmd_state *)vio->inst; 540 539 char buf[1]; -
libroar/vio_jumbo.c
r5276 r5278 120 120 } 121 121 122 off_t roar_vio_jumbo_lseek (struct roar_vio_calls * vio,off_t offset, int whence) {122 roar_off_t roar_vio_jumbo_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence) { 123 123 struct roar_vio_jumbo * self = vio->inst; 124 124 125 125 if ( roar_vio_jumbo_sync(vio) == -1 ) 126 return ( off_t) -1;126 return (roar_off_t) -1; 127 127 128 128 return roar_vio_lseek(self->backend, offset, whence); … … 148 148 } 149 149 150 int roar_vio_jumbo_ctl (struct roar_vio_calls * vio, int cmd, void * data) {150 int roar_vio_jumbo_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 151 151 struct roar_vio_jumbo * self = vio->inst; 152 152 -
libroar/vio_magic.c
r4708 r5278 36 36 #include "libroar.h" 37 37 38 int roar_vio_open_magic (struct roar_vio_calls * calls, struct roar_vio_calls * dst, int * codec); 39 int roar_vio_magic_close (struct roar_vio_calls * vio); 38 #if 0 40 39 41 ssize_t roar_vio_magic_read (struct roar_vio_calls * vio, void *buf, size_t count) { 40 static int roar_vio_magic_close (struct roar_vio_calls * vio); 41 42 static ssize_t roar_vio_magic_read (struct roar_vio_calls * vio, void *buf, size_t count) { 42 43 struct roar_vio_magic * self = (struct roar_vio_magic *)(vio->inst); 43 44 struct roar_buffer * inp; … … 75 76 } 76 77 77 s size_t roar_vio_magic_write (struct roar_vio_calls * vio, void *buf, size_t count) {78 static ssize_t roar_vio_magic_write (struct roar_vio_calls * vio, void *buf, size_t count) { 78 79 struct roar_vio_magic * self = (struct roar_vio_magic *)(vio->inst); 79 80 void * calls; … … 88 89 } 89 90 90 off_t roar_vio_magic_lseek (struct roar_vio_calls * vio,off_t offset, int whence) {91 static roar_off_t roar_vio_magic_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence) { 91 92 struct roar_vio_magic * self = (struct roar_vio_magic *)(vio->inst); 92 93 void * calls; … … 101 102 } 102 103 103 int roar_vio_magic_nonblock(struct roar_vio_calls * vio, int state) { 104 struct roar_vio_magic * self = (struct roar_vio_magic *)(vio->inst); 105 void * calls; 106 107 if (self == NULL) 108 return -1; 109 110 if ( roar_stack_get_cur(&(self->vios), &calls) == -1 ) 111 return -1; 112 113 return roar_vio_nonblock((struct roar_vio_calls*)calls, state); 114 } 115 116 int roar_vio_magic_sync (struct roar_vio_calls * vio) { 104 static int roar_vio_magic_sync (struct roar_vio_calls * vio) { 117 105 struct roar_vio_magic * self = (struct roar_vio_magic *)(vio->inst); 118 106 void * calls; … … 127 115 } 128 116 117 int roar_vio_open_magic (struct roar_vio_calls * calls, struct roar_vio_calls * dst, int * codec); 118 119 #endif 120 129 121 //ll -
libroar/vio_misc.c
r5276 r5278 54 54 } 55 55 56 static off_t roar_vio_misc_lseek (struct roar_vio_calls * vio,off_t offset, int whence) {56 static roar_off_t roar_vio_misc_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence) { 57 57 (void)vio, (void)offset, (void)whence; 58 58 return 0; … … 64 64 } 65 65 66 static int roar_vio_misc_ctl (struct roar_vio_calls * vio, int cmd, void * data) {66 static int roar_vio_misc_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 67 67 struct roar_vio_misc * self = vio->inst; 68 68 -
libroar/vio_pipe.c
r5276 r5278 195 195 } 196 196 197 int roar_vio_pipe_ctl (struct roar_vio_calls * vio, int cmd, void * data) {197 int roar_vio_pipe_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 198 198 struct roar_vio_pipe * self; 199 199 -
libroar/vio_proto.c
r5276 r5278 120 120 calls->read = roar_vio_proto_read; 121 121 calls->write = roar_vio_proto_write; 122 // calls->lseek = roar_vio_proto_lseek; // TODO: this is currently not supported123 122 calls->sync = roar_vio_proto_sync; 124 123 calls->ctl = roar_vio_proto_ctl; … … 229 228 } 230 229 231 // TODO: this is currently not implemented as this is hard to implement with buffers:232 off_t roar_vio_proto_lseek (struct roar_vio_calls * vio, off_t offset, int whence);233 234 230 int roar_vio_proto_sync (struct roar_vio_calls * vio) { 235 231 struct roar_vio_proto * self = vio->inst; … … 238 234 } 239 235 240 int roar_vio_proto_ctl (struct roar_vio_calls * vio, int cmd, void * data) {236 int roar_vio_proto_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 241 237 struct roar_vio_proto * self = vio->inst; 242 238 -
libroar/vio_rtp.c
r5276 r5278 114 114 calls->read = roar_vio_rtp_read; 115 115 calls->write = roar_vio_rtp_write; 116 // calls->lseek = roar_vio_rtp_lseek;117 116 calls->sync = roar_vio_rtp_sync; 118 117 calls->ctl = roar_vio_rtp_ctl; … … 313 312 } 314 313 315 off_t roar_vio_rtp_lseek (struct roar_vio_calls * vio, off_t offset, int whence);316 317 314 int roar_vio_rtp_sync (struct roar_vio_calls * vio) { 318 315 struct roar_rtp_inst * self = vio->inst; … … 323 320 } 324 321 325 int roar_vio_rtp_ctl (struct roar_vio_calls * vio, int cmd, void * data) {322 int roar_vio_rtp_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 326 323 struct roar_rtp_inst * self = vio->inst; 327 324 struct roar_stream * s = NULL; -
libroar/vio_stack.c
r5276 r5278 116 116 } 117 117 118 int roar_vio_stack_ctl (struct roar_vio_calls * vio, int cmd, void * data) {118 int roar_vio_stack_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 119 119 if (vio == NULL || cmd == -1) 120 120 return -1; … … 170 170 } 171 171 172 off_t roar_vio_stack_lseek (struct roar_vio_calls * vio,off_t offset, int whence) {172 roar_off_t roar_vio_stack_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence) { 173 173 if ( vio == NULL ) 174 174 return -1; -
libroar/vio_stdio.c
r5270 r5278 131 131 } 132 132 133 off_t roar_vio_stdio_lseek (struct roar_vio_calls * vio,off_t offset, int whence) {133 roar_off_t roar_vio_stdio_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence) { 134 134 #if defined(ROAR_HAVE_FSEEK) && defined(ROAR_HAVE_FTELL) 135 135 if ( fseek((FILE*)(vio->inst), offset, whence) == -1 ) … … 138 138 return ftell((FILE*)(vio->inst)); 139 139 #else 140 return ( off_t)-1;140 return (roar_off_t)-1; 141 141 #endif 142 142 } … … 146 146 } 147 147 148 int roar_vio_stdio_ctl (struct roar_vio_calls * vio, int cmd, void * data) {148 int roar_vio_stdio_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 149 149 150 150 if ( vio == NULL || cmd == -1 ) -
libroar/vio_stream.c
r5276 r5278 44 44 } 45 45 46 static off_t _vio_stream_lseek (struct roar_vio_calls * vio,off_t offset, int whence) {46 static roar_off_t _vio_stream_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence) { 47 47 return roar_vio_lseek(roar_get_connection_vio2(vio->inst), offset, whence); 48 48 } … … 50 50 return roar_vio_sync(roar_get_connection_vio2(vio->inst)); 51 51 } 52 static int _vio_stream_ctl (struct roar_vio_calls * vio, int cmd, void * data) {52 static int _vio_stream_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 53 53 if (vio == NULL) { 54 54 roar_err_set(ROAR_ERROR_FAULT); -
libroar/vio_string.c
r4708 r5278 67 67 char cur; 68 68 char buf[1024]; 69 off_t offs;69 roar_off_t offs; 70 70 char * eol; 71 71 … … 79 79 size -= 1; 80 80 81 if ( (offs = roar_vio_lseek(vio, 0, SEEK_CUR)) == ( off_t)-1 ) {81 if ( (offs = roar_vio_lseek(vio, 0, SEEK_CUR)) == (roar_off_t)-1 ) { 82 82 // need to use the one byte at a time methode 83 83 while ( have < size ) { -
libroar/vio_winsock.c
r5276 r5278 49 49 } 50 50 51 int roar_vio_winsock_ctl (struct roar_vio_calls * vio, int cmd, void * data) {51 int roar_vio_winsock_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 52 52 int tmp; 53 53 int s_r = 0, s_w = 0; -
libroar/vio_zlib.c
r5276 r5278 429 429 } 430 430 431 static off_t roar_vio_zlib_lseek (struct roar_vio_calls * vio,off_t offset, int whence) {431 static roar_off_t roar_vio_zlib_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence) { 432 432 (void)vio, (void)offset, (void)whence; 433 433 roar_err_set(ROAR_ERROR_NOSYS); 434 return ( off_t)-1;434 return (roar_off_t)-1; 435 435 } 436 436 … … 447 447 } 448 448 449 static int roar_vio_zlib_ctl (struct roar_vio_calls * vio, int cmd, void * data) {449 static int roar_vio_zlib_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 450 450 struct roar_vio_gzip * self; 451 451 -
libroardsp/vio_transcode.c
r5270 r5278 80 80 } 81 81 82 off_t roar_vio_xcode_lseek (struct roar_vio_calls * vio, off_t offset, int whence);83 int roar_vio_xcode_nonblock(struct roar_vio_calls * vio, int state);84 82 int roar_vio_xcode_sync (struct roar_vio_calls * vio); 85 int roar_vio_xcode_ctl (struct roar_vio_calls * vio, int cmd, void * data);86 83 87 84 int roar_vio_xcode_close (struct roar_vio_calls * vio) { … … 151 148 } 152 149 153 off_t roar_vio_bixcode_lseek (struct roar_vio_calls * vio, off_t offset, int whence);154 int roar_vio_bixcode_nonblock(struct roar_vio_calls * vio, int state);155 150 int roar_vio_bixcode_sync (struct roar_vio_calls * vio); 156 int roar_vio_bixcode_ctl (struct roar_vio_calls * vio, int cmd, void * data);157 151 158 152 int roar_vio_bixcode_close (struct roar_vio_calls * vio) { -
roard/container_framework.c
r5276 r5278 197 197 } 198 198 199 off_t cont_fw_lseek (struct roar_vio_calls * vio,off_t offset, int whence);199 roar_off_t cont_fw_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence); 200 200 201 201 int cont_fw_sync (struct roar_vio_calls * vio) { … … 233 233 } 234 234 235 int cont_fw_ctl (struct roar_vio_calls * vio, int cmd, void * data);235 int cont_fw_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 236 236 237 237 // VIO Parent: … … 260 260 } 261 261 262 off_t cont_pvio_lseek (struct roar_vio_calls * vio,off_t offset, int whence) {262 roar_off_t cont_pvio_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence) { 263 263 return roar_vio_lseek(&(((struct cont_fw_parent_inst*)(vio->inst))->stream.stream->vio), offset, whence); 264 264 } … … 268 268 } 269 269 270 int cont_pvio_ctl (struct roar_vio_calls * vio, int cmd, void * data) {270 int cont_pvio_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 271 271 return roar_vio_ctl(&(((struct cont_fw_parent_inst*)(vio->inst))->stream.stream->vio), cmd, data); 272 272 } -
roard/driver.c
r5276 r5278 317 317 #endif 318 318 319 int driver_dummy_ctl(struct roar_vio_calls * vio, int cmd, void * data) {319 int driver_dummy_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 320 320 switch (cmd) { 321 321 case ROAR_VIO_CTL_NONBLOCK: -
roard/driver_alsa.c
r5276 r5278 324 324 */ 325 325 326 int driver_alsa_ctl(struct roar_vio_calls * vio, int cmd, void * data) {326 int driver_alsa_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 327 327 roar_alsa_t * device = vio->inst; 328 328 snd_pcm_sframes_t alsa_delay; -
roard/driver_artsc.c
r5276 r5278 156 156 } 157 157 158 int driver_artsc_ctl (struct roar_vio_calls * vio, int cmd, void * data) {158 int driver_artsc_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 159 159 struct roar_artsc * self = vio->inst; 160 160 ssize_t bps; -
roard/driver_dmx.c
r5242 r5278 66 66 return -1; 67 67 68 if ( roar_vio_lseek(vio, 0, SEEK_SET) == ( off_t)-1 )68 if ( roar_vio_lseek(vio, 0, SEEK_SET) == (roar_off_t)-1 ) 69 69 return -1; 70 70 … … 72 72 } 73 73 74 int driver_dmx_ctl(struct roar_vio_calls * vio, int cmd, void * data) {74 int driver_dmx_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 75 75 76 76 if ( vio == NULL ) -
roard/driver_jack.c
r5276 r5278 163 163 } 164 164 165 int driver_jack_ctl (struct roar_vio_calls * vio, int cmd, void * data) {165 int driver_jack_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 166 166 struct driver_jack * self = vio->inst; 167 167 // function for a lot control features. … … 184 184 *(int*)data = FH...; 185 185 */ 186 roar_err_set(ROAR_ERROR_NOTSUP); 186 187 return -1; 187 188 break; … … 191 192 break; 192 193 case ROAR_VIO_CTL_NONBLOCK: 193 // control if read and write calls should block untill all data is read or written. 194 // state is in *(int*)data and could be: 195 // ROAR_SOCKET_BLOCK - Block untill the data is read or written 196 // ROAR_SOCKET_NONBLOCK - Return as soon as possible 194 // control if read and write calls should block untill all data is read or written. 195 // state is in *(int*)data and could be: 196 // ROAR_SOCKET_BLOCK - Block untill the data is read or written 197 // ROAR_SOCKET_NONBLOCK - Return as soon as possible 198 roar_err_set(ROAR_ERROR_NOTSUP); 199 return -1; 197 200 break; 198 201 case ROAR_VIO_CTL_GET_AUINFO: 199 202 case ROAR_VIO_CTL_SET_AUINFO: 200 203 // get or set audio info, data is a struct roar_audio_info*. 204 roar_err_set(ROAR_ERROR_NOTSUP); 201 205 return -1; 202 206 break; 203 207 case ROAR_VIO_CTL_GET_DBLKSIZE: 204 208 case ROAR_VIO_CTL_SET_DBLKSIZE: 205 // get or set block size used, data is uint_least32_t*, number of bytes. 209 // get or set block size used, data is uint_least32_t*, number of bytes. 210 roar_err_set(ROAR_ERROR_NOTSUP); 206 211 return -1; 207 212 break; 208 213 case ROAR_VIO_CTL_GET_DBLOCKS: 209 214 case ROAR_VIO_CTL_SET_DBLOCKS: 210 // get or set number of blocks used, data is uint_least32_t*. 215 // get or set number of blocks used, data is uint_least32_t*. 216 roar_err_set(ROAR_ERROR_NOTSUP); 211 217 return -1; 212 218 break; 213 219 case ROAR_VIO_CTL_SET_SSTREAM: 214 220 // set server stream object for this stream, data is struct roar_stream_server* 221 roar_err_set(ROAR_ERROR_NOTSUP); 215 222 return -1; 216 223 break; 217 224 case ROAR_VIO_CTL_SET_SSTREAMID: 218 225 // set stream ID for this stream, data is int* 226 roar_err_set(ROAR_ERROR_NOTSUP); 219 227 return -1; 220 228 break; 221 229 case ROAR_VIO_CTL_SET_VOLUME: 222 230 // set volume for this device, data is struct roar_mixer_settings* 231 roar_err_set(ROAR_ERROR_NOTSUP); 223 232 return -1; 224 233 break; … … 226 235 // get delay of this stream, data is uint_least32_t*, in bytes 227 236 // there is more about delay. please ask. 228 return -1; 229 break; 230 default: 231 return -1; 232 break; 233 } 237 roar_err_set(ROAR_ERROR_NOTSUP); 238 return -1; 239 break; 240 } 241 242 roar_err_set(ROAR_ERROR_BADRQC); 243 return -1; 234 244 } 235 245 -
roard/driver_oss.c
r5276 r5278 455 455 } 456 456 457 int driver_oss_ctl(struct roar_vio_calls * vio, int cmd, void * data) {457 int driver_oss_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 458 458 struct driver_oss * self = vio->inst; 459 459 #ifdef SNDCTL_DSP_GETODELAY -
roard/driver_pulsesimple.c
r5276 r5278 159 159 } 160 160 161 int driver_pulsesimple_ctl (struct roar_vio_calls * vio, int cmd, void * data) {161 int driver_pulsesimple_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 162 162 struct driver_pulsesimple * self = vio->inst; 163 163 -
roard/driver_pwmled.c
r5276 r5278 122 122 } 123 123 124 int driver_pwmled_ctl(struct roar_vio_calls * vio, int cmd, void * data) {124 int driver_pwmled_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 125 125 struct driver_pwmled * self = vio->inst; 126 126 -
roard/driver_sndio.c
r5276 r5278 37 37 vio->sync = driver_sndio_sync; 38 38 vio->ctl = driver_sndio_ctl; 39 vio->nonblock = driver_dummy_nonblock;40 39 41 40 vio->inst = (void*) inst; … … 230 229 #define no_data(x) x: if ( data != NULL ) return -1; 231 230 232 int driver_sndio_ctl (struct roar_vio_calls * vio, int cmd, void * data) {231 int driver_sndio_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 233 232 struct driver_sndio * self = vio->inst; 234 233 unsigned d; -
roard/include/container_framework.h
r4708 r5278 82 82 ssize_t cont_fw_read (struct roar_vio_calls * vio, void *buf, size_t count); 83 83 ssize_t cont_fw_write (struct roar_vio_calls * vio, void *buf, size_t count); 84 off_t cont_fw_lseek (struct roar_vio_calls * vio, off_t offset, int whence); 85 int cont_fw_nonblock(struct roar_vio_calls * vio, int state); 84 roar_off_t cont_fw_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence); 86 85 int cont_fw_sync (struct roar_vio_calls * vio); 87 int cont_fw_ctl (struct roar_vio_calls * vio, int cmd, void * data);86 int cont_fw_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 88 87 int cont_fw_close (struct roar_vio_calls * vio); 89 88 … … 92 91 ssize_t cont_pvio_read (struct roar_vio_calls * vio, void *buf, size_t count); 93 92 ssize_t cont_pvio_write (struct roar_vio_calls * vio, void *buf, size_t count); 94 off_t cont_pvio_lseek (struct roar_vio_calls * vio, off_t offset, int whence); 95 int cont_pvio_nonblock(struct roar_vio_calls * vio, int state); 93 roar_off_t cont_pvio_lseek (struct roar_vio_calls * vio, roar_off_t offset, int whence); 96 94 int cont_pvio_sync (struct roar_vio_calls * vio); 97 int cont_pvio_ctl (struct roar_vio_calls * vio, int cmd, void * data);95 int cont_pvio_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 98 96 int cont_pvio_close (struct roar_vio_calls * vio); 99 97 -
roard/include/driver.h
r5276 r5278 159 159 #endif 160 160 161 int driver_dummy_ctl(struct roar_vio_calls * vio, int cmd, void * data);161 int driver_dummy_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 162 162 163 163 #endif -
roard/include/driver_alsa.h
r4708 r5278 41 41 int driver_alsa_close (struct roar_vio_calls * vio); 42 42 int driver_alsa_sync (struct roar_vio_calls * vio); 43 int driver_alsa_ctl (struct roar_vio_calls * vio, int cmd, void * data);43 int driver_alsa_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 44 44 45 45 #endif -
roard/include/driver_artsc.h
r4809 r5278 35 35 ssize_t driver_artsc_write (struct roar_vio_calls * vio, void *buf, size_t count); 36 36 int driver_artsc_close (struct roar_vio_calls * vio); 37 int driver_artsc_nonblock(struct roar_vio_calls * vio, int state); 38 int driver_artsc_ctl (struct roar_vio_calls * vio, int cmd, void * data); 37 int driver_artsc_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 39 38 40 39 #endif -
roard/include/driver_dmx.h
r4708 r5278 35 35 int driver_dmx_open_vio (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 36 36 ssize_t driver_dmx_write (struct roar_vio_calls * vio, void *buf, size_t count); 37 int driver_dmx_ctl (struct roar_vio_calls * vio, int cmd, void * data);37 int driver_dmx_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 38 38 39 39 #endif -
roard/include/driver_jack.h
r4825 r5278 38 38 ssize_t driver_jack_read (struct roar_vio_calls * vio, void *buf, size_t count); 39 39 ssize_t driver_jack_write (struct roar_vio_calls * vio, void *buf, size_t count); 40 int driver_jack_nonblock(struct roar_vio_calls * vio, int state);41 40 int driver_jack_sync (struct roar_vio_calls * vio); 42 int driver_jack_ctl (struct roar_vio_calls * vio, int cmd, void * data);41 int driver_jack_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 43 42 int driver_jack_close (struct roar_vio_calls * vio); 44 43 -
roard/include/driver_oss.h
r5276 r5278 42 42 int driver_oss_close(DRIVER_USERDATA_T inst); 43 43 int driver_oss_sync(struct roar_vio_calls * vio); 44 int driver_oss_ctl(struct roar_vio_calls * vio, int cmd, void * data);44 int driver_oss_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 45 45 46 46 ssize_t driver_oss_write (struct roar_vio_calls * vio, void *buf, size_t count); -
roard/include/driver_portaudio.h
r4858 r5278 49 49 ssize_t driver_portaudio_write (struct roar_vio_calls * vio, void *buf, size_t count); 50 50 int driver_portaudio_sync (struct roar_vio_calls * vio); 51 int driver_portaudio_ctl (struct roar_vio_calls * vio, int cmd, void * data);52 int driver_portaudio_nonblock (struct roar_vio_calls * vio, int state);53 51 54 52 #endif -
roard/include/driver_pulsesimple.h
r4708 r5278 41 41 ssize_t driver_pulsesimple_write (struct roar_vio_calls * vio, void *buf, size_t count); 42 42 int driver_pulsesimple_sync (struct roar_vio_calls * vio); 43 int driver_pulsesimple_ctl (struct roar_vio_calls * vio, int cmd, void * data);43 int driver_pulsesimple_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 44 44 45 45 -
roard/include/driver_pwmled.h
r4708 r5278 42 42 int driver_pwmled_open_vio (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 43 43 ssize_t driver_pwmled_write (struct roar_vio_calls * vio, void *buf, size_t count); 44 int driver_pwmled_ctl (struct roar_vio_calls * vio, int cmd, void * data);44 int driver_pwmled_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 45 45 int driver_pwmled_close (struct roar_vio_calls * vio); 46 46 -
roard/include/driver_sndio.h
r4708 r5278 46 46 ssize_t driver_sndio_write (struct roar_vio_calls * vio, void *buf, size_t count); 47 47 int driver_sndio_sync (struct roar_vio_calls * vio); 48 int driver_sndio_ctl (struct roar_vio_calls * vio, int cmd, void * data);48 int driver_sndio_ctl (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data); 49 49 50 50 -
roard/include/driver_sysclock.h
r4897 r5278 35 35 int driver_sysclock_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream); 36 36 int driver_sysclock_close (struct roar_vio_calls * vio); 37 int driver_sysclock_nonblock(struct roar_vio_calls * vio, int state);38 37 ssize_t driver_sysclock_write (struct roar_vio_calls * vio, void *buf, size_t count); 39 38 -
roard/include/midi.h
r5276 r5278 174 174 // dummys: 175 175 int midi_vio_set_dummy(int stream); 176 int midi_vio_ctl(struct roar_vio_calls * vio, int cmd, void * data);177 int midi_vio_ok(struct roar_vio_calls * vio, ...);178 176 179 177 #endif -
roard/midi.c
r5276 r5278 1049 1049 // VIO: 1050 1050 1051 static int midi_vio_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 1052 if ( cmd == ROAR_VIO_CTL_NONBLOCK ) 1053 return 0; 1054 return -1; 1055 } 1056 1057 static int midi_vio_ok(struct roar_vio_calls * vio, ...) { 1058 return 0; 1059 } 1060 1051 1061 int midi_vio_set_dummy(int stream) { 1052 1062 struct roar_stream_server * ss; … … 1065 1075 } 1066 1076 1067 int midi_vio_ctl(struct roar_vio_calls * vio, int cmd, void * data) {1068 if ( cmd == ROAR_VIO_CTL_NONBLOCK )1069 return 0;1070 return -1;1071 }1072 1073 int midi_vio_ok(struct roar_vio_calls * vio, ...) {1074 return 0;1075 }1076 1077 1077 #endif 1078 1078 -
roard/sources.c
r5276 r5278 323 323 } 324 324 325 if ( roar_vio_lseek(vio, -len, SEEK_CUR) == ( off_t)-1 ) {325 if ( roar_vio_lseek(vio, -len, SEEK_CUR) == (roar_off_t)-1 ) { 326 326 _ret(-1); 327 327 } … … 418 418 } 419 419 420 static int sources_radionoise_ctl(struct roar_vio_calls * vio, int cmd, void * data) {420 static int sources_radionoise_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 421 421 if ( cmd == ROAR_VIO_CTL_NONBLOCK ) 422 422 return 0;
Note: See TracChangeset
for help on using the changeset viewer.