Changeset 5288:1cb22eb99e5d in roaraudio


Ignore:
Timestamp:
11/22/11 13:19:23 (11 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

updated stream_vio_*() types to match roar_vio_*() types

Location:
roard
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • roard/include/streams.h

    r5194 r5288  
    211211int streams_fill_mixbuffer2  (int id, struct roar_audio_info * info); 
    212212 
    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); 
     213ssize_t stream_vio_read (int stream, void         * buf, size_t count); 
     214ssize_t stream_vio_write(int stream, void         * buf, size_t count); 
     215int     stream_vio_ctl  (int stream, roar_vio_ctl_t cmd, void * data); 
     216ssize_t stream_vio_s_read (struct roar_stream_server * stream, void         * buf, size_t count); 
     217ssize_t stream_vio_s_write(struct roar_stream_server * stream, void         * buf, size_t count); 
     218int     stream_vio_s_ctl  (struct roar_stream_server * stream, roar_vio_ctl_t cmd, void * data); 
    219219 
    220220#endif 
  • roard/streams.c

    r5265 r5288  
    26012601} 
    26022602 
    2603 int     stream_vio_ctl  (int stream, int cmd,   void * data) { 
     2603int     stream_vio_ctl  (int stream, roar_vio_ctl_t cmd,   void * data) { 
    26042604 _CHECK_SID(stream); 
    26052605 
     
    27202720} 
    27212721 
    2722 int     stream_vio_s_ctl  (struct roar_stream_server * stream, int cmd,   void * data) { 
    2723  if ( stream == NULL ) 
    2724   return -1; 
     2722int     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 } 
    27252727 
    27262728 return roar_vio_ctl(stream->viop, cmd, data); 
Note: See TracChangeset for help on using the changeset viewer.