Changeset 5288:1cb22eb99e5d in roaraudio

Timestamp:

11/22/11 13:19:23 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

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

Location:

roard

Files:

• include/streams.h (modified) (1 diff)
• streams.c (modified) (2 diffs)

roard/include/streams.h

@@ -211 +211 @@
 int streams_fill_mixbuffer2  (int id, struct roar_audio_info * info);
 
-ssize_t stream_vio_read (int stream, void *buf, size_t count);
-ssize_t stream_vio_write(int stream, void *buf, size_t count);
-int     stream_vio_ctl  (int stream, int cmd,   void * data);
-ssize_t stream_vio_s_read (struct roar_stream_server * stream, void *buf, size_t count);
-ssize_t stream_vio_s_write(struct roar_stream_server * stream, void *buf, size_t count);
-int     stream_vio_s_ctl  (struct roar_stream_server * stream, int cmd,   void * data);
+ssize_t stream_vio_read (int stream, void         * buf, size_t count);
+ssize_t stream_vio_write(int stream, void         * buf, size_t count);
+int     stream_vio_ctl  (int stream, roar_vio_ctl_t cmd, void * data);
+ssize_t stream_vio_s_read (struct roar_stream_server * stream, void         * buf, size_t count);
+ssize_t stream_vio_s_write(struct roar_stream_server * stream, void         * buf, size_t count);
+int     stream_vio_s_ctl  (struct roar_stream_server * stream, roar_vio_ctl_t cmd, void * data);
 
 #endif

roard/streams.c

@@ -2601 +2601 @@
 }
 
-int     stream_vio_ctl  (int stream, int cmd,   void * data) {
+int     stream_vio_ctl  (int stream, roar_vio_ctl_t cmd,   void * data) {
  _CHECK_SID(stream);
 
@@ -2720 +2720 @@
 }
 
-int     stream_vio_s_ctl  (struct roar_stream_server * stream, int cmd,   void * data) {
- if ( stream == NULL )
-  return -1;
+int     stream_vio_s_ctl  (struct roar_stream_server * stream, roar_vio_ctl_t cmd,   void * data) {
+ if ( stream == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
 
  return roar_vio_ctl(stream->viop, cmd, data);