PlayerThread, ...: move to src/player/

Makefile.am

@@ -95,7 +95,6 @@ libmpd_a_SOURCES = \
 	src/command/OtherCommands.cxx src/command/OtherCommands.hxx \
 	src/command/CommandListBuilder.cxx src/command/CommandListBuilder.hxx \
 	src/Idle.cxx src/Idle.hxx \
-	src/CrossFade.cxx src/CrossFade.hxx \
 	src/decoder/DecoderError.cxx src/decoder/DecoderError.hxx \
 	src/decoder/DecoderThread.cxx src/decoder/DecoderThread.hxx \
 	src/decoder/DecoderCommand.hxx \
@@ -140,9 +139,10 @@ libmpd_a_SOURCES = \
 	src/Mapper.cxx src/Mapper.hxx \
 	src/Partition.cxx src/Partition.hxx \
 	src/Permission.cxx src/Permission.hxx \
-	src/PlayerThread.cxx src/PlayerThread.hxx \
-	src/PlayerControl.cxx src/PlayerControl.hxx \
-	src/PlayerListener.hxx \
+	src/player/CrossFade.cxx src/player/CrossFade.hxx \
+	src/player/Thread.cxx src/player/Thread.hxx \
+	src/player/Control.cxx src/player/Control.hxx \
+	src/player/Listener.hxx \
 	src/PlaylistError.cxx src/PlaylistError.hxx \
 	src/PlaylistGlobal.cxx src/PlaylistGlobal.hxx \
 	src/PlaylistPrint.cxx src/PlaylistPrint.hxx \

src/Main.cxx

@@ -25,7 +25,7 @@
 #include "PlaylistGlobal.hxx"
 #include "MusicChunk.hxx"
 #include "StateFile.hxx"
-#include "PlayerThread.hxx"
+#include "player/Thread.hxx"
 #include "Mapper.hxx"
 #include "Permission.hxx"
 #include "Listen.hxx"

src/Partition.hxx

@@ -23,8 +23,8 @@
 #include "queue/Playlist.hxx"
 #include "output/MultipleOutputs.hxx"
 #include "mixer/Listener.hxx"
-#include "PlayerControl.hxx"
-#include "PlayerListener.hxx"
+#include "player/Control.hxx"
+#include "player/Listener.hxx"
 #include "Chrono.hxx"
 #include "Compiler.h"
 

src/Stats.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "Stats.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "client/Response.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"

src/output/MultipleOutputs.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "MultipleOutputs.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "Internal.hxx"
 #include "Domain.hxx"
 #include "MusicBuffer.hxx"

src/output/OutputCommand.cxx

@@ -28,7 +28,7 @@
 #include "OutputCommand.hxx"
 #include "MultipleOutputs.hxx"
 #include "Internal.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "mixer/MixerControl.hxx"
 #include "Idle.hxx"
 

src/output/OutputThread.cxx

@@ -27,7 +27,7 @@
 #include "filter/FilterInternal.hxx"
 #include "filter/plugins/ConvertFilterPlugin.hxx"
 #include "filter/plugins/ReplayGainFilterPlugin.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
 #include "thread/Util.hxx"

src/PlayerControl.cxx → src/player/Control.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "PlayerControl.hxx"
+#include "Control.hxx"
 #include "Idle.hxx"
 #include "DetachedSong.hxx"
 

src/PlayerThread.cxx → src/player/Thread.cxx

@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
-#include "PlayerThread.hxx"
-#include "PlayerListener.hxx"
+#include "Thread.hxx"
+#include "Listener.hxx"
 #include "decoder/DecoderThread.hxx"
 #include "decoder/DecoderControl.hxx"
 #include "MusicPipe.hxx"
@@ -28,7 +28,7 @@
 #include "DetachedSong.hxx"
 #include "system/FatalError.hxx"
 #include "CrossFade.hxx"
-#include "PlayerControl.hxx"
+#include "Control.hxx"
 #include "output/MultipleOutputs.hxx"
 #include "tag/Tag.hxx"
 #include "Idle.hxx"

src/PlayerThread.hxx → src/player/Thread.hxx

@@ -26,7 +26,7 @@
  * audio outputs via audio_output_all_play().
  *
  * It is controlled by the main thread (the playlist code), see
- * PlayerControl.hxx.  The playlist enqueues new songs into the player
+ * Control.hxx.  The playlist enqueues new songs into the player
  * thread and sends it commands.
  *
  * The player thread itself does not do any I/O.  It synchronizes with

src/queue/Playlist.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "Playlist.hxx"
 #include "PlaylistError.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "DetachedSong.hxx"
 #include "Idle.hxx"
 #include "Log.hxx"

src/queue/PlaylistControl.cxx

@@ -25,7 +25,7 @@
 #include "config.h"
 #include "Playlist.hxx"
 #include "PlaylistError.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "DetachedSong.hxx"
 #include "Log.hxx"
 

src/queue/PlaylistEdit.cxx

@@ -26,7 +26,7 @@
 #include "config.h"
 #include "Playlist.hxx"
 #include "PlaylistError.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"
 #include "DetachedSong.hxx"

src/queue/PlaylistState.cxx

@@ -29,7 +29,7 @@
 #include "queue/QueueSave.hxx"
 #include "fs/io/TextFile.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/ConfigOption.hxx"
 #include "util/CharUtil.hxx"

test/run_output.cxx

@@ -31,7 +31,7 @@
 #include "AudioParser.hxx"
 #include "pcm/PcmConvert.hxx"
 #include "filter/FilterRegistry.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "stdbin.h"
 #include "util/Error.hxx"
 #include "Log.hxx"

test/test_mixramp.cxx

@@ -3,7 +3,7 @@
  */
 
 #include "config.h"
-#include "CrossFade.cxx"
+#include "player/CrossFade.cxx"
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>