alsa-lib: pcm: Drop snd_pcm_linear_{get|put}32_index()
PATCH 1/1 alsa-lib: pcm: Drop snd_pcm_linear_{get|put}32_index()
These are identical with snd_pcm_linear_{get|put}_index().
Signed-off-by Takashi Iwai <[email protected]>
--- src/pcm/pcm_lfloat.c | 4 ++-- src/pcm/pcm_linear.c | 44 ++++---------------------------------------- src/pcm/pcm_plugin.h | 4 ---- src/pcm/pcm_route.c | 4 ++-- 4 files changed, 8 insertions(+), 48 deletions(-)
src/pcm/pcm_lfloat.c +2 -2
@@ -286,11 +286,11 @@ static int snd_pcm_lfloat_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) err =INTERNAL (snd_pcm_hw_params_get_format)(params, &dst_format); }if (snd_pcm_format_linear (src_format)) { - lfloat->int32_idx =snd_pcm_linear_get32_index (src_format,SND_PCM_FORMAT_S32 ); + lfloat->int32_idx =snd_pcm_linear_get_index (src_format,SND_PCM_FORMAT_S32 ); lfloat->float32_idx =snd_pcm_lfloat_put_s32_index (dst_format); lfloat->func = snd_pcm_lfloat_convert_integer_float; }else { - lfloat->int32_idx =snd_pcm_linear_put32_index (SND_PCM_FORMAT_S32 , dst_format); + lfloat->int32_idx =snd_pcm_linear_put_index (SND_PCM_FORMAT_S32 , dst_format); lfloat->float32_idx =snd_pcm_lfloat_get_s32_index (src_format); lfloat->func = snd_pcm_lfloat_convert_float_integer; }
src/pcm/pcm_linear.c +4 -40
63 lines not on this page · raw message
src/pcm/pcm_plugin.h +0 -4
@@ -86,8 +86,6 @@ snd_pcm_sframes_t snd_pcm_plugin_undo_write_generic/* make local functions really local */ #define snd_pcm_linear_get_index snd1_pcm_linear_get_index#define snd_pcm_linear_put_index snd1_pcm_linear_put_index -#define snd_pcm_linear_get32_index snd1_pcm_linear_get32_index -#define snd_pcm_linear_put32_index snd1_pcm_linear_put32_index#define snd_pcm_linear_convert_index snd1_pcm_linear_convert_index#define snd_pcm_linear_convert snd1_pcm_linear_convert#define snd_pcm_linear_getput snd1_pcm_linear_getput
@@ -100,8 +98,6 @@ snd_pcm_sframes_t snd_pcm_plugin_undo_write_genericint snd_pcm_linear_get_index (snd_pcm_format_t src_format,snd_pcm_format_t dst_format);int snd_pcm_linear_put_index (snd_pcm_format_t src_format,snd_pcm_format_t dst_format); -int snd_pcm_linear_get32_index (snd_pcm_format_t src_format,snd_pcm_format_t dst_format); -int snd_pcm_linear_put32_index (snd_pcm_format_t src_format,snd_pcm_format_t dst_format);int snd_pcm_linear_convert_index (snd_pcm_format_t src_format,snd_pcm_format_t dst_format); void snd_pcm_linear_convert(const snd_pcm_channel_area_t *dst_areas, snd_pcm_uframes_t dst_offset,
src/pcm/pcm_route.c +2 -2
@@ -617,8 +617,8 @@ static int snd_pcm_route_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params) route->params.use_getput = (snd_pcm_format_physical_width (src_format) +7 ) /3 ==3 || (snd_pcm_format_physical_width (dst_format) +7 ) /3 ==3 ; - route->params.get_idx =snd_pcm_linear_get32_index (src_format,SND_PCM_FORMAT_S32 ); - route->params.put_idx =snd_pcm_linear_put32_index (SND_PCM_FORMAT_S32 , dst_format); + route->params.get_idx =snd_pcm_linear_get_index (src_format,SND_PCM_FORMAT_S32 ); + route->params.put_idx =snd_pcm_linear_put_index (SND_PCM_FORMAT_S32 , dst_format); route->params.conv_idx =snd_pcm_linear_convert_index (src_format, dst_format); route->params.src_size =snd_pcm_format_width (src_format) /8 ; route->params.dst_sfmt = dst_format;
Signature · 1 line
2.0.1