From f066bb7716200a83e209d27f6b4f87f012033266 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 17 Sep 2015 23:13:53 +0200 Subject: unix/Daemon, playlist/...: remove unused Domain variables --- src/Main.cxx | 3 --- src/encoder/plugins/ShineEncoderPlugin.cxx | 3 --- src/filter/plugins/VolumeFilterPlugin.cxx | 3 --- src/mixer/MixerAll.cxx | 3 --- src/output/plugins/PipeOutputPlugin.cxx | 3 --- src/playlist/plugins/XspfPlaylistPlugin.cxx | 3 --- src/unix/Daemon.cxx | 3 --- 7 files changed, 21 deletions(-) (limited to 'src') diff --git a/src/Main.cxx b/src/Main.cxx index 26d4e7ae4..a3a1b0021 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -54,7 +54,6 @@ #include "system/FatalError.hxx" #include "util/UriUtil.hxx" #include "util/Error.hxx" -#include "util/Domain.hxx" #include "thread/Id.hxx" #include "thread/Slack.hxx" #include "lib/icu/Init.hxx" @@ -123,8 +122,6 @@ static constexpr unsigned DEFAULT_BUFFER_SIZE = 4096; static constexpr unsigned DEFAULT_BUFFER_BEFORE_PLAY = 10; -static constexpr Domain main_domain("main"); - #ifdef ANDROID Context *context; #endif diff --git a/src/encoder/plugins/ShineEncoderPlugin.cxx b/src/encoder/plugins/ShineEncoderPlugin.cxx index 61cb8609e..1b00f7d53 100644 --- a/src/encoder/plugins/ShineEncoderPlugin.cxx +++ b/src/encoder/plugins/ShineEncoderPlugin.cxx @@ -26,7 +26,6 @@ #include "util/NumberParser.hxx" #include "util/DynamicFifoBuffer.hxx" #include "util/Error.hxx" -#include "util/Domain.hxx" extern "C" { @@ -60,8 +59,6 @@ struct ShineEncoder { bool WriteChunk(bool flush); }; -static constexpr Domain shine_encoder_domain("shine_encoder"); - inline bool ShineEncoder::Configure(const config_param ¶m, gcc_unused Error &error) diff --git a/src/filter/plugins/VolumeFilterPlugin.cxx b/src/filter/plugins/VolumeFilterPlugin.cxx index 17e061476..39188da00 100644 --- a/src/filter/plugins/VolumeFilterPlugin.cxx +++ b/src/filter/plugins/VolumeFilterPlugin.cxx @@ -26,7 +26,6 @@ #include "AudioFormat.hxx" #include "util/ConstBuffer.hxx" #include "util/Error.hxx" -#include "util/Domain.hxx" #include #include @@ -50,8 +49,6 @@ public: Error &error) override; }; -static constexpr Domain volume_domain("pcm_volume"); - static Filter * volume_filter_init(gcc_unused const config_param ¶m, gcc_unused Error &error) diff --git a/src/mixer/MixerAll.cxx b/src/mixer/MixerAll.cxx index 5fef6a92f..91891e870 100644 --- a/src/mixer/MixerAll.cxx +++ b/src/mixer/MixerAll.cxx @@ -25,13 +25,10 @@ #include "output/Internal.hxx" #include "pcm/Volume.hxx" #include "util/Error.hxx" -#include "util/Domain.hxx" #include "Log.hxx" #include -static constexpr Domain mixer_domain("mixer"); - static int output_mixer_get_volume(const AudioOutput &ao) { diff --git a/src/output/plugins/PipeOutputPlugin.cxx b/src/output/plugins/PipeOutputPlugin.cxx index 7a1f32258..d8075d505 100644 --- a/src/output/plugins/PipeOutputPlugin.cxx +++ b/src/output/plugins/PipeOutputPlugin.cxx @@ -22,7 +22,6 @@ #include "../OutputAPI.hxx" #include "config/ConfigError.hxx" #include "util/Error.hxx" -#include "util/Domain.hxx" #include @@ -44,8 +43,6 @@ struct PipeOutput { bool Configure(const config_param ¶m, Error &error); }; -static constexpr Domain pipe_output_domain("pipe_output"); - inline bool PipeOutput::Configure(const config_param ¶m, Error &error) { diff --git a/src/playlist/plugins/XspfPlaylistPlugin.cxx b/src/playlist/plugins/XspfPlaylistPlugin.cxx index 5b6010b53..d25d6dc28 100644 --- a/src/playlist/plugins/XspfPlaylistPlugin.cxx +++ b/src/playlist/plugins/XspfPlaylistPlugin.cxx @@ -25,14 +25,11 @@ #include "input/InputStream.hxx" #include "tag/TagBuilder.hxx" #include "util/Error.hxx" -#include "util/Domain.hxx" #include "lib/expat/ExpatParser.hxx" #include "Log.hxx" #include -static constexpr Domain xspf_domain("xspf"); - /** * This is the state object for the GLib XML parser. */ diff --git a/src/unix/Daemon.cxx b/src/unix/Daemon.cxx index 490b2def5..d283108ed 100644 --- a/src/unix/Daemon.cxx +++ b/src/unix/Daemon.cxx @@ -22,7 +22,6 @@ #include "system/FatalError.hxx" #include "fs/AllocatedPath.hxx" #include "fs/FileSystem.hxx" -#include "util/Domain.hxx" #include "PidFile.hxx" #include "Log.hxx" @@ -37,8 +36,6 @@ #include #endif -static constexpr Domain daemon_domain("daemon"); - #ifndef WIN32 /** the Unix user name which MPD runs as */ -- cgit v1.2.3