From 4381d80d0310cea9c554c7f41bdfcea89401aa71 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jonathan=20Neusch=C3=A4fer?= <j.neuschaefer@gmx.net>
Date: Wed, 21 Dec 2011 19:55:10 +0100
Subject: [PATCH] change CMD_LYRICS_EDIT to CMD_EDIT

This allows other screens to implement edit funtionality
---
 src/command.c       | 6 ++++--
 src/command.h       | 2 +-
 src/screen_help.c   | 2 +-
 src/screen_lyrics.c | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/command.c b/src/command.c
index 5df5335..e6f2f1d 100644
--- a/src/command.c
+++ b/src/command.c
@@ -241,8 +241,10 @@ static command_definition_t cmds[] = {
 	  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
diff --git a/src/command.h b/src/command.h
index a05ea55..3a7d61d 100644
--- a/src/command.h
+++ b/src/command.h
@@ -96,7 +96,7 @@ typedef enum {
 	CMD_SCREEN_LYRICS,
 	CMD_SCREEN_OUTPUTS,
 	CMD_LYRICS_UPDATE,
-	CMD_LYRICS_EDIT,
+	CMD_EDIT,
 	CMD_INTERRUPT,
 	CMD_GO_ROOT_DIRECTORY,
 	CMD_GO_PARENT_DIRECTORY,
diff --git a/src/screen_help.c b/src/screen_help.c
index e3b2f3d..aad266b 100644
--- a/src/screen_help.c
+++ b/src/screen_help.c
@@ -162,7 +162,7 @@ static const struct help_text_row help_text[] = {
 	   from the server */
 	{ 0, CMD_INTERRUPT, N_("Interrupt retrieval") },
 	{ 0, CMD_LYRICS_UPDATE, N_("Download lyrics for currently playing song") },
-	{ 0, CMD_LYRICS_EDIT, N_("Add or edit lyrics") },
+	{ 0, CMD_EDIT, N_("Add or edit lyrics") },
 	{ 0, CMD_SAVE_PLAYLIST, N_("Save lyrics") },
 	{ 0, CMD_DELETE, N_("Delete saved lyrics") },
 #endif
diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index ee76e28..ef230c8 100644
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
@@ -448,7 +448,7 @@ lyrics_cmd(struct mpdclient *c, command_t cmd)
 			screen_text_repaint(&text);
 		}
 		return true;
-	case CMD_LYRICS_EDIT:
+	case CMD_EDIT:
 		lyrics_edit();
 		return true;
 	case CMD_SELECT:
-- 
2.30.2