From 4f38cc9cae29429f838e88463e16526397b69ccd Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 11 Nov 2009 21:12:10 +0100 Subject: decoder/vorbis: moved error strings to vorbis_strerror() --- src/decoder/vorbis_plugin.c | 50 +++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c index 25be96971..e97522edc 100755 --- a/src/decoder/vorbis_plugin.c +++ b/src/decoder/vorbis_plugin.c @@ -100,6 +100,30 @@ static long ogg_tell_cb(void *vdata) return (long)data->input_stream->offset; } +static const char * +vorbis_strerror(int code) +{ + switch (code) { + case OV_EREAD: + return "read error"; + + case OV_ENOTVORBIS: + return "not vorbis stream"; + + case OV_EVERSION: + return "vorbis version mismatch"; + + case OV_EBADHEADER: + return "invalid vorbis header"; + + case OV_EFAULT: + return "internal logic error"; + + default: + return "unknown error"; + } +} + static const char * vorbis_comment_value(const char *comment, const char *needle) { @@ -274,33 +298,11 @@ vorbis_stream_decode(struct decoder *decoder, callbacks.close_func = ogg_close_cb; callbacks.tell_func = ogg_tell_cb; if ((ret = ov_open_callbacks(&data, &vf, NULL, 0, callbacks)) < 0) { - const char *error; - if (decoder_get_command(decoder) != DECODE_COMMAND_NONE) return; - switch (ret) { - case OV_EREAD: - error = "read error"; - break; - case OV_ENOTVORBIS: - error = "not vorbis stream"; - break; - case OV_EVERSION: - error = "vorbis version mismatch"; - break; - case OV_EBADHEADER: - error = "invalid vorbis header"; - break; - case OV_EFAULT: - error = "internal logic error"; - break; - default: - error = "unknown error"; - break; - } - - g_warning("Error decoding Ogg Vorbis stream: %s", error); + g_warning("Error decoding Ogg Vorbis stream: %s", + vorbis_strerror(ret)); return; } -- cgit v1.2.3