From ef040e296e46fcc7620edaf89ffac05e065ec3e3 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 3 Oct 2008 14:31:00 +0200 Subject: 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. --- src/screen_keydef.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/screen_keydef.c') 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; -- cgit v1.2.3