oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/flac: pass bits_per_sample to flac_sample_format()

Browse Source 
Easier to reuse the function.
This commit is contained in:
Max Kellermann 2010-01-06 09:55:20 +01:00
parent 550c9319e9
commit de0cdee4aa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/decoder/_flac_common.c
View File

@ -59,9 +59,9 @@ flac_data_deinit(struct flac_data *data)
} }
static enum sample_format static enum sample_format
flac_sample_format(const FLAC__StreamMetadata_StreamInfo *si) flac_sample_format(unsigned bits_per_sample)
{ {
switch (si->bits_per_sample) { switch (bits_per_sample) {
case 8: case 8:
return SAMPLE_FORMAT_S8; return SAMPLE_FORMAT_S8;
@ -89,7 +89,7 @@ flac_got_stream_info(struct flac_data *data,
GError *error = NULL; GError *error = NULL;
if (!audio_format_init_checked(&data->audio_format, if (!audio_format_init_checked(&data->audio_format,
stream_info->sample_rate, stream_info->sample_rate,
flac_sample_format(stream_info), flac_sample_format(stream_info->bits_per_sample),
stream_info->channels, &error)) { stream_info->channels, &error)) {
g_warning("%s", error->message); g_warning("%s", error->message);
g_error_free(error); g_error_free(error);