configuration: support multiple configuration files

2014-11-15 15:07:49 +01:00
parent 8745523170
commit 38d9f811de
8 changed files with 61 additions and 18 deletions
--- a/src/settings.h
+++ b/src/settings.h
@@ -53,7 +53,7 @@ struct Configuration
 	: playlist_disable_highlight_delay(0), visualizer_sync_interval(0)
 	{ }

-	bool read(const std::string &config_path);
+	bool read(const std::vector<std::string> &config_paths);

 	std::string ncmpcpp_directory;
 	std::string lyrics_directory;