diff options
Diffstat (limited to 'sydney.h')
-rw-r--r-- | sydney.h | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -106,7 +106,8 @@ typedef enum { SA_ERROR_NO_INIT = -9, SA_ERROR_NO_META = -10, SA_ERROR_NO_DATA = -11, - _SA_ERROR_MAX = -12 + SA_ERROR_NO_SPACE = -12, + _SA_ERROR_MAX = -13 } sa_error_t; /** Possible events for notifications */ @@ -287,7 +288,7 @@ int sa_stream_change_rate(sa_stream_t *s, unsigned rate); int sa_stream_change_meta_data(sa_stream_t *s, const char *name, const void *data, size_t size); /** Associate opaque user data */ -int sa_stream_change_user_data(sa_stream_t *s, void *value); +int sa_stream_change_user_data(sa_stream_t *s, const void *value); /* Hardware-related. This is implementation-specific and hardware specific. */ int sa_stream_set_adjust_rate(sa_stream_t *s, sa_adjust_t direction); @@ -298,7 +299,7 @@ int sa_stream_set_adjust_watermarks(sa_stream_t *s, sa_adjust_t direction); /* Query functions */ int sa_stream_get_mode(sa_stream_t *s, sa_mode_t *access_mode); -int sa_stream_get_codec(sa_stream_t *s, const char **codec); +int sa_stream_get_codec(sa_stream_t *s, char *codec, size_t *size); int sa_stream_get_pcm_format(sa_stream_t *s, sa_pcm_format_t *format); int sa_stream_get_rate(sa_stream_t *s, unsigned *rate); int sa_stream_get_nchannels(sa_stream_t *s, int *nchannels); @@ -307,15 +308,15 @@ int sa_stream_get_write_lower_watermark(sa_stream_t *s, size_t *size); int sa_stream_get_read_lower_watermark(sa_stream_t *s, size_t *size); int sa_stream_get_write_upper_watermark(sa_stream_t *s, size_t *size); int sa_stream_get_read_upper_watermark(sa_stream_t *s, size_t *size); -int sa_stream_get_channel_map(sa_stream_t *s, const sa_channel_t *map[]); +int sa_stream_get_channel_map(sa_stream_t *s, sa_channel_t map[], unsigned *n); int sa_stream_get_xrun_mode(sa_stream_t *s, sa_xrun_mode_t *mode); int sa_stream_get_non_interleaved(sa_stream_t *s, int *enabled); int sa_stream_get_dynamic_rate(sa_stream_t *s, int *enabled); -int sa_stream_get_driver(sa_stream_t *s, const char **driver); -int sa_stream_get_device(sa_stream_t *s, const char **device_name); -int sa_stream_get_read_volume(sa_stream_t *s, const int32_t *vol[]); -int sa_stream_get_write_volume(sa_stream_t *s, const int32_t *vol[]); -int sa_stream_get_meta_data(sa_stream_t *s, const char *name, const void **data, size_t *size); +int sa_stream_get_driver(sa_stream_t *s, char *driver_name, size_t *size); +int sa_stream_get_device(sa_stream_t *s, char *device_name, size_t *size); +int sa_stream_get_read_volume(sa_stream_t *s, int32_t vol[], unsigned *n); +int sa_stream_get_write_volume(sa_stream_t *s, int32_t vol[], unsigned *n); +int sa_stream_get_meta_data(sa_stream_t *s, const char *name, void *data, size_t *size); int sa_stream_get_adjust_rate(sa_stream_t *s, sa_adjust_t *direction); int sa_stream_get_adjust_nchannels(sa_stream_t *s, sa_adjust_t *direction); int sa_stream_get_adjust_pcm_format(sa_stream_t *s, sa_adjust_t *direction); |