diff options
author | Max Kellermann <max@musicpd.org> | 2016-10-29 11:04:49 +0200 |
---|---|---|
committer | Max Kellermann <max@musicpd.org> | 2016-10-29 11:04:49 +0200 |
commit | a55bb28069ba5f08e8fe7f24c74a3c8cc05205fe (patch) | |
tree | cbdb36d3ec5b18c5612fcc7000a753ff62ac23af /src/input | |
parent | a2e3dc0592cfb0cbb6144f5708c0ce874a840102 (diff) |
decoder: include cleanup
Diffstat (limited to 'src/input')
-rw-r--r-- | src/input/Open.cxx | 7 | ||||
-rw-r--r-- | src/input/plugins/AlsaInputPlugin.cxx | 1 | ||||
-rw-r--r-- | src/input/plugins/CdioParanoiaInputPlugin.cxx | 1 | ||||
-rw-r--r-- | src/input/plugins/CurlInputPlugin.cxx | 1 | ||||
-rw-r--r-- | src/input/plugins/FfmpegInputPlugin.cxx | 1 | ||||
-rw-r--r-- | src/input/plugins/NfsInputPlugin.cxx | 1 |
6 files changed, 1 insertions, 11 deletions
diff --git a/src/input/Open.cxx b/src/input/Open.cxx index 4f23f14ce..10e156898 100644 --- a/src/input/Open.cxx +++ b/src/input/Open.cxx @@ -26,7 +26,6 @@ #include "plugins/RewindInputPlugin.hxx" #include "fs/Traits.hxx" #include "fs/AllocatedPath.hxx" -#include "util/Error.hxx" #include <stdexcept> @@ -35,11 +34,7 @@ InputStream::Open(const char *url, Mutex &mutex, Cond &cond) { if (PathTraitsUTF8::IsAbsolute(url)) { - Error error; - const auto path = AllocatedPath::FromUTF8(url, error); - if (path.IsNull()) - throw std::runtime_error(error.GetMessage()); - + const auto path = AllocatedPath::FromUTF8Throw(url); return OpenLocalInputStream(path, mutex, cond); } diff --git a/src/input/plugins/AlsaInputPlugin.cxx b/src/input/plugins/AlsaInputPlugin.cxx index bc592f568..0c2d1da9f 100644 --- a/src/input/plugins/AlsaInputPlugin.cxx +++ b/src/input/plugins/AlsaInputPlugin.cxx @@ -29,7 +29,6 @@ #include "../InputPlugin.hxx" #include "../AsyncInputStream.hxx" #include "util/Domain.hxx" -#include "util/Error.hxx" #include "util/RuntimeError.hxx" #include "util/StringCompare.hxx" #include "util/ReusableArray.hxx" diff --git a/src/input/plugins/CdioParanoiaInputPlugin.cxx b/src/input/plugins/CdioParanoiaInputPlugin.cxx index 832363f82..47ef1870b 100644 --- a/src/input/plugins/CdioParanoiaInputPlugin.cxx +++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx @@ -28,7 +28,6 @@ #include "util/StringUtil.hxx" #include "util/StringCompare.hxx" #include "util/RuntimeError.hxx" -#include "util/Error.hxx" #include "util/Domain.hxx" #include "system/ByteOrder.hxx" #include "fs/AllocatedPath.hxx" diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx index 2c66231cc..9f754e9c5 100644 --- a/src/input/plugins/CurlInputPlugin.cxx +++ b/src/input/plugins/CurlInputPlugin.cxx @@ -33,7 +33,6 @@ #include "util/StringUtil.hxx" #include "util/NumberParser.hxx" #include "util/RuntimeError.hxx" -#include "util/Error.hxx" #include "util/Domain.hxx" #include "Log.hxx" #include "PluginUnavailable.hxx" diff --git a/src/input/plugins/FfmpegInputPlugin.cxx b/src/input/plugins/FfmpegInputPlugin.cxx index d169eb640..5fb1c2a66 100644 --- a/src/input/plugins/FfmpegInputPlugin.cxx +++ b/src/input/plugins/FfmpegInputPlugin.cxx @@ -29,7 +29,6 @@ #include "../InputPlugin.hxx" #include "PluginUnavailable.hxx" #include "util/StringCompare.hxx" -#include "util/Error.hxx" extern "C" { #include <libavformat/avio.h> diff --git a/src/input/plugins/NfsInputPlugin.cxx b/src/input/plugins/NfsInputPlugin.cxx index 97c90b15b..7df6ded60 100644 --- a/src/input/plugins/NfsInputPlugin.cxx +++ b/src/input/plugins/NfsInputPlugin.cxx @@ -24,7 +24,6 @@ #include "lib/nfs/Glue.hxx" #include "lib/nfs/FileReader.hxx" #include "util/StringCompare.hxx" -#include "util/Error.hxx" #include <string.h> |