From 224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Tue, 15 Aug 2006 12:27:07 +0000 Subject: Finally, the new button action system is here, thanks to Jonathan Gordon. Some button mappings have changed and other things may break. Comments should go to the forum, http://forums.rockbox.org/index.php?topic=5829.0 or the mailing list. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10582 a1c6a512-1295-4272-9138-f99709370657 --- apps/playlist_catalog.c | 44 ++++++-------------------------------------- 1 file changed, 6 insertions(+), 38 deletions(-) (limited to 'apps/playlist_catalog.c') diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c index a1a9bd8ea1..55af178ee4 100644 --- a/apps/playlist_catalog.c +++ b/apps/playlist_catalog.c @@ -214,7 +214,6 @@ static int display_playlists(char* playlist, bool view) { int result = -1; int num_playlists = 0; - int lastbutton = BUTTON_NONE; bool exit = false; char temp_buf[MAX_PATH]; char* playlists[MAX_PLAYLISTS]; @@ -240,7 +239,7 @@ static int display_playlists(char* playlist, bool view) while (!exit) { - int button = button_get_w_tmo(HZ/2); + int button = get_action(CONTEXT_LIST,HZ/2); char* sel_file; gui_synclist_do_button(&playlist_lists, button); @@ -249,34 +248,11 @@ static int display_playlists(char* playlist, bool view) switch (button) { - case TREE_EXIT: -#ifdef TREE_RC_EXIT - case TREE_RC_EXIT: -#endif -#ifdef TREE_OFF - case TREE_OFF: -#endif + case ACTION_STD_CANCEL: exit = true; break; -#ifdef TREE_ENTER - case TREE_ENTER: - case TREE_ENTER | BUTTON_REPEAT: -#endif -#ifdef TREE_RC_RUN - case TREE_RC_RUN: -#endif - case TREE_RUN: -#ifdef TREE_RUN_PRE - if (((button == TREE_RUN) -#ifdef TREE_RC_RUN_PRE - || (button == TREE_RC_RUN)) - && ((lastbutton != TREE_RC_RUN_PRE) -#endif - && (lastbutton != TREE_RUN_PRE))) - break; -#endif - + case ACTION_STD_OK: if (view) { /* In view mode, selecting a playlist starts playback */ @@ -298,13 +274,7 @@ static int display_playlists(char* playlist, bool view) exit = true; break; - case TREE_CONTEXT: -#ifdef TREE_CONTEXT2 - case TREE_CONTEXT2: -#endif -#ifdef TREE_RC_CONTEXT - case TREE_RC_CONTEXT: -#endif + case ACTION_STD_CONTEXT: /* context menu only available in view mode */ if (view) { @@ -322,7 +292,7 @@ static int display_playlists(char* playlist, bool view) } break; - case BUTTON_NONE: + case ACTION_NONE: gui_syncstatusbar_draw(&statusbars, false); break; @@ -334,10 +304,8 @@ static int display_playlists(char* playlist, bool view) } break; } - - lastbutton = button; } - + action_signalscreenchange(); return result; } -- cgit v1.2.3