From b0c5e0bdea90d5d045039724977f673505829756 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 2 Oct 2007 21:02:45 +0000 Subject: comment watermark stuff for now git-svn-id: file:///home/lennart/svn/public/libsydney/trunk@39 9ba3c220-e4d3-45a2-8aa3-73fcc9aff6ce --- src/sydney.h | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'src/sydney.h') diff --git a/src/sydney.h b/src/sydney.h index 8733260..00887f9 100644 --- a/src/sydney.h +++ b/src/sydney.h @@ -8,7 +8,7 @@ of zeros to be issued to that one can do "while (1); {read(); write()} - All functions are thread-safe and can be called in any thread context. None of the functions is async-signal safe. - + - It is assumed that duplex streams have a single clock (synchronised) */ @@ -221,12 +221,12 @@ typedef enum { } sa_adjust_t; /* Some kind of meta information. */ -#define SA_META_CLIENT_NAME "sydney.client-name" /* utf-8 */ +#define SA_META_CLIENT_NAME "sydney.client-name" /* utf-8 */ #define SA_META_PROCESS_ID "sydney.process-id" /* getpid() */ #define SA_META_LANGUAGE "sydney.language" /* de_DE and similar */ /* Some kind of meta information. Not filled in */ -#define SA_META_STREAM_NAME "sydney.stream-name" /* utf-8 */ +#define SA_META_STREAM_NAME "sydney.stream-name" /* utf-8 */ #define SA_META_ICON_NAME "sydney.icon-name" /* file name (no slashes) */ #define SA_META_ICON_PNG "sydney.icon-png" /* PNG blob */ #define SA_META_ROLE "sydney.role" /* one of: "music", "phone", "game", "event" */ @@ -249,10 +249,10 @@ int sa_stream_open(sa_stream_t *s); int sa_stream_destroy(sa_stream_t *s); /* "Soft" params */ -int sa_stream_set_write_lower_watermark(sa_stream_t *s, size_t size); -int sa_stream_set_read_lower_watermark(sa_stream_t *s, size_t size); -int sa_stream_set_write_user_size(sa_stream_t *s, size_t size); -int sa_stream_set_read_user_size(sa_stream_t *s, size_t size); +/* int sa_stream_set_write_lower_watermark(sa_stream_t *s, size_t size); */ +/* int sa_stream_set_read_lower_watermark(sa_stream_t *s, size_t size); */ +/* int sa_stream_set_write_user_size(sa_stream_t *s, size_t size); */ +/* int sa_stream_set_read_user_size(sa_stream_t *s, size_t size); */ /** Set the mapping between channels and the loudspeakers */ int sa_stream_set_channel_map(sa_stream_t *s, const sa_channel_t map[], unsigned n); @@ -263,6 +263,9 @@ int sa_stream_set_xrun_mode(sa_stream_t *s, sa_xrun_mode_t mode); /** Set the device to non-interleaved mode */ int sa_stream_set_non_interleaved(sa_stream_t *s, int enable); +/** Allow that the sample rate may be changed during runtime */ +int sa_stream_set_dynamic_rate(sa_stream_t *s, int enabled); + /** Select driver */ int sa_stream_set_driver(sa_stream_t *s, const char *driver); @@ -294,7 +297,7 @@ int sa_stream_change_user_data(sa_stream_t *s, const void *value); int sa_stream_set_adjust_rate(sa_stream_t *s, sa_adjust_t direction); int sa_stream_set_adjust_nchannels(sa_stream_t *s, sa_adjust_t direction); int sa_stream_set_adjust_pcm_format(sa_stream_t *s, sa_adjust_t direction); -int sa_stream_set_adjust_watermarks(sa_stream_t *s, sa_adjust_t direction); +/* int sa_stream_set_adjust_watermarks(sa_stream_t *s, sa_adjust_t direction); */ /* Query functions */ @@ -304,10 +307,10 @@ 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); int sa_stream_get_user_data(sa_stream_t *s, void **value); -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_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, 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); @@ -320,7 +323,7 @@ int sa_stream_get_meta_data(sa_stream_t *s, const char *name, void*data, size_t 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); -int sa_stream_get_adjust_watermarks(sa_stream_t *s, sa_adjust_t *direction); +/* int sa_stream_get_adjust_watermarks(sa_stream_t *s, sa_adjust_t *direction); */ /** Get current state of the audio device */ int sa_stream_get_state(sa_stream_t *s, sa_state_t *state); -- cgit