diff options
author | Max Kellermann <max@duempel.org> | 2014-08-18 20:20:51 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-08-18 20:35:34 +0200 |
commit | e6e9c21275e2c2cf8be2f46f801bfc0de8f24718 (patch) | |
tree | 20d63642d863576c6f1c753d497bf0253eeb66c6 /src/lib/ffmpeg | |
parent | 636f5d4a1d983cdbb43b23da0da9c5db4a91f71f (diff) | |
download | mpd-e6e9c21275e2c2cf8be2f46f801bfc0de8f24718.tar.gz mpd-e6e9c21275e2c2cf8be2f46f801bfc0de8f24718.tar.xz mpd-e6e9c21275e2c2cf8be2f46f801bfc0de8f24718.zip |
input/ffmpeg: use av_strerror()
Generate more detailed error messages.
Diffstat (limited to 'src/lib/ffmpeg')
-rw-r--r-- | src/lib/ffmpeg/Error.cxx | 43 | ||||
-rw-r--r-- | src/lib/ffmpeg/Error.hxx | 31 |
2 files changed, 74 insertions, 0 deletions
diff --git a/src/lib/ffmpeg/Error.cxx b/src/lib/ffmpeg/Error.cxx new file mode 100644 index 000000000..bcc12fb1d --- /dev/null +++ b/src/lib/ffmpeg/Error.cxx @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2003-2014 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" +#include "Error.hxx" +#include "Domain.hxx" +#include "util/Error.hxx" + +extern "C" { +#include <libavutil/error.h> +} + +void +SetFfmpegError(Error &error, int errnum) +{ + char msg[256]; + av_strerror(errnum, msg, sizeof(msg)); + error.Set(ffmpeg_domain, errnum, msg); +} + +void +SetFfmpegError(Error &error, int errnum, const char *prefix) +{ + char msg[256]; + av_strerror(errnum, msg, sizeof(msg)); + error.Format(ffmpeg_domain, errnum, "%s: %s", prefix, msg); +} diff --git a/src/lib/ffmpeg/Error.hxx b/src/lib/ffmpeg/Error.hxx new file mode 100644 index 000000000..943dca6ce --- /dev/null +++ b/src/lib/ffmpeg/Error.hxx @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2003-2014 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_FFMPEG_ERROR_HXX +#define MPD_FFMPEG_ERROR_HXX + +class Error; + +void +SetFfmpegError(Error &error, int errnum); + +void +SetFfmpegError(Error &error, int errnum, const char *prefix); + +#endif |