aboutsummaryrefslogtreecommitdiffstats
path: root/src/screen_keydef.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-03 14:31:00 +0200
committerMax Kellermann <max@duempel.org>2008-10-03 14:31:00 +0200
commitef040e296e46fcc7620edaf89ffac05e065ec3e3 (patch)
tree8836cbeb47208a2f949d6f44a093f795f03f37cb /src/screen_keydef.c
parent0b2eee9489a8acef3cdee6f6fa0df6d167c53b8d (diff)
downloadmpd-ef040e296e46fcc7620edaf89ffac05e065ec3e3.tar.gz
mpd-ef040e296e46fcc7620edaf89ffac05e065ec3e3.tar.xz
mpd-ef040e296e46fcc7620edaf89ffac05e065ec3e3.zip
screen: export the global variable "screen"
screen_t is a singleton. We do not have to pass it around everywhere. Export the one global variable.
Diffstat (limited to '')
-rw-r--r--src/screen_keydef.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/screen_keydef.c b/src/screen_keydef.c
index b84289d5b..86faabaf4 100644
--- a/src/screen_keydef.c
+++ b/src/screen_keydef.c
@@ -246,7 +246,7 @@ keydef_exit(void)
}
static void
-keydef_open(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c)
+keydef_open(mpd_unused mpdclient_t *c)
{
if (cmds == NULL) {
command_definition_t *current_cmds = get_command_definitions();
@@ -294,7 +294,7 @@ keydef_paint(void)
}
static int
-keydef_cmd(screen_t *screen, mpd_unused mpdclient_t *c, command_t cmd)
+keydef_cmd(mpd_unused mpdclient_t *c, command_t cmd)
{
int length = LIST_LENGTH();
@@ -328,7 +328,7 @@ keydef_cmd(screen_t *screen, mpd_unused mpdclient_t *c, command_t cmd)
keydef_repaint();
} else
- assign_new_key(screen->status_window.w,
+ assign_new_key(screen.status_window.w,
subcmd,
lw->selected - STATIC_SUB_ITEMS);
}
@@ -346,8 +346,7 @@ keydef_cmd(screen_t *screen, mpd_unused mpdclient_t *c, command_t cmd)
case CMD_LIST_RFIND:
case CMD_LIST_FIND_NEXT:
case CMD_LIST_RFIND_NEXT:
- screen_find(screen,
- lw, length,
+ screen_find(lw, length,
cmd, list_callback, NULL);
keydef_repaint();
return 1;