aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-02-19 08:56:58 +0100
committerMax Kellermann <max@duempel.org>2014-02-19 08:56:58 +0100
commit1cc17bfe7a470c2e2d74466a70ce3723e10baf4a (patch)
tree71823f614a30c0fd5524de23071a4d0fd9f6e633
parent8ae492dfebbaf26188bf49d264a2633b5041a37b (diff)
downloadmpd-1cc17bfe7a470c2e2d74466a70ce3723e10baf4a.tar.gz
mpd-1cc17bfe7a470c2e2d74466a70ce3723e10baf4a.tar.xz
mpd-1cc17bfe7a470c2e2d74466a70ce3723e10baf4a.zip
cue/CueParser: move to playlist/
-rw-r--r--Makefile.am5
-rw-r--r--src/playlist/cue/CueParser.cxx (renamed from src/cue/CueParser.cxx)0
-rw-r--r--src/playlist/cue/CueParser.hxx (renamed from src/cue/CueParser.hxx)0
-rw-r--r--src/playlist/plugins/CuePlaylistPlugin.cxx2
-rw-r--r--src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx2
5 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 730468759..4b043d5c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,6 @@ src_mpd_SOURCES = \
src/Idle.cxx src/Idle.hxx \
src/CommandLine.cxx src/CommandLine.hxx \
src/CrossFade.cxx src/CrossFade.hxx \
- src/cue/CueParser.cxx src/cue/CueParser.hxx \
src/decoder/DecoderError.cxx src/decoder/DecoderError.hxx \
src/decoder/DecoderThread.cxx src/decoder/DecoderThread.hxx \
src/decoder/DecoderCommand.hxx \
@@ -1163,6 +1162,7 @@ libplaylist_plugins_a_SOURCES = \
src/playlist/CloseSongEnumerator.hxx \
src/playlist/MemorySongEnumerator.cxx \
src/playlist/MemorySongEnumerator.hxx \
+ src/playlist/cue/CueParser.cxx src/playlist/cue/CueParser.hxx \
src/playlist/plugins/ExtM3uPlaylistPlugin.cxx \
src/playlist/plugins/ExtM3uPlaylistPlugin.hxx \
src/playlist/plugins/M3uPlaylistPlugin.cxx \
@@ -1472,8 +1472,7 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \
src/TagSave.cxx \
src/TagFile.cxx \
src/CheckAudioFormat.cxx \
- src/DetachedSong.cxx \
- src/cue/CueParser.cxx src/cue/CueParser.hxx
+ src/DetachedSong.cxx
if HAVE_FLAC
test_dump_playlist_SOURCES += \
diff --git a/src/cue/CueParser.cxx b/src/playlist/cue/CueParser.cxx
index dc96218f4..dc96218f4 100644
--- a/src/cue/CueParser.cxx
+++ b/src/playlist/cue/CueParser.cxx
diff --git a/src/cue/CueParser.hxx b/src/playlist/cue/CueParser.hxx
index 7e040169b..7e040169b 100644
--- a/src/cue/CueParser.hxx
+++ b/src/playlist/cue/CueParser.hxx
diff --git a/src/playlist/plugins/CuePlaylistPlugin.cxx b/src/playlist/plugins/CuePlaylistPlugin.cxx
index d6be4eb83..8776baace 100644
--- a/src/playlist/plugins/CuePlaylistPlugin.cxx
+++ b/src/playlist/plugins/CuePlaylistPlugin.cxx
@@ -21,7 +21,7 @@
#include "CuePlaylistPlugin.hxx"
#include "../PlaylistPlugin.hxx"
#include "../SongEnumerator.hxx"
-#include "cue/CueParser.hxx"
+#include "../cue/CueParser.hxx"
#include "input/TextInputStream.hxx"
#include <string>
diff --git a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
index 53f3feda0..2e903ae03 100644
--- a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
+++ b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
@@ -27,12 +27,12 @@
#include "EmbeddedCuePlaylistPlugin.hxx"
#include "../PlaylistPlugin.hxx"
#include "../SongEnumerator.hxx"
+#include "../cue/CueParser.hxx"
#include "tag/TagHandler.hxx"
#include "tag/TagId3.hxx"
#include "tag/ApeTag.hxx"
#include "DetachedSong.hxx"
#include "TagFile.hxx"
-#include "cue/CueParser.hxx"
#include "fs/Traits.hxx"
#include "fs/AllocatedPath.hxx"
#include "util/ASCII.hxx"