aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/sndfile_decoder_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-11-10 19:01:38 +0100
committerMax Kellermann <max@duempel.org>2009-11-14 00:47:22 +0100
commit719990b1c5db93ccdc21e5f91e98ed9e8540ade1 (patch)
treeef03f58f54767b73c4c8d267e7b0008938863a17 /src/decoder/sndfile_decoder_plugin.c
parentf47bb8c1db91b50be95c4d5dd301728e38c57274 (diff)
downloadmpd-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/sndfile_decoder_plugin.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/decoder/sndfile_decoder_plugin.c b/src/decoder/sndfile_decoder_plugin.c
index c5ac651a3..84835c449 100644
--- a/src/decoder/sndfile_decoder_plugin.c
+++ b/src/decoder/sndfile_decoder_plugin.c
@@ -19,6 +19,7 @@
#include "config.h"
#include "decoder_api.h"
+#include "audio_check.h"
#include <sndfile.h>
@@ -109,6 +110,7 @@ time_to_frame(float t, const struct audio_format *audio_format)
static void
sndfile_stream_decode(struct decoder *decoder, struct input_stream *is)
{
+ GError *error = NULL;
SNDFILE *sf;
SF_INFO info;
struct audio_format audio_format;
@@ -128,10 +130,10 @@ sndfile_stream_decode(struct decoder *decoder, struct input_stream *is)
/* for now, always read 32 bit samples. Later, we could lower
MPD's CPU usage by reading 16 bit samples with
sf_readf_short() on low-quality source files. */
- audio_format_init(&audio_format, info.samplerate, 32, info.channels);
-
- if (!audio_format_valid(&audio_format)) {
- g_warning("invalid audio format");
+ if (!audio_format_init_checked(&audio_format, info.samplerate, 32,
+ info.channels, &error)) {
+ g_warning("%s", error->message);
+ g_error_free(error);
return;
}