From 729523ec80f35a683c982054628cd47d2161d3d4 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 8 Oct 2008 11:07:35 +0200 Subject: directory: moved code to database.c Taming the directory.c monster, part II: move the database management stuff to database. directory.c should only contain code which works on directory objects. --- src/database.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/database.h (limited to 'src/database.h') diff --git a/src/database.h b/src/database.h new file mode 100644 index 000000000..e3ed64f0c --- /dev/null +++ b/src/database.h @@ -0,0 +1,50 @@ +/* the Music Player Daemon (MPD) + * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) + * Copyright (C) 2008 Max Kellermann + * This project's homepage is: http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef DATABASE_H +#define DATABASE_H + +#include "os_compat.h" +#include "directory.h" + +void directory_init(void); + +void directory_finish(void); + +struct directory * directory_get_root(void); + +struct directory * getDirectory(const char *name); + +struct mpd_song * getSongFromDB(const char *file); + +int traverseAllIn(const char *name, + int (*forEachSong) (struct mpd_song *, void *), + int (*forEachDir) (struct directory *, void *), void *data); + +int printDirectoryInfo(int fd, const char *name); + +int checkDirectoryDB(void); + +int writeDirectoryDB(void); + +int readDirectoryDB(void); + +time_t getDbModTime(void); + +#endif /* DATABASE_H */ -- cgit v1.2.3 From 0576b8abf8b2fd25105f6e0190a93ddec298e9fb Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 8 Oct 2008 11:07:39 +0200 Subject: database: removed printDirectoryInfo() The same can be achieved with directory_print(db_get_directory()). --- src/database.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/database.h') diff --git a/src/database.h b/src/database.h index e3ed64f0c..f6f320002 100644 --- a/src/database.h +++ b/src/database.h @@ -37,8 +37,6 @@ int traverseAllIn(const char *name, int (*forEachSong) (struct mpd_song *, void *), int (*forEachDir) (struct directory *, void *), void *data); -int printDirectoryInfo(int fd, const char *name); - int checkDirectoryDB(void); int writeDirectoryDB(void); -- cgit v1.2.3 From 4629f646077109f7c6185aab92560da52c237412 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 8 Oct 2008 11:07:55 +0200 Subject: database: renamed functions, "db_" prefix and no CamelCase Yet another CamelCase removal patch. --- src/database.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/database.h') diff --git a/src/database.h b/src/database.h index f6f320002..0eb7d535d 100644 --- a/src/database.h +++ b/src/database.h @@ -23,26 +23,26 @@ #include "os_compat.h" #include "directory.h" -void directory_init(void); +void db_init(void); -void directory_finish(void); +void db_finish(void); -struct directory * directory_get_root(void); +struct directory * db_get_root(void); -struct directory * getDirectory(const char *name); +struct directory * db_get_directory(const char *name); -struct mpd_song * getSongFromDB(const char *file); +struct mpd_song * db_get_song(const char *file); -int traverseAllIn(const char *name, +int db_walk(const char *name, int (*forEachSong) (struct mpd_song *, void *), int (*forEachDir) (struct directory *, void *), void *data); -int checkDirectoryDB(void); +int db_check(void); -int writeDirectoryDB(void); +int db_save(void); -int readDirectoryDB(void); +int db_load(void); -time_t getDbModTime(void); +time_t db_get_mtime(void); #endif /* DATABASE_H */ -- cgit v1.2.3