diff --git a/src/command.c b/src/command.c
index 5df533568c611688dc5b80fc87f778377c6f9db0..656bb18e389db0bd89a1389be818a861d2a7a3e1 100644 (file)
--- a/src/command.c
+++ b/src/command.c
N_("Interrupt action") },
{ {'u', 0, 0 }, 0, CMD_LYRICS_UPDATE, "lyrics-update",
N_("Update Lyrics") },
- { {'e', 0, 0 }, 0, CMD_LYRICS_EDIT, "lyrics-edit",
- N_("Edit Lyrics") },
+ /* this command may move out of #ifdef ENABLE_LYRICS_SCREEN
+ at some point */
+ { {'e', 0, 0 }, 0, CMD_EDIT, "edit",
+ N_("Edit the current item") },
#endif
#ifdef ENABLE_OUTPUTS_SCREEN
{
for (int i = 0; cmds[i].description; i++)
if (cmds[i].command != CMD_NONE)
- printf(" %20s : %s\n", get_key_names(cmds[i].command,1),cmds[i].name);
+ printf(" %20s : %s\n",
+ get_key_names(cmds[i].command, true),
+ cmds[i].name);
}
#ifndef NCMPC_MINI
-static int
+static void
set_key_flags(command_definition_t *cp, command_t command, int flags)
{
for (int i = 0; cp[i].name; i++) {
if (cp[i].command == command) {
cp[i].flags |= flags;
- return 0;
+ break;
}
}
-
- return 1;
}
#endif
const char *
-get_key_names(command_t command, int all)
+get_key_names(command_t command, bool all)
{
for (int i = 0; cmds[i].description; i++) {
if (cmds[i].command == command) {