aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-08-29 19:12:26 +0200
committerMax Kellermann <max@duempel.org>2012-08-29 19:12:26 +0200
commit36b1c08ad7245a403578731c5d1240da8fc61d72 (patch)
treea2a97e7fdb510fef99ddffc1d6c6654284aaadff
parent7b35d5e9d47fdea707c04e7413e5b5f0dd336fda (diff)
downloadmpd-36b1c08ad7245a403578731c5d1240da8fc61d72.tar.gz
mpd-36b1c08ad7245a403578731c5d1240da8fc61d72.tar.xz
mpd-36b1c08ad7245a403578731c5d1240da8fc61d72.zip
locate: rename to SongFilter.cxx
-rw-r--r--Makefile.am5
-rw-r--r--src/DatabaseCommands.cxx2
-rw-r--r--src/DatabasePrint.cxx2
-rw-r--r--src/Directory.cxx2
-rw-r--r--src/QueueCommands.cxx2
-rw-r--r--src/QueuePrint.cxx2
-rw-r--r--src/SongFilter.cxx (renamed from src/locate.c)11
-rw-r--r--src/SongFilter.hxx (renamed from src/locate.h)6
-rw-r--r--src/db/SimpleDatabasePlugin.cxx2
9 files changed, 18 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am
index aa221c209..b846183e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -212,7 +212,6 @@ mpd_headers = \
src/string_util.h \
src/volume.h \
src/zeroconf.h src/zeroconf-internal.h \
- src/locate.h \
src/stored_playlist.h \
src/timer.h \
src/archive_api.h \
@@ -362,7 +361,7 @@ src_mpd_SOURCES = \
src/utils.c \
src/string_util.c \
src/volume.c \
- src/locate.c \
+ src/SongFilter.cxx src/SongFilter.hxx \
src/stored_playlist.c \
src/timer.c
@@ -1070,7 +1069,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
src/Song.cxx src/song_sort.c src/song_save.c \
src/tag.c src/tag_pool.c src/tag_save.c \
src/path.c \
- src/locate.c \
+ src/SongFilter.cxx \
src/text_file.c \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c
diff --git a/src/DatabaseCommands.cxx b/src/DatabaseCommands.cxx
index 288980468..047d3a550 100644
--- a/src/DatabaseCommands.cxx
+++ b/src/DatabaseCommands.cxx
@@ -27,9 +27,9 @@
#include "client_internal.h"
#include "tag.h"
#include "uri.h"
+#include "SongFilter.hxx"
extern "C" {
-#include "locate.h"
#include "protocol/result.h"
}
diff --git a/src/DatabasePrint.cxx b/src/DatabasePrint.cxx
index 621679729..9ff833ffd 100644
--- a/src/DatabasePrint.cxx
+++ b/src/DatabasePrint.cxx
@@ -20,9 +20,9 @@
#include "config.h"
#include "DatabasePrint.hxx"
#include "DatabaseSelection.hxx"
+#include "SongFilter.hxx"
extern "C" {
-#include "locate.h"
#include "database.h"
#include "client.h"
#include "song.h"
diff --git a/src/Directory.cxx b/src/Directory.cxx
index e366906e8..d4564d69e 100644
--- a/src/Directory.cxx
+++ b/src/Directory.cxx
@@ -19,6 +19,7 @@
#include "config.h"
#include "directory.h"
+#include "SongFilter.hxx"
extern "C" {
#include "song.h"
@@ -27,7 +28,6 @@ extern "C" {
#include "path.h"
#include "util/list_sort.h"
#include "db_lock.h"
-#include "locate.h"
}
#include <glib.h>
diff --git a/src/QueueCommands.cxx b/src/QueueCommands.cxx
index de00cb18d..4801d2326 100644
--- a/src/QueueCommands.cxx
+++ b/src/QueueCommands.cxx
@@ -21,6 +21,7 @@
#include "QueueCommands.hxx"
#include "CommandError.h"
#include "DatabaseQueue.hxx"
+#include "SongFilter.hxx"
extern "C" {
#include "protocol/argparser.h"
@@ -29,7 +30,6 @@ extern "C" {
#include "playlist_print.h"
#include "ls.h"
#include "uri.h"
-#include "locate.h"
#include "client_internal.h"
#include "client_file.h"
}
diff --git a/src/QueuePrint.cxx b/src/QueuePrint.cxx
index bc7f86e52..0a61cc5dd 100644
--- a/src/QueuePrint.cxx
+++ b/src/QueuePrint.cxx
@@ -18,13 +18,13 @@
*/
#include "config.h"
+#include "SongFilter.hxx"
extern "C" {
#include "queue_print.h"
#include "queue.h"
#include "song.h"
#include "song_print.h"
-#include "locate.h"
#include "client.h"
#include "mapper.h"
}
diff --git a/src/locate.c b/src/SongFilter.cxx
index 3cf842e90..c99776e18 100644
--- a/src/locate.c
+++ b/src/SongFilter.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2012 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -18,11 +18,14 @@
*/
#include "config.h"
-#include "locate.h"
+#include "SongFilter.hxx"
#include "path.h"
-#include "tag.h"
#include "song.h"
+extern "C" {
+#include "tag.h"
+}
+
#include <glib.h>
#include <assert.h>
@@ -96,7 +99,7 @@ locate_item_list_free(struct locate_item_list *list)
static struct locate_item_list *
locate_item_list_new(unsigned length)
{
- struct locate_item_list *list =
+ struct locate_item_list *list = (struct locate_item_list *)
g_malloc(sizeof(*list) - sizeof(list->items[0]) +
length * sizeof(list->items[0]));
list->length = length;
diff --git a/src/locate.h b/src/SongFilter.hxx
index c012a9c63..38c1dae67 100644
--- a/src/locate.h
+++ b/src/SongFilter.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2012 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPD_LOCATE_H
-#define MPD_LOCATE_H
+#ifndef MPD_SONG_FILTER_HXX
+#define MPD_SONG_FILTER_HXX
#include "gcc.h"
diff --git a/src/db/SimpleDatabasePlugin.cxx b/src/db/SimpleDatabasePlugin.cxx
index 94318f4e9..2d357eb98 100644
--- a/src/db/SimpleDatabasePlugin.cxx
+++ b/src/db/SimpleDatabasePlugin.cxx
@@ -21,13 +21,13 @@
#include "SimpleDatabasePlugin.hxx"
#include "DatabaseSelection.hxx"
#include "DatabaseHelpers.hxx"
+#include "SongFilter.hxx"
extern "C" {
#include "db_error.h"
#include "db_save.h"
#include "db_lock.h"
#include "conf.h"
-#include "locate.h"
}
#include "directory.h"