diff options
Diffstat (limited to 'apps/menus/playlist_menu.c')
-rw-r--r-- | apps/menus/playlist_menu.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c index b0d9a44a9e..dfb9d73d62 100644 --- a/apps/menus/playlist_menu.c +++ b/apps/menus/playlist_menu.c | |||
@@ -80,15 +80,14 @@ static int playlist_view_(void) | |||
80 | playlist_viewer_ex(NULL); | 80 | playlist_viewer_ex(NULL); |
81 | return 0; | 81 | return 0; |
82 | } | 82 | } |
83 | MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), | 83 | MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), |
84 | create_playlist, NULL, NULL, Icon_NOICON); | 84 | create_playlist, NULL, NULL, Icon_NOICON); |
85 | MENUITEM_FUNCTION(view_cur_playlist, 0, | 85 | MENUITEM_FUNCTION(view_cur_playlist, 0, |
86 | ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), | 86 | ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), |
87 | playlist_view_, NULL, NULL, Icon_NOICON); | 87 | playlist_view_, NULL, NULL, Icon_NOICON); |
88 | MENUITEM_FUNCTION(save_playlist, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), | 88 | MENUITEM_FUNCTION(save_playlist, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), |
89 | save_playlist_screen, NULL, NULL, Icon_NOICON); | 89 | save_playlist_screen, NULL, NULL, Icon_NOICON); |
90 | MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); | 90 | MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); |
91 | MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL); | ||
92 | static int clear_catalog_directory(void) | 91 | static int clear_catalog_directory(void) |
93 | { | 92 | { |
94 | catalog_set_directory(NULL); | 93 | catalog_set_directory(NULL); |
@@ -96,22 +95,29 @@ static int clear_catalog_directory(void) | |||
96 | splash(HZ, ID2P(LANG_RESET_DONE_CLEAR)); | 95 | splash(HZ, ID2P(LANG_RESET_DONE_CLEAR)); |
97 | return false; | 96 | return false; |
98 | } | 97 | } |
99 | MENUITEM_FUNCTION(clear_catalog_directory_item, 0, ID2P(LANG_RESET_PLAYLISTCAT_DIR), | 98 | MENUITEM_FUNCTION(clear_catalog_directory_item, 0, ID2P(LANG_RESET_PLAYLISTCAT_DIR), |
100 | clear_catalog_directory, NULL, NULL, Icon_file_view_menu); | 99 | clear_catalog_directory, NULL, NULL, Icon_file_view_menu); |
101 | 100 | ||
102 | /* Playlist viewer settings submenu */ | 101 | /* Playlist viewer settings submenu */ |
103 | MENUITEM_SETTING(show_icons, &global_settings.playlist_viewer_icons, NULL); | 102 | MENUITEM_SETTING(show_icons, &global_settings.playlist_viewer_icons, NULL); |
104 | MENUITEM_SETTING(show_indices, &global_settings.playlist_viewer_indices, NULL); | 103 | MENUITEM_SETTING(show_indices, &global_settings.playlist_viewer_indices, NULL); |
105 | MENUITEM_SETTING(track_display, | 104 | MENUITEM_SETTING(track_display, |
106 | &global_settings.playlist_viewer_track_display, NULL); | 105 | &global_settings.playlist_viewer_track_display, NULL); |
107 | MAKE_MENU(viewer_settings_menu, ID2P(LANG_PLAYLISTVIEWER_SETTINGS), | 106 | MAKE_MENU(viewer_settings_menu, ID2P(LANG_PLAYLISTVIEWER_SETTINGS), |
108 | NULL, Icon_Playlist, | 107 | NULL, Icon_Playlist, |
109 | &show_icons, &show_indices, &track_display); | 108 | &show_icons, &show_indices, &track_display); |
110 | 109 | ||
110 | /* Current Playlist submenu */ | ||
111 | MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL); | ||
112 | MENUITEM_SETTING(show_shuffled_adding_options, &global_settings.show_shuffled_adding_options, NULL); | ||
113 | MENUITEM_SETTING(show_queue_options, &global_settings.show_queue_options, NULL); | ||
114 | MAKE_MENU(currentplaylist_settings_menu, ID2P(LANG_CURRENT_PLAYLIST), | ||
115 | NULL, Icon_Playlist, | ||
116 | &warn_on_erase, &show_shuffled_adding_options, &show_queue_options); | ||
111 | 117 | ||
112 | MAKE_MENU(playlist_settings, ID2P(LANG_PLAYLISTS), NULL, | 118 | MAKE_MENU(playlist_settings, ID2P(LANG_PLAYLISTS), NULL, |
113 | Icon_Playlist, | 119 | Icon_Playlist, |
114 | &viewer_settings_menu, &recursive_dir_insert, &warn_on_erase); | 120 | &viewer_settings_menu, &recursive_dir_insert, ¤tplaylist_settings_menu); |
115 | MAKE_MENU(playlist_options, ID2P(LANG_PLAYLISTS), NULL, | 121 | MAKE_MENU(playlist_options, ID2P(LANG_PLAYLISTS), NULL, |
116 | Icon_Playlist, | 122 | Icon_Playlist, |
117 | &create_playlist_item, &view_cur_playlist, | 123 | &create_playlist_item, &view_cur_playlist, |