diff options
| author | Max Kellermann <max@duempel.org> | 2009-11-10 19:01:38 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-11-14 00:47:22 +0100 |
| commit | 719990b1c5db93ccdc21e5f91e98ed9e8540ade1 (patch) | |
| tree | ef03f58f54767b73c4c8d267e7b0008938863a17 /src/decoder/mpcdec_plugin.c | |
| parent | f47bb8c1db91b50be95c4d5dd301728e38c57274 (diff) | |
| download | mpd-719990b1c5db93ccdc21e5f91e98ed9e8540ade1.tar.gz mpd-719990b1c5db93ccdc21e5f91e98ed9e8540ade1.tar.xz mpd-719990b1c5db93ccdc21e5f91e98ed9e8540ade1.zip | |
decoder: use audio_format_init_checked()
Let the audio_check library verify the audio format in all (relevant,
i.e. non-hardcoded) plugins.
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/mpcdec_plugin.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/decoder/mpcdec_plugin.c b/src/decoder/mpcdec_plugin.c index b7c5af5f8..761073e36 100644 --- a/src/decoder/mpcdec_plugin.c +++ b/src/decoder/mpcdec_plugin.c @@ -19,6 +19,7 @@ #include "config.h" #include "decoder_api.h" +#include "audio_check.h" #ifdef MPC_IS_OLD_API #include <mpcdec/mpcdec.h> @@ -27,6 +28,7 @@ #endif #include <glib.h> +#include <assert.h> #include <unistd.h> #undef G_LOG_DOMAIN @@ -140,6 +142,7 @@ mpcdec_decode(struct decoder *mpd_decoder, struct input_stream *is) #endif mpc_reader reader; mpc_streaminfo info; + GError *error = NULL; struct audio_format audio_format; struct mpc_decoder_data data; @@ -193,16 +196,13 @@ mpcdec_decode(struct decoder *mpd_decoder, struct input_stream *is) mpc_demux_get_info(demux, &info); #endif - audio_format_init(&audio_format, info.sample_freq, 24, info.channels); - - if (!audio_format_valid(&audio_format)) { + if (!audio_format_init_checked(&audio_format, info.sample_freq, 16, + info.channels, &error)) { + g_warning("%s", error->message); + g_error_free(error); #ifndef MPC_IS_OLD_API mpc_demux_exit(demux); #endif - g_warning("Invalid audio format: %u:%u:%u\n", - audio_format.sample_rate, - audio_format.bits, - audio_format.channels); return; } |