diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | src/decoder/Bridge.cxx | 4 | ||||
| -rw-r--r-- | src/decoder/Client.hxx | 2 | ||||
| -rw-r--r-- | src/decoder/Command.hxx (renamed from src/decoder/DecoderCommand.hxx) | 0 | ||||
| -rw-r--r-- | src/decoder/Control.cxx (renamed from src/decoder/DecoderControl.cxx) | 3 | ||||
| -rw-r--r-- | src/decoder/Control.hxx (renamed from src/decoder/DecoderControl.hxx) | 2 | ||||
| -rw-r--r-- | src/decoder/DecoderAPI.hxx | 2 | ||||
| -rw-r--r-- | src/decoder/Domain.cxx (renamed from src/decoder/DecoderError.cxx) | 2 | ||||
| -rw-r--r-- | src/decoder/Domain.hxx (renamed from src/decoder/DecoderError.hxx) | 4 | ||||
| -rw-r--r-- | src/decoder/Thread.cxx (renamed from src/decoder/DecoderThread.cxx) | 3 | ||||
| -rw-r--r-- | src/player/Thread.cxx | 2 |
11 files changed, 15 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 3f531e2f7..c05d101b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -101,10 +101,10 @@ libmpd_a_SOURCES = \ src/command/CommandListBuilder.cxx src/command/CommandListBuilder.hxx \ src/Idle.cxx src/Idle.hxx \ src/IdleFlags.cxx src/IdleFlags.hxx \ - src/decoder/DecoderError.cxx src/decoder/DecoderError.hxx \ - src/decoder/DecoderThread.cxx \ - src/decoder/DecoderCommand.hxx \ - src/decoder/DecoderControl.cxx src/decoder/DecoderControl.hxx \ + src/decoder/Domain.cxx src/decoder/Domain.hxx \ + src/decoder/Thread.cxx \ + src/decoder/Command.hxx \ + src/decoder/Control.cxx src/decoder/Control.hxx \ src/decoder/Client.hxx \ src/decoder/DecoderPlugin.hxx \ src/decoder/Bridge.cxx src/decoder/Bridge.hxx \ diff --git a/src/decoder/Bridge.cxx b/src/decoder/Bridge.cxx index d5585585b..06e02d24b 100644 --- a/src/decoder/Bridge.cxx +++ b/src/decoder/Bridge.cxx @@ -20,8 +20,8 @@ #include "config.h" #include "Bridge.hxx" #include "DecoderAPI.hxx" -#include "DecoderError.hxx" -#include "DecoderControl.hxx" +#include "Domain.hxx" +#include "Control.hxx" #include "song/DetachedSong.hxx" #include "pcm/PcmConvert.hxx" #include "MusicPipe.hxx" diff --git a/src/decoder/Client.hxx b/src/decoder/Client.hxx index 5abf43381..f8f190fda 100644 --- a/src/decoder/Client.hxx +++ b/src/decoder/Client.hxx @@ -21,7 +21,7 @@ #define MPD_DECODER_CLIENT_HXX #include "check.h" -#include "DecoderCommand.hxx" +#include "Command.hxx" #include "Chrono.hxx" #include "input/Ptr.hxx" #include "util/Compiler.h" diff --git a/src/decoder/DecoderCommand.hxx b/src/decoder/Command.hxx index c2425937d..c2425937d 100644 --- a/src/decoder/DecoderCommand.hxx +++ b/src/decoder/Command.hxx diff --git a/src/decoder/DecoderControl.cxx b/src/decoder/Control.cxx index 88c75e008..5cf0d1d7f 100644 --- a/src/decoder/DecoderControl.cxx +++ b/src/decoder/Control.cxx @@ -18,8 +18,7 @@ */ #include "config.h" -#include "DecoderControl.hxx" -#include "DecoderError.hxx" +#include "Control.hxx" #include "MusicPipe.hxx" #include "song/DetachedSong.hxx" diff --git a/src/decoder/DecoderControl.hxx b/src/decoder/Control.hxx index 190b2ab22..6c1a7183e 100644 --- a/src/decoder/DecoderControl.hxx +++ b/src/decoder/Control.hxx @@ -20,7 +20,7 @@ #ifndef MPD_DECODER_CONTROL_HXX #define MPD_DECODER_CONTROL_HXX -#include "DecoderCommand.hxx" +#include "Command.hxx" #include "AudioFormat.hxx" #include "MixRampInfo.hxx" #include "input/Handler.hxx" diff --git a/src/decoder/DecoderAPI.hxx b/src/decoder/DecoderAPI.hxx index 6759d4c58..dc43f64f3 100644 --- a/src/decoder/DecoderAPI.hxx +++ b/src/decoder/DecoderAPI.hxx @@ -32,7 +32,7 @@ #include "check.h" #include "Client.hxx" #include "input/Ptr.hxx" -#include "DecoderCommand.hxx" +#include "Command.hxx" #include "DecoderPlugin.hxx" #include "ReplayGainInfo.hxx" #include "tag/Tag.hxx" diff --git a/src/decoder/DecoderError.cxx b/src/decoder/Domain.cxx index 6fbf64b5d..70adbb241 100644 --- a/src/decoder/DecoderError.cxx +++ b/src/decoder/Domain.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "DecoderError.hxx" +#include "Domain.hxx" #include "util/Domain.hxx" const Domain decoder_domain("decoder"); diff --git a/src/decoder/DecoderError.hxx b/src/decoder/Domain.hxx index 5e976e7b9..edac6e286 100644 --- a/src/decoder/DecoderError.hxx +++ b/src/decoder/Domain.hxx @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_DECODER_ERROR_HXX -#define MPD_DECODER_ERROR_HXX +#ifndef MPD_DECODER_DOMAIN_HXX +#define MPD_DECODER_DOMAIN_HXX extern const class Domain decoder_domain; diff --git a/src/decoder/DecoderThread.cxx b/src/decoder/Thread.cxx index cf1a7d679..5a7aca103 100644 --- a/src/decoder/DecoderThread.cxx +++ b/src/decoder/Thread.cxx @@ -18,9 +18,8 @@ */ #include "config.h" -#include "DecoderControl.hxx" +#include "Control.hxx" #include "Bridge.hxx" -#include "DecoderError.hxx" #include "DecoderPlugin.hxx" #include "song/DetachedSong.hxx" #include "MusicPipe.hxx" diff --git a/src/player/Thread.cxx b/src/player/Thread.cxx index 6a7ccd024..11c360fdf 100644 --- a/src/player/Thread.cxx +++ b/src/player/Thread.cxx @@ -21,7 +21,7 @@ #include "Thread.hxx" #include "Outputs.hxx" #include "Listener.hxx" -#include "decoder/DecoderControl.hxx" +#include "decoder/Control.hxx" #include "MusicPipe.hxx" #include "MusicBuffer.hxx" #include "MusicChunk.hxx" |