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

decoder: use audio_format_init_checked()

Browse Source 
Let the audio_check library verify the audio format in all (relevant,
i.e. non-hardcoded) plugins.
This commit is contained in:
Max Kellermann
2009-11-10 19:01:38 +01:00
parent f47bb8c1db
commit 719990b1c5
15 changed files with 124 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/decoder/mpg123_decoder_plugin.c
View File

@@ -19,6 +19,7 @@
#include "config.h" /* must be first for large file support */
#include "decoder_api.h"
#include "audio_check.h"
#include <glib.h>
@@ -54,6 +55,7 @@ static bool
mpd_mpg123_open(mpg123_handle *handle, const char *path_fs,
struct audio_format *audio_format)
{
GError *gerror = NULL;
char *path_dup;
int error;
int channels, encoding;
@@ -85,9 +87,10 @@ mpd_mpg123_open(mpg123_handle *handle, const char *path_fs,
return false;
}
audio_format_init(audio_format, rate, 16, channels);
if (!audio_format_valid(audio_format)) {
g_warning("invalid audio format");
if (!audio_format_init_checked(audio_format, rate, 16,
channels, &gerror)) {
g_warning("%s", gerror->message);
g_error_free(gerror);
return false;
}