diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | src/DatabasePrint.cxx | 2 | ||||
| -rw-r--r-- | src/Directory.cxx | 2 | ||||
| -rw-r--r-- | src/PlaylistDatabase.cxx | 2 | ||||
| -rw-r--r-- | src/PlaylistVector.cxx (renamed from src/playlist_vector.c) | 2 | ||||
| -rw-r--r-- | src/PlaylistVector.hxx (renamed from src/playlist_vector.h) | 7 | ||||
| -rw-r--r-- | src/UpdateDatabase.cxx | 5 | ||||
| -rw-r--r-- | src/UpdateWalk.cxx | 2 | ||||
| -rw-r--r-- | src/db/ProxyDatabasePlugin.cxx | 2 | ||||
| -rw-r--r-- | test/DumpDatabase.cxx | 2 |
10 files changed, 13 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 137a567c5..0b39fdf96 100644 --- a/Makefile.am +++ b/Makefile.am @@ -144,7 +144,6 @@ mpd_headers = \ src/playlist_internal.h \ src/playlist_plugin.h \ src/playlist_list.h \ - src/playlist_vector.h \ src/playlist/extm3u_playlist_plugin.h \ src/playlist/m3u_playlist_plugin.h \ src/playlist/pls_playlist_plugin.h \ @@ -307,7 +306,7 @@ src_mpd_SOURCES = \ src/PlaylistSong.cxx src/PlaylistSong.hxx \ src/PlaylistState.cxx src/PlaylistState.hxx \ src/PlaylistQueue.cxx src/PlaylistQueue.hxx \ - src/playlist_vector.c \ + src/PlaylistVector.cxx \ src/PlaylistDatabase.cxx \ src/queue.c \ src/QueuePrint.cxx src/QueuePrint.hxx \ @@ -1076,7 +1075,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \ src/DatabaseRegistry.cxx \ src/DatabaseSelection.cxx \ src/Directory.cxx src/DirectorySave.cxx \ - src/playlist_vector.c src/PlaylistDatabase.cxx \ + src/PlaylistVector.cxx src/PlaylistDatabase.cxx \ src/db_lock.c src/DatabaseSave.cxx \ src/Song.cxx src/song_sort.c src/SongSave.cxx \ src/tag.c src/tag_pool.c src/TagSave.cxx \ diff --git a/src/DatabasePrint.cxx b/src/DatabasePrint.cxx index 97ff9c12c..980aa0124 100644 --- a/src/DatabasePrint.cxx +++ b/src/DatabasePrint.cxx @@ -21,6 +21,7 @@ #include "DatabasePrint.hxx" #include "DatabaseSelection.hxx" #include "SongFilter.hxx" +#include "PlaylistVector.hxx" extern "C" { #include "database.h" @@ -28,7 +29,6 @@ extern "C" { #include "song.h" #include "song_print.h" #include "time_print.h" -#include "playlist_vector.h" #include "tag.h" } diff --git a/src/Directory.cxx b/src/Directory.cxx index eeba903d1..a371dc41a 100644 --- a/src/Directory.cxx +++ b/src/Directory.cxx @@ -20,11 +20,11 @@ #include "config.h" #include "directory.h" #include "SongFilter.hxx" +#include "PlaylistVector.hxx" extern "C" { #include "song.h" #include "song_sort.h" -#include "playlist_vector.h" #include "path.h" #include "util/list_sort.h" #include "db_lock.h" diff --git a/src/PlaylistDatabase.cxx b/src/PlaylistDatabase.cxx index b88ebbd6b..a2062a517 100644 --- a/src/PlaylistDatabase.cxx +++ b/src/PlaylistDatabase.cxx @@ -19,9 +19,9 @@ #include "config.h" #include "PlaylistDatabase.hxx" +#include "PlaylistVector.hxx" extern "C" { -#include "playlist_vector.h" #include "text_file.h" #include "string_util.h" } diff --git a/src/playlist_vector.c b/src/PlaylistVector.cxx index 74c7bf089..ea3172d0d 100644 --- a/src/playlist_vector.c +++ b/src/PlaylistVector.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "playlist_vector.h" +#include "PlaylistVector.hxx" #include "db_lock.h" #include <assert.h> diff --git a/src/playlist_vector.h b/src/PlaylistVector.hxx index 0af6df8b4..00347ffdb 100644 --- a/src/playlist_vector.h +++ b/src/PlaylistVector.hxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -17,12 +17,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_PLAYLIST_VECTOR_H -#define MPD_PLAYLIST_VECTOR_H +#ifndef MPD_PLAYLIST_VECTOR_HXX +#define MPD_PLAYLIST_VECTOR_HXX #include "util/list.h" -#include <stdbool.h> #include <stddef.h> #include <sys/time.h> diff --git a/src/UpdateDatabase.cxx b/src/UpdateDatabase.cxx index fa3408d66..e959a4ecc 100644 --- a/src/UpdateDatabase.cxx +++ b/src/UpdateDatabase.cxx @@ -20,14 +20,11 @@ #include "config.h" /* must be first for large file support */ #include "UpdateDatabase.hxx" #include "UpdateRemove.hxx" +#include "PlaylistVector.hxx" #include "directory.h" #include "song.h" #include "db_lock.h" -extern "C" { -#include "playlist_vector.h" -} - #include <glib.h> #include <assert.h> diff --git a/src/UpdateWalk.cxx b/src/UpdateWalk.cxx index a8ca1e4ed..33220ba76 100644 --- a/src/UpdateWalk.cxx +++ b/src/UpdateWalk.cxx @@ -26,11 +26,11 @@ #include "db_lock.h" #include "directory.h" #include "song.h" +#include "PlaylistVector.hxx" extern "C" { #include "exclude.h" #include "database.h" -#include "playlist_vector.h" #include "uri.h" #include "mapper.h" #include "path.h" diff --git a/src/db/ProxyDatabasePlugin.cxx b/src/db/ProxyDatabasePlugin.cxx index d36cebcfd..db8e56dda 100644 --- a/src/db/ProxyDatabasePlugin.cxx +++ b/src/db/ProxyDatabasePlugin.cxx @@ -21,6 +21,7 @@ #include "ProxyDatabasePlugin.hxx" #include "DatabasePlugin.hxx" #include "DatabaseSelection.hxx" +#include "PlaylistVector.hxx" #include "gcc.h" extern "C" { @@ -31,7 +32,6 @@ extern "C" { } #include "directory.h" -#include "playlist_vector.h" #undef MPD_DIRECTORY_H #undef MPD_SONG_H diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx index 7aa8f06f5..f262a9808 100644 --- a/test/DumpDatabase.cxx +++ b/test/DumpDatabase.cxx @@ -23,7 +23,7 @@ #include "DatabaseSelection.hxx" #include "directory.h" #include "song.h" -#include "playlist_vector.h" +#include "PlaylistVector.hxx" extern "C" { #include "conf.h" |