Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configuration: load bindings from the main directory if not specified otherwise

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-09-02 20:28:48 +02:00
parent 84c90868a1
commit 73773cda98
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/configuration.cpp
View File

@@ -54,7 +54,7 @@ bool configure(int argc, char **argv)
("host,h", po::value<std::string>()->default_value("localhost"), "connect to server at host") ("host,h", po::value<std::string>()->default_value("localhost"), "connect to server at host")
("port,p", po::value<int>()->default_value(6600), "connect to server at port") ("port,p", po::value<int>()->default_value(6600), "connect to server at port")
("config,c", po::value<std::string>(&config_path)->default_value("~/.ncmpcpp/config"), "specify configuration file") ("config,c", po::value<std::string>(&config_path)->default_value("~/.ncmpcpp/config"), "specify configuration file")
("bindigs,b", po::value<std::string>(&bindings_path)->default_value("~/.ncmpcpp/bindings"), "specify bindings file") ("bindings,b", po::value<std::string>(&bindings_path)->default_value("~/.ncmpcpp/bindings"), "specify bindings file")
("screen,s", po::value<std::string>(), "specify initial screen") ("screen,s", po::value<std::string>(), "specify initial screen")
("help,?", "show help message") ("help,?", "show help message")
("version,v", "display version information") ("version,v", "display version information")
@@ -127,13 +127,18 @@ bool configure(int argc, char **argv)
cerr << "Fatal error: HOME environment variable is not defined\n"; cerr << "Fatal error: HOME environment variable is not defined\n";
return false; return false;
} }
expand_home(config_path);
expand_home(bindings_path);
// read configuration // read configuration
expand_home(config_path);
if (Config.read(config_path) == false) if (Config.read(config_path) == false)
exit(1); exit(1);
// if bindings file was not specified, use the one from main directory.
if (vm["bindings"].defaulted())
bindings_path = Config.ncmpcpp_directory + "bindings";
else
expand_home(bindings_path);
// read bindings // read bindings
if (Bindings.read(bindings_path) == false) if (Bindings.read(bindings_path) == false)
exit(1); exit(1);