remove mpd_password variable, it should be defined within mpd_host

master
Andrzej Rybczak 18 years ago
parent 3955606c72
commit 07c9fd6926
  1. 2
      doc/config
  2. 2
      src/ncmpcpp.cpp
  3. 6
      src/settings.cpp
  4. 1
      src/settings.h

@ -9,8 +9,6 @@
#
#mpd_host = "localhost"
#
#mpd_password = ""
#
#mpd_port = "6600"
#
#mpd_music_dir = ""

@ -187,8 +187,6 @@ int main(int argc, char *argv[])
Mpd->SetHostname(Config.mpd_host);
if (Config.mpd_port != 6600)
Mpd->SetPort(Config.mpd_port);
if (!Config.mpd_password.empty())
Mpd->SetPassword(Config.mpd_password);
Mpd->SetTimeout(Config.mpd_connection_timeout);

@ -218,7 +218,6 @@ void DefaultKeys(ncmpcpp_keys &keys)
void DefaultConfiguration(ncmpcpp_config &conf)
{
conf.mpd_host = "localhost";
conf.mpd_password = "";
conf.song_list_format = "{%a - }{%t}|{[.white]%f[/white]}%r{[.green](%l)[/green]}";
conf.song_columns_list_format = "(8)[green]{l} (25)[cyan]{a} (40){t} (30)[red]{b}";
conf.song_status_format = "{(%l) }{%a - }{%t}|{%f}";
@ -502,11 +501,6 @@ void ReadConfiguration(ncmpcpp_config &conf)
if (!v.empty())
conf.mpd_host = v;
}
else if (it->find("mpd_password") != string::npos)
{
if (!v.empty())
conf.mpd_password = v;
}
else if (it->find("mpd_music_dir") != string::npos)
{
if (!v.empty())

@ -95,7 +95,6 @@ struct ncmpcpp_keys
struct ncmpcpp_config
{
string mpd_host;
string mpd_password;
string mpd_music_dir;
string song_list_format;
string song_columns_list_format;

Loading…
Cancel
Save