aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-08-07 22:57:18 +0200
committerMax Kellermann <max@duempel.org>2012-08-07 22:57:18 +0200
commit4d6c816abb72d299b3366fcd878035ebd63e8a3f (patch)
treebfe26028dc8d4fc787e644a05cacad99a7139558 /src
parentf35ceaee0a3e05e9b00230cce4b553169c4c8712 (diff)
downloadmpd-4d6c816abb72d299b3366fcd878035ebd63e8a3f.tar.gz
mpd-4d6c816abb72d299b3366fcd878035ebd63e8a3f.tar.xz
mpd-4d6c816abb72d299b3366fcd878035ebd63e8a3f.zip
dbUtils.h: move to DatabaseQueue.hxx, DatabasePlaylist.hxx
Diffstat (limited to 'src')
-rw-r--r--src/DatabaseCommands.cxx3
-rw-r--r--src/DatabasePlaylist.cxx1
-rw-r--r--src/DatabasePlaylist.hxx34
-rw-r--r--src/DatabaseQueue.cxx1
-rw-r--r--src/DatabaseQueue.hxx39
-rw-r--r--src/dbUtils.h16
-rw-r--r--src/main.c1
7 files changed, 77 insertions, 18 deletions
diff --git a/src/DatabaseCommands.cxx b/src/DatabaseCommands.cxx
index 96cd8a5b5..aa485ece3 100644
--- a/src/DatabaseCommands.cxx
+++ b/src/DatabaseCommands.cxx
@@ -19,6 +19,8 @@
#include "config.h"
#include "DatabaseCommands.hxx"
+#include "DatabaseQueue.hxx"
+#include "DatabasePlaylist.hxx"
#include "CommandError.h"
#include "client_internal.h"
#include "tag.h"
@@ -27,7 +29,6 @@
extern "C" {
#include "db_print.h"
#include "db_selection.h"
-#include "dbUtils.h"
#include "locate.h"
#include "protocol/result.h"
}
diff --git a/src/DatabasePlaylist.cxx b/src/DatabasePlaylist.cxx
index 79d956d7c..eb59a5084 100644
--- a/src/DatabasePlaylist.cxx
+++ b/src/DatabasePlaylist.cxx
@@ -18,6 +18,7 @@
*/
#include "config.h"
+#include "DatabasePlaylist.hxx"
extern "C" {
#include "dbUtils.h"
diff --git a/src/DatabasePlaylist.hxx b/src/DatabasePlaylist.hxx
new file mode 100644
index 000000000..961dc5f2c
--- /dev/null
+++ b/src/DatabasePlaylist.hxx
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_DATABASE_PLAYLIST_HXX
+#define MPD_DATABASE_PLAYLIST_HXX
+
+#include "gcc.h"
+#include "gerror.h"
+
+struct locate_item_list;
+
+gcc_nonnull(1,2,3)
+bool
+search_add_to_playlist(const char *uri, const char *path_utf8,
+ const struct locate_item_list *criteria,
+ GError **error_r);
+
+#endif
diff --git a/src/DatabaseQueue.cxx b/src/DatabaseQueue.cxx
index dbf9ad79a..1c24e0aad 100644
--- a/src/DatabaseQueue.cxx
+++ b/src/DatabaseQueue.cxx
@@ -18,6 +18,7 @@
*/
#include "config.h"
+#include "DatabaseQueue.hxx"
extern "C" {
#include "dbUtils.h"
diff --git a/src/DatabaseQueue.hxx b/src/DatabaseQueue.hxx
new file mode 100644
index 000000000..a7ff13d61
--- /dev/null
+++ b/src/DatabaseQueue.hxx
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_DATABASE_QUEUE_HXX
+#define MPD_DATABASE_QUEUE_HXX
+
+#include "gcc.h"
+#include "gerror.h"
+
+struct locate_item_list;
+struct player_control;
+
+gcc_nonnull(1,2,3)
+bool
+findAddIn(struct player_control *pc, const char *name,
+ const struct locate_item_list *criteria, GError **error_r);
+
+gcc_nonnull(1,2,3)
+bool
+search_add_songs(struct player_control *pc, const char *uri,
+ const struct locate_item_list *criteria, GError **error_r);
+
+#endif
diff --git a/src/dbUtils.h b/src/dbUtils.h
index 95884daa1..b26422ef8 100644
--- a/src/dbUtils.h
+++ b/src/dbUtils.h
@@ -37,20 +37,4 @@ bool
addAllInToStoredPlaylist(const char *uri_utf8, const char *path_utf8,
GError **error_r);
-gcc_nonnull(1,2,3)
-bool
-findAddIn(struct player_control *pc, const char *name,
- const struct locate_item_list *criteria, GError **error_r);
-
-gcc_nonnull(1,2,3)
-bool
-search_add_songs(struct player_control *pc, const char *uri,
- const struct locate_item_list *criteria, GError **error_r);
-
-gcc_nonnull(1,2,3)
-bool
-search_add_to_playlist(const char *uri, const char *path_utf8,
- const struct locate_item_list *criteria,
- GError **error_r);
-
#endif
diff --git a/src/main.c b/src/main.c
index 4a10f1433..2c9afe001 100644
--- a/src/main.c
+++ b/src/main.c
@@ -51,7 +51,6 @@
#include "playlist_list.h"
#include "state_file.h"
#include "tag.h"
-#include "dbUtils.h"
#include "zeroconf.h"
#include "event_pipe.h"
#include "tag_pool.h"