From 284516185f90412c22dfa9a28cb93fb344af591b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 18 May 2007 00:10:02 +0000 Subject: really prefix everything with "sa_" git-svn-id: file:///home/lennart/svn/public/libsydney/trunk@28 9ba3c220-e4d3-45a2-8aa3-73fcc9aff6ce --- converter.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'converter.h') diff --git a/converter.h b/converter.h index da48d3c..3230471 100644 --- a/converter.h +++ b/converter.h @@ -12,9 +12,9 @@ #include "common.h" #include "interleave.h" -typedef struct converter converter_t; +typedef struct sa_converter sa_converter_t; -struct converter { +struct sa_converter { sa_pcm_format_t from_pcm_format, to_pcm_format; unsigned from_nchannels, to_nchannels; unsigned from_rate, to_rate; @@ -26,17 +26,17 @@ struct converter { size_t from_sample_size, work_sample_size, to_sample_size; - byteswap_func_t pre_byteswap_func, post_byteswap_func; - format_func_t pre_format_func, post_format_func; - volscale_func_t volscale_func; - zero_func_t zero_func; - add_func_t add_func; - resample_func_t resample_func; - interleave_func_t interleave_func; + sa_byteswap_func_t pre_byteswap_func, post_byteswap_func; + sa_format_func_t pre_format_func, post_format_func; + sa_volscale_func_t volscale_func; + sa_zero_func_t zero_func; + sa_add_func_t add_func; + sa_resample_func_t resample_func; + sa_interleave_func_t interleave_func; SpeexResamplerState *speex; - bbuffer_t bb_pre_byteswap, + sa_bbuffer_t bb_pre_byteswap, bb_pre_format, bb_volscale, bb_remap, @@ -58,24 +58,24 @@ struct converter { size_t zero_size; }; -int converter_init(converter_t *c, const pcm_attrs_t *from, const pcm_attrs_t *to, int dynamic_rate_enabled); -void converter_done(converter_t *c); +int sa_converter_init(sa_converter_t *c, const pcm_attrs_t *from, const pcm_attrs_t *to, int dynamic_rate_enabled); +void sa_converter_done(sa_converter_t *c); -int converter_go( - converter_t *c, +int sa_converter_go( + sa_converter_t *c, const void *const src[], const size_t sstr[], int sinterleave, void **dst[], size_t *dstr[], int dinterleave, size_t *size); -int converter_go_interleaved( - converter_t *c, +int sa_converter_go_interleaved( + sa_converter_t *c, const void *const data, void **dst[], size_t *dstr[], int dinterleave, size_t *size); -void converter_set_volume(converter_t *c, const int32_t vol[]); +void sa_converter_set_volume(sa_converter_t *c, const int32_t vol[]); -void converter_set_ratio(converter_t *c, unsigned rate1, unsigned rate2); +void sa_converter_set_ratio(sa_converter_t *c, unsigned rate1, unsigned rate2); #endif -- cgit