summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2019-07-05 09:59:00 +0200
committerMax Kellermann <max@musicpd.org>2019-07-05 09:59:58 +0200
commitd663f814202c10d32d50dec26c14d5d448a21f36 (patch)
tree790ae3557406a3e5869feb141bfcc0e0743c3301 /src/input
parent9cdebc90a00a63bbfd2525abc3cec002c4efda81 (diff)
include cleanups (powered by iwyu)
Diffstat (limited to 'src/input')
-rw-r--r--src/input/BufferedInputStream.cxx2
-rw-r--r--src/input/BufferingInputStream.cxx2
-rw-r--r--src/input/BufferingInputStream.hxx2
-rw-r--r--src/input/ProxyInputStream.cxx2
-rw-r--r--src/input/Reader.hxx2
-rw-r--r--src/input/TextInputStream.cxx3
-rw-r--r--src/input/cache/Item.cxx1
-rw-r--r--src/input/cache/Item.hxx2
-rw-r--r--src/input/cache/Manager.hxx1
-rw-r--r--src/input/plugins/AlsaInputPlugin.cxx2
-rw-r--r--src/input/plugins/CdioParanoiaInputPlugin.cxx2
-rw-r--r--src/input/plugins/CurlInputPlugin.cxx3
-rw-r--r--src/input/plugins/FfmpegInputPlugin.cxx8
-rw-r--r--src/input/plugins/FileInputPlugin.cxx1
-rw-r--r--src/input/plugins/MmsInputPlugin.cxx1
-rw-r--r--src/input/plugins/NfsInputPlugin.cxx1
-rw-r--r--src/input/plugins/QobuzInputPlugin.cxx3
-rw-r--r--src/input/plugins/QobuzLoginRequest.cxx1
-rw-r--r--src/input/plugins/QobuzTrackRequest.cxx1
-rw-r--r--src/input/plugins/SmbclientInputPlugin.cxx1
-rw-r--r--src/input/plugins/TidalInputPlugin.cxx1
-rw-r--r--src/input/plugins/TidalSessionManager.cxx1
-rw-r--r--src/input/plugins/TidalSessionManager.hxx3
23 files changed, 5 insertions, 41 deletions
diff --git a/src/input/BufferedInputStream.cxx b/src/input/BufferedInputStream.cxx
index d5896e6a4..67fef0617 100644
--- a/src/input/BufferedInputStream.cxx
+++ b/src/input/BufferedInputStream.cxx
@@ -18,8 +18,6 @@
*/
#include "BufferedInputStream.hxx"
-#include "thread/Cond.hxx"
-#include "thread/Name.hxx"
#include <string.h>
diff --git a/src/input/BufferingInputStream.cxx b/src/input/BufferingInputStream.cxx
index 9bdb91b49..bcfdce7fd 100644
--- a/src/input/BufferingInputStream.cxx
+++ b/src/input/BufferingInputStream.cxx
@@ -18,7 +18,7 @@
*/
#include "BufferingInputStream.hxx"
-#include "thread/Cond.hxx"
+#include "InputStream.hxx"
#include "thread/Name.hxx"
#include <string.h>
diff --git a/src/input/BufferingInputStream.hxx b/src/input/BufferingInputStream.hxx
index 84277b07a..eee98401d 100644
--- a/src/input/BufferingInputStream.hxx
+++ b/src/input/BufferingInputStream.hxx
@@ -20,10 +20,10 @@
#ifndef MPD_BUFFERING_INPUT_STREAM_BUFFER_HXX
#define MPD_BUFFERING_INPUT_STREAM_BUFFER_HXX
-#include "InputStream.hxx"
#include "Ptr.hxx"
#include "Handler.hxx"
#include "thread/Thread.hxx"
+#include "thread/Mutex.hxx"
#include "thread/Cond.hxx"
#include "util/SparseBuffer.hxx"
diff --git a/src/input/ProxyInputStream.cxx b/src/input/ProxyInputStream.cxx
index 49846685d..fc38a4459 100644
--- a/src/input/ProxyInputStream.cxx
+++ b/src/input/ProxyInputStream.cxx
@@ -20,7 +20,7 @@
#include "ProxyInputStream.hxx"
#include "tag/Tag.hxx"
-#include <stdexcept>
+#include <utility>
ProxyInputStream::ProxyInputStream(InputStreamPtr _input) noexcept
:InputStream(_input->GetURI(), _input->mutex),
diff --git a/src/input/Reader.hxx b/src/input/Reader.hxx
index b8a160e82..dea62891c 100644
--- a/src/input/Reader.hxx
+++ b/src/input/Reader.hxx
@@ -21,9 +21,7 @@
#define MPD_INPUT_READER_HXX
#include "fs/io/Reader.hxx"
-#include "util/Compiler.h"
-struct Decoder;
class InputStream;
/**
diff --git a/src/input/TextInputStream.cxx b/src/input/TextInputStream.cxx
index c2a16c6ed..1baaa7fb3 100644
--- a/src/input/TextInputStream.cxx
+++ b/src/input/TextInputStream.cxx
@@ -20,9 +20,6 @@
#include "TextInputStream.hxx"
#include "InputStream.hxx"
#include "util/TextFile.hxx"
-#include "Log.hxx"
-
-#include <stdexcept>
#include <assert.h>
diff --git a/src/input/cache/Item.cxx b/src/input/cache/Item.cxx
index 5decaaced..9faefe062 100644
--- a/src/input/cache/Item.cxx
+++ b/src/input/cache/Item.cxx
@@ -19,6 +19,7 @@
#include "Item.hxx"
#include "Lease.hxx"
+#include "input/InputStream.hxx"
#include <assert.h>
diff --git a/src/input/cache/Item.hxx b/src/input/cache/Item.hxx
index 53b9668a1..5fb11aeac 100644
--- a/src/input/cache/Item.hxx
+++ b/src/input/cache/Item.hxx
@@ -22,12 +22,10 @@
#include "input/BufferingInputStream.hxx"
#include "thread/Mutex.hxx"
-#include "util/SparseBuffer.hxx"
#include <boost/intrusive/list.hpp>
#include <boost/intrusive/set_hook.hpp>
-#include <memory>
#include <string>
class InputCacheLease;
diff --git a/src/input/cache/Manager.hxx b/src/input/cache/Manager.hxx
index 6fba1fbb3..267d1bdce 100644
--- a/src/input/cache/Manager.hxx
+++ b/src/input/cache/Manager.hxx
@@ -20,7 +20,6 @@
#ifndef MPD_INPUT_CACHE_MANAGER_HXX
#define MPD_INPUT_CACHE_MANAGER_HXX
-#include "input/Offset.hxx"
#include "thread/Mutex.hxx"
#include "util/Compiler.h"
diff --git a/src/input/plugins/AlsaInputPlugin.cxx b/src/input/plugins/AlsaInputPlugin.cxx
index 552fe8fd0..9a88c4aa1 100644
--- a/src/input/plugins/AlsaInputPlugin.cxx
+++ b/src/input/plugins/AlsaInputPlugin.cxx
@@ -30,11 +30,9 @@
#include "../InputPlugin.hxx"
#include "../AsyncInputStream.hxx"
#include "event/Call.hxx"
-#include "thread/Cond.hxx"
#include "config/Block.hxx"
#include "util/Domain.hxx"
#include "util/RuntimeError.hxx"
-#include "util/StringCompare.hxx"
#include "util/ASCII.hxx"
#include "util/DivideString.hxx"
#include "AudioParser.hxx"
diff --git a/src/input/plugins/CdioParanoiaInputPlugin.cxx b/src/input/plugins/CdioParanoiaInputPlugin.cxx
index 166feb935..f7b3687ef 100644
--- a/src/input/plugins/CdioParanoiaInputPlugin.cxx
+++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx
@@ -21,7 +21,6 @@
* CD-Audio handling (requires libcdio_paranoia)
*/
-#include "config.h"
#include "CdioParanoiaInputPlugin.hxx"
#include "lib/cdio/Paranoia.hxx"
#include "../InputStream.hxx"
@@ -34,7 +33,6 @@
#include "fs/AllocatedPath.hxx"
#include "Log.hxx"
#include "config/Block.hxx"
-#include "config/Domain.hxx"
#include <stdio.h>
#include <stdint.h>
diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx
index f43da9a84..21d83c1d9 100644
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -19,7 +19,6 @@
#include "CurlInputPlugin.hxx"
#include "lib/curl/Error.hxx"
-#include "lib/curl/Easy.hxx"
#include "lib/curl/Global.hxx"
#include "lib/curl/Init.hxx"
#include "lib/curl/Request.hxx"
@@ -36,10 +35,8 @@
#include "event/Call.hxx"
#include "event/Loop.hxx"
#include "util/ASCII.hxx"
-#include "util/StringUtil.hxx"
#include "util/StringFormat.hxx"
#include "util/NumberParser.hxx"
-#include "util/RuntimeError.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 e3ef77fc3..c8847e223 100644
--- a/src/input/plugins/FfmpegInputPlugin.cxx
+++ b/src/input/plugins/FfmpegInputPlugin.cxx
@@ -23,15 +23,9 @@
#include "FfmpegInputPlugin.hxx"
#include "lib/ffmpeg/IOContext.hxx"
#include "lib/ffmpeg/Init.hxx"
-#include "lib/ffmpeg/Error.hxx"
#include "../InputStream.hxx"
#include "PluginUnavailable.hxx"
-#include "util/StringAPI.hxx"
#include "../InputPlugin.hxx"
-#include <iostream>
-#include <exception>
-#include <typeinfo>
-#include <stdexcept>
class FfmpegInputStream final : public InputStream {
Ffmpeg::IOContext io;
@@ -90,7 +84,7 @@ input_ffmpeg_protocols() {
protocols.emplace(schema);
}
}
-
+
return protocols;
}
diff --git a/src/input/plugins/FileInputPlugin.cxx b/src/input/plugins/FileInputPlugin.cxx
index 95ac60de0..2464866aa 100644
--- a/src/input/plugins/FileInputPlugin.cxx
+++ b/src/input/plugins/FileInputPlugin.cxx
@@ -19,7 +19,6 @@
#include "FileInputPlugin.hxx"
#include "../InputStream.hxx"
-#include "../InputPlugin.hxx"
#include "fs/Path.hxx"
#include "fs/FileInfo.hxx"
#include "fs/io/FileReader.hxx"
diff --git a/src/input/plugins/MmsInputPlugin.cxx b/src/input/plugins/MmsInputPlugin.cxx
index 11e2c98c4..7312dec5f 100644
--- a/src/input/plugins/MmsInputPlugin.cxx
+++ b/src/input/plugins/MmsInputPlugin.cxx
@@ -21,7 +21,6 @@
#include "input/ThreadInputStream.hxx"
#include "input/InputPlugin.hxx"
#include "system/Error.hxx"
-#include "util/ASCII.hxx"
#include <libmms/mmsx.h>
diff --git a/src/input/plugins/NfsInputPlugin.cxx b/src/input/plugins/NfsInputPlugin.cxx
index 9ab91397f..f710cce84 100644
--- a/src/input/plugins/NfsInputPlugin.cxx
+++ b/src/input/plugins/NfsInputPlugin.cxx
@@ -22,7 +22,6 @@
#include "../InputPlugin.hxx"
#include "lib/nfs/Glue.hxx"
#include "lib/nfs/FileReader.hxx"
-#include "util/ASCII.hxx"
/**
* Do not buffer more than this number of bytes. It should be a
diff --git a/src/input/plugins/QobuzInputPlugin.cxx b/src/input/plugins/QobuzInputPlugin.cxx
index 8053f5638..cf53ec15c 100644
--- a/src/input/plugins/QobuzInputPlugin.cxx
+++ b/src/input/plugins/QobuzInputPlugin.cxx
@@ -31,11 +31,8 @@
#include "thread/Mutex.hxx"
#include "util/StringCompare.hxx"
-#include <stdexcept>
#include <memory>
-#include <time.h>
-
static QobuzClient *qobuz_client;
class QobuzInputStream final
diff --git a/src/input/plugins/QobuzLoginRequest.cxx b/src/input/plugins/QobuzLoginRequest.cxx
index 84feee59a..0e3dac385 100644
--- a/src/input/plugins/QobuzLoginRequest.cxx
+++ b/src/input/plugins/QobuzLoginRequest.cxx
@@ -22,7 +22,6 @@
#include "QobuzSession.hxx"
#include "lib/curl/Form.hxx"
#include "lib/yajl/Callbacks.hxx"
-#include "util/RuntimeError.hxx"
using Wrapper = Yajl::CallbacksWrapper<QobuzLoginRequest::ResponseParser>;
static constexpr yajl_callbacks parse_callbacks = {
diff --git a/src/input/plugins/QobuzTrackRequest.cxx b/src/input/plugins/QobuzTrackRequest.cxx
index ec132d73c..634ab6f38 100644
--- a/src/input/plugins/QobuzTrackRequest.cxx
+++ b/src/input/plugins/QobuzTrackRequest.cxx
@@ -21,7 +21,6 @@
#include "QobuzErrorParser.hxx"
#include "QobuzClient.hxx"
#include "lib/yajl/Callbacks.hxx"
-#include "util/RuntimeError.hxx"
using Wrapper = Yajl::CallbacksWrapper<QobuzTrackRequest::ResponseParser>;
static constexpr yajl_callbacks parse_callbacks = {
diff --git a/src/input/plugins/SmbclientInputPlugin.cxx b/src/input/plugins/SmbclientInputPlugin.cxx
index 7a20820ad..06a96a478 100644
--- a/src/input/plugins/SmbclientInputPlugin.cxx
+++ b/src/input/plugins/SmbclientInputPlugin.cxx
@@ -25,7 +25,6 @@
#include "../MaybeBufferedInputStream.hxx"
#include "PluginUnavailable.hxx"
#include "system/Error.hxx"
-#include "util/ASCII.hxx"
#include <libsmbclient.h>
diff --git a/src/input/plugins/TidalInputPlugin.cxx b/src/input/plugins/TidalInputPlugin.cxx
index c2c89af4f..9501301a9 100644
--- a/src/input/plugins/TidalInputPlugin.cxx
+++ b/src/input/plugins/TidalInputPlugin.cxx
@@ -34,7 +34,6 @@
#include "util/StringCompare.hxx"
#include "Log.hxx"
-#include <stdexcept>
#include <memory>
static constexpr Domain tidal_domain("tidal");
diff --git a/src/input/plugins/TidalSessionManager.cxx b/src/input/plugins/TidalSessionManager.cxx
index 7b2b61b32..a11a64802 100644
--- a/src/input/plugins/TidalSessionManager.cxx
+++ b/src/input/plugins/TidalSessionManager.cxx
@@ -18,7 +18,6 @@
*/
#include "TidalSessionManager.hxx"
-#include "lib/curl/Global.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
diff --git a/src/input/plugins/TidalSessionManager.hxx b/src/input/plugins/TidalSessionManager.hxx
index 8af20b4aa..c3dd1f40f 100644
--- a/src/input/plugins/TidalSessionManager.hxx
+++ b/src/input/plugins/TidalSessionManager.hxx
@@ -30,9 +30,6 @@
#include <memory>
#include <string>
-class CurlRequest;
-class TidalLoginRequest;
-
/**
* Callback class for #TidalSessionManager.
*