diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-02-20 19:06:39 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-02-20 19:06:39 +0000 |
commit | c19e53654b857227e2be224d451037d432529299 (patch) | |
tree | 18437a610ce91fe55bcca601cc0dbd21887bd839 /apps/onplay.c | |
parent | abb3dd4ec2876fa84c1cbf18825ece1c33fc6500 (diff) | |
download | rockbox-c19e53654b857227e2be224d451037d432529299.tar.gz rockbox-c19e53654b857227e2be224d451037d432529299.zip |
Playlist Viewer Changes to bring consistency:
- combine its two context menus to one and
- make the ACTION_STD_MENU go to the main menu as it does in all other screens
- call playlist_viewer() via root_menu to reduce call depth and to be consistent with other screens (and for the above changes to be more flexible w.r.t to the following screen)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24791 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/onplay.c')
-rw-r--r-- | apps/onplay.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/onplay.c b/apps/onplay.c index da3900ddc8..8bff92f760 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -137,15 +137,13 @@ static bool shuffle_playlist(void) | |||
137 | 137 | ||
138 | return false; | 138 | return false; |
139 | } | 139 | } |
140 | |||
141 | static bool save_playlist(void) | 140 | static bool save_playlist(void) |
142 | { | 141 | { |
143 | save_playlist_screen(NULL); | 142 | save_playlist_screen(NULL); |
144 | return false; | 143 | return false; |
145 | } | 144 | } |
146 | 145 | ||
147 | MENUITEM_FUNCTION(playlist_viewer_item, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), | 146 | extern struct menu_item_ex view_cur_playlist; /* from playlist_menu.c */ |
148 | playlist_viewer, NULL, NULL, Icon_Playlist); | ||
149 | MENUITEM_FUNCTION(search_playlist_item, 0, ID2P(LANG_SEARCH_IN_PLAYLIST), | 147 | MENUITEM_FUNCTION(search_playlist_item, 0, ID2P(LANG_SEARCH_IN_PLAYLIST), |
150 | search_playlist, NULL, NULL, Icon_Playlist); | 148 | search_playlist, NULL, NULL, Icon_Playlist); |
151 | MENUITEM_FUNCTION(playlist_save_item, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), | 149 | MENUITEM_FUNCTION(playlist_save_item, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), |
@@ -154,7 +152,7 @@ MENUITEM_FUNCTION(reshuffle_item, 0, ID2P(LANG_SHUFFLE_PLAYLIST), | |||
154 | shuffle_playlist, NULL, NULL, Icon_Playlist); | 152 | shuffle_playlist, NULL, NULL, Icon_Playlist); |
155 | MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST), | 153 | MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST), |
156 | NULL, Icon_Playlist, | 154 | NULL, Icon_Playlist, |
157 | &playlist_viewer_item, &search_playlist_item, | 155 | &view_cur_playlist, &search_playlist_item, |
158 | &playlist_save_item, &reshuffle_item | 156 | &playlist_save_item, &reshuffle_item |
159 | ); | 157 | ); |
160 | 158 | ||
@@ -1188,6 +1186,8 @@ int onplay(char* file, int attr, int from) | |||
1188 | case GO_TO_ROOT: | 1186 | case GO_TO_ROOT: |
1189 | case GO_TO_MAINMENU: | 1187 | case GO_TO_MAINMENU: |
1190 | return ONPLAY_MAINMENU; | 1188 | return ONPLAY_MAINMENU; |
1189 | case GO_TO_PLAYLIST_VIEWER: | ||
1190 | return ONPLAY_PLAYLIST; | ||
1191 | default: | 1191 | default: |
1192 | return onplay_result; | 1192 | return onplay_result; |
1193 | } | 1193 | } |