Changeset 5288:1cb22eb99e5d in roaraudio for roard
- Timestamp:
- 11/22/11 13:19:23 (12 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/include/streams.h
r5194 r5288 211 211 int streams_fill_mixbuffer2 (int id, struct roar_audio_info * info); 212 212 213 ssize_t stream_vio_read (int stream, void *buf, size_t count);214 ssize_t stream_vio_write(int stream, void *buf, size_t count);215 int stream_vio_ctl (int stream, int cmd,void * data);216 ssize_t stream_vio_s_read (struct roar_stream_server * stream, void *buf, size_t count);217 ssize_t stream_vio_s_write(struct roar_stream_server * stream, void *buf, size_t count);218 int stream_vio_s_ctl (struct roar_stream_server * stream, int cmd,void * data);213 ssize_t stream_vio_read (int stream, void * buf, size_t count); 214 ssize_t stream_vio_write(int stream, void * buf, size_t count); 215 int stream_vio_ctl (int stream, roar_vio_ctl_t cmd, void * data); 216 ssize_t stream_vio_s_read (struct roar_stream_server * stream, void * buf, size_t count); 217 ssize_t stream_vio_s_write(struct roar_stream_server * stream, void * buf, size_t count); 218 int stream_vio_s_ctl (struct roar_stream_server * stream, roar_vio_ctl_t cmd, void * data); 219 219 220 220 #endif -
roard/streams.c
r5265 r5288 2601 2601 } 2602 2602 2603 int stream_vio_ctl (int stream, int cmd, void * data) {2603 int stream_vio_ctl (int stream, roar_vio_ctl_t cmd, void * data) { 2604 2604 _CHECK_SID(stream); 2605 2605 … … 2720 2720 } 2721 2721 2722 int stream_vio_s_ctl (struct roar_stream_server * stream, int cmd, void * data) { 2723 if ( stream == NULL ) 2724 return -1; 2722 int stream_vio_s_ctl (struct roar_stream_server * stream, roar_vio_ctl_t cmd, void * data) { 2723 if ( stream == NULL ) { 2724 roar_err_set(ROAR_ERROR_FAULT); 2725 return -1; 2726 } 2725 2727 2726 2728 return roar_vio_ctl(stream->viop, cmd, data);
Note: See TracChangeset
for help on using the changeset viewer.