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

rename keys.{cpp,h} to bindings.{cpp,h}

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-05 23:19:34 +02:00
parent 8ef252ec6e
commit 1be7676187
6 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ncmpcpp.cpp
View File

@@ -31,10 +31,10 @@
#include "mpdpp.h"
#include "actions.h"
#include "bindings.h"
#include "browser.h"
#include "global.h"
#include "helpers.h"
#include "keys.h"
#include "lyrics.h"
#include "playlist.h"
#include "settings.h"
@@ -98,10 +98,10 @@ int main(int argc, char **argv)
Config.Read();
Config.GenerateColumns();
if (!Keys.read(Config.ncmpcpp_directory + "keys"))
if (!Bindings.read(Config.ncmpcpp_directory + "keys"))
return 1;
Keys.generateBindings();
Bindings.generateDefault();
if (getenv("MPD_HOST"))
Mpd.SetHostname(getenv("MPD_HOST"));
@@ -273,7 +273,7 @@ int main(int argc, char **argv)
if (input == Key::noOp)
continue;
auto k = Keys.Bindings.equal_range(input);
auto k = Bindings.get(input);
for (; k.first != k.second; ++k.first)
{
Binding &b = k.first->second;