oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

locate: rename to SongFilter.cxx

This commit is contained in:
Max Kellermann 2012-08-29 19:12:26 +02:00
parent 7b35d5e9d4
commit 36b1c08ad7
9 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -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

2
src/DatabaseCommands.cxx
View File

@ -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"
}

2
src/DatabasePrint.cxx
View File

@ -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"

2
src/Directory.cxx
View File

@ -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>

2
src/QueueCommands.cxx
View File

@ -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"
}

2
src/QueuePrint.cxx
View File

@ -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"
}

11
src/locate.c → src/SongFilter.cxx
View File

@ -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;

6
src/locate.h → src/SongFilter.hxx
View File

@ -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"

2
src/db/SimpleDatabasePlugin.cxx
View File

@ -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"