screen_outputs: new screen to control MPD's output devices

[ncmpc.git] / src / command.c

diff --git a/src/command.c b/src/command.c
index fa7fe2e3afb79e6a45575091552d9e064a33468b..1b6519a53d5aeda6727f8911d39ee86310d87b0f 100644 (file)
--- a/src/command.c
+++ b/src/command.c
@@ -59,6 +59,7 @@
 #define F5 KEY_F(5)
 #define F6 KEY_F(6)
 #define F7 KEY_F(7)
+#define F8 KEY_F(8)
 
 
 static command_definition_t cmds[] = {
@@ -142,6 +143,14 @@ static command_definition_t cmds[] = {
        { { '"', 0, 0 }, 0, CMD_GO_PARENT_DIRECTORY, "go-parent-directory",
          N_("Go to parent directory") },
 
+#ifdef ENABLE_SONG_SCREEN
+       { { 'i', 0, 0 }, 0, CMD_VIEW, "view",
+         N_("View the song") },
+#endif
+
+       { { 'G', 0, 0 }, 0, CMD_LOCATE, "locate",
+         N_("Locate song in browser") },
+
        /* lists */
        { { 11, 0, 0 }, 0, CMD_LIST_MOVE_UP, "move-up",
          N_("Move item up") },
@@ -197,14 +206,22 @@ static command_definition_t cmds[] = {
          N_("Update Lyrics") },
 #endif
 
+#ifdef ENABLE_OUTPUTS_SCREEN
+       { {'8', F8, 0 }, 0, CMD_SCREEN_OUTPUTS, "screen-outputs",
+         N_("Outputs screen") },
+#endif
+
+
        { { -1, -1, -1 }, 0, CMD_NONE, NULL, NULL }
 };
 
+#ifdef ENABLE_KEYDEF_SCREEN
 command_definition_t *
 get_command_definitions(void)
 {
        return cmds;
 }
+#endif
 
 const char *
 key2str(int key)
@@ -458,14 +475,14 @@ check_key_bindings(command_definition_t *cp, char *buf, size_t bufsize)
                                                   get_key_names(CMD_SCREEN_KEYDEF,0));
 #else
                                        g_snprintf(buf, bufsize,
-                                                  _("Error: Key %s assigned to %s and %s !!!\n"),
+                                                  _("Error: Key %s assigned to %s and %s\n"),
                                                   key2str(cp[i].keys[j]),
                                                   get_key_command_name(cp[i].command),
                                                   get_key_command_name(cmd));
 #endif
                                } else
                                        fprintf(stderr,
-                                               _("Error: Key %s assigned to %s and %s !!!\n"),
+                                               _("Error: Key %s assigned to %s and %s\n"),
                                                key2str(cp[i].keys[j]),
                                                get_key_command_name(cp[i].command),
                                                get_key_command_name(cmd));