release v0.29

[ncmpc.git] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index 97e73b3d8abe3e27cc0bd2f9755f0f97262ed0ad..d3a26949a14b48df169e81d9b9bcb88deef7f96c 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,8 +1,31 @@
-#include "options.h"
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 The Music Player Daemon Project
+ * Project homepage: http://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.
+ */
 
-int check_user_conf_dir(void);
+#include <stdbool.h>
 
-char *get_user_key_binding_filename(void);
+bool
+check_user_conf_dir(void);
 
-int read_configuration(options_t *options);
+char *build_user_conf_filename(void);
+char *build_system_conf_filename(void);
+
+char *build_user_key_binding_filename(void);
+
+void read_configuration(void);