summaryrefslogtreecommitdiffstats
path: root/apps/onplay.c
diff options
context:
space:
mode:
authorChristian Soffke <christian.soffke@gmail.com>2021-03-12 19:24:58 +0100
committerSolomon Peachy <pizza@shaftnet.org>2021-03-14 23:36:03 +0000
commit2d8e0f7c907ee0d50e6e55fc9ed5f94a43ab5d67 (patch)
tree57d7525bc71142b11ec7164e53f1d656de8ed335 /apps/onplay.c
parent99383a0f9ba9e940a4017890965494c373a7f09a (diff)
downloadrockbox-2d8e0f7c907ee0d50e6e55fc9ed5f94a43ab5d67.tar.gz
rockbox-2d8e0f7c907ee0d50e6e55fc9ed5f94a43ab5d67.zip
Customizable Current Playlist Submenu
Options to add shuffled tracks and to queue tracks in the Current Playlist Submenu can now be hidden, or the latter can also be put into its own submenu. Users can customize this in Settings by going to "General Settings - Playlists -> Current Playlist" and choosing from "Show Shuffled Adding Options" (No / Yes) or "Show Queue Options" (No / Yes / In Submenu). Allows for the paring down of the set of choices to a minimum of the 4 more common ones for adding tracks to a dynamic playlist (coming from the current total of 11). Defaults have been set so that users have to actively modify their settings to notice any difference, which makes it unlikely that anybody's workflow would be negatively affected by this change. Change-Id: Ibe48fc4da2c79f54cd7272df8e1e3ba9955203e5
Diffstat (limited to 'apps/onplay.c')
-rw-r--r--apps/onplay.c154
1 files changed, 107 insertions, 47 deletions
diff --git a/apps/onplay.c b/apps/onplay.c
index 35d9a82bfd..be92a2909a 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -582,22 +582,8 @@ static int playlist_queue_func(void *param)
}
static int treeplaylist_wplayback_callback(int action,
- const struct menu_item_ex* this_item,
- struct gui_synclist *this_list)
-{
- (void)this_item;
- (void)this_list;
- switch (action)
- {
- case ACTION_REQUEST_MENUITEM:
- if (audio_status() & AUDIO_STATUS_PLAY)
- return action;
- else
- return ACTION_EXIT_MENUITEM;
- break;
- }
- return action;
-}
+ const struct menu_item_ex* this_item,
+ struct gui_synclist *this_list);
static int treeplaylist_callback(int action,
const struct menu_item_ex *this_item,
@@ -624,40 +610,95 @@ MENUITEM_FUNCTION(i_last_shuf_pl_item, MENU_FUNC_USEPARAM,
/* queue items */
MENUITEM_FUNCTION(q_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_QUEUE),
playlist_queue_func, (intptr_t*)PLAYLIST_INSERT,
- treeplaylist_wplayback_callback, Icon_Playlist);
+ treeplaylist_callback, Icon_Playlist);
MENUITEM_FUNCTION(q_first_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_QUEUE_FIRST),
playlist_queue_func, (intptr_t*)PLAYLIST_INSERT_FIRST,
- treeplaylist_wplayback_callback, Icon_Playlist);
+ treeplaylist_callback, Icon_Playlist);
MENUITEM_FUNCTION(q_last_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_QUEUE_LAST),
playlist_queue_func, (intptr_t*)PLAYLIST_INSERT_LAST,
- treeplaylist_wplayback_callback, Icon_Playlist);
+ treeplaylist_callback, Icon_Playlist);
MENUITEM_FUNCTION(q_shuf_pl_item, MENU_FUNC_USEPARAM,
ID2P(LANG_QUEUE_SHUFFLED), playlist_queue_func,
(intptr_t*)PLAYLIST_INSERT_SHUFFLED,
- treeplaylist_wplayback_callback, Icon_Playlist);
+ treeplaylist_callback, Icon_Playlist);
MENUITEM_FUNCTION(q_last_shuf_pl_item, MENU_FUNC_USEPARAM,
ID2P(LANG_QUEUE_LAST_SHUFFLED), playlist_queue_func,
(intptr_t*)PLAYLIST_INSERT_LAST_SHUFFLED,
treeplaylist_callback, Icon_Playlist);
+
+/* queue items in submenu */
+MENUITEM_FUNCTION(q_pl_submenu_item, MENU_FUNC_USEPARAM, ID2P(LANG_QUEUE),
+ playlist_queue_func, (intptr_t*)PLAYLIST_INSERT,
+ NULL, Icon_Playlist);
+MENUITEM_FUNCTION(q_first_pl_submenu_item, MENU_FUNC_USEPARAM, ID2P(LANG_QUEUE_FIRST),
+ playlist_queue_func, (intptr_t*)PLAYLIST_INSERT_FIRST,
+ NULL, Icon_Playlist);
+MENUITEM_FUNCTION(q_last_pl_submenu_item, MENU_FUNC_USEPARAM, ID2P(LANG_QUEUE_LAST),
+ playlist_queue_func, (intptr_t*)PLAYLIST_INSERT_LAST,
+ NULL, Icon_Playlist);
+MENUITEM_FUNCTION(q_shuf_pl_submenu_item, MENU_FUNC_USEPARAM,
+ ID2P(LANG_QUEUE_SHUFFLED), playlist_queue_func,
+ (intptr_t*)PLAYLIST_INSERT_SHUFFLED,
+ treeplaylist_callback, Icon_Playlist);
+MENUITEM_FUNCTION(q_last_shuf_pl_submenu_item, MENU_FUNC_USEPARAM,
+ ID2P(LANG_QUEUE_LAST_SHUFFLED), playlist_queue_func,
+ (intptr_t*)PLAYLIST_INSERT_LAST_SHUFFLED,
+ treeplaylist_callback, Icon_Playlist);
+
+MAKE_ONPLAYMENU(queue_menu, ID2P(LANG_QUEUE_MENU),
+ treeplaylist_wplayback_callback, Icon_Playlist,
+ &q_pl_submenu_item,
+ &q_first_pl_submenu_item,
+ &q_last_pl_submenu_item,
+ &q_shuf_pl_submenu_item,
+ &q_last_shuf_pl_submenu_item);
+
+static int treeplaylist_wplayback_callback(int action,
+ const struct menu_item_ex* this_item,
+ struct gui_synclist *this_list)
+{
+ (void)this_list;
+ switch (action)
+ {
+ case ACTION_REQUEST_MENUITEM:
+ if ((audio_status() & AUDIO_STATUS_PLAY) &&
+ (this_item != &queue_menu ||
+ global_settings.show_queue_options == QUEUE_SHOW_IN_SUBMENU))
+ return action;
+ else
+ return ACTION_EXIT_MENUITEM;
+ break;
+ }
+ return action;
+}
+
/* replace playlist */
MENUITEM_FUNCTION(replace_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_CLEAR_LIST_AND_PLAY_NEXT),
playlist_insert_func, (intptr_t*)PLAYLIST_REPLACE,
NULL, Icon_Playlist);
+MAKE_ONPLAYMENU(tree_playlist_menu, ID2P(LANG_CURRENT_PLAYLIST),
+ treeplaylist_callback, Icon_Playlist,
-MAKE_ONPLAYMENU( tree_playlist_menu, ID2P(LANG_CURRENT_PLAYLIST),
- treeplaylist_callback, Icon_Playlist,
+ /* insert */
+ &i_pl_item,
+ &i_first_pl_item,
+ &i_last_pl_item,
+ &i_shuf_pl_item,
+ &i_last_shuf_pl_item,
- /* insert */
- &i_pl_item, &i_first_pl_item, &i_last_pl_item,
- &i_shuf_pl_item, &i_last_shuf_pl_item,
- /* queue */
+ /* queue */
+ &q_pl_item,
+ &q_first_pl_item,
+ &q_last_pl_item,
+ &q_shuf_pl_item,
+ &q_last_shuf_pl_item,
- &q_pl_item, &q_first_pl_item, &q_last_pl_item,
- &q_shuf_pl_item, &q_last_shuf_pl_item,
+ /* Queue submenu */
+ &queue_menu,
- /* replace */
- &replace_pl_item
+ /* replace */
+ &replace_pl_item
);
static int treeplaylist_callback(int action,
const struct menu_item_ex *this_item,
@@ -669,36 +710,55 @@ static int treeplaylist_callback(int action,
case ACTION_REQUEST_MENUITEM:
if (this_item == &tree_playlist_menu)
{
- if (((selected_file_attr & FILE_ATTR_MASK) ==
- FILE_ATTR_AUDIO) ||
- ((selected_file_attr & FILE_ATTR_MASK) == FILE_ATTR_M3U)||
- (selected_file_attr & ATTR_DIRECTORY))
- {
- return action;
- }
+ if ((selected_file_attr & FILE_ATTR_MASK) == FILE_ATTR_AUDIO ||
+ (selected_file_attr & FILE_ATTR_MASK) == FILE_ATTR_M3U ||
+ (selected_file_attr & ATTR_DIRECTORY))
+ return action;
}
- else if (this_item == &i_pl_item)
+ else if (this_item == &i_pl_item &&
+ global_status.resume_index != -1)
{
- if (global_status.resume_index != -1)
- return action;
+ return action;
+ }
+ else if ((this_item == &q_pl_item ||
+ this_item == &q_first_pl_item ||
+ this_item == &q_last_pl_item) &&
+ global_settings.show_queue_options == QUEUE_SHOW_AT_TOPLEVEL &&
+ (audio_status() & AUDIO_STATUS_PLAY))
+ {
+ return action;
}
else if (this_item == &i_shuf_pl_item)
{
- if ((global_status.resume_index != -1) &&
- ((audio_status() & AUDIO_STATUS_PLAY) ||
- (selected_file_attr & ATTR_DIRECTORY) ||
- ((selected_file_attr & FILE_ATTR_MASK) == FILE_ATTR_M3U)))
+ if (global_settings.show_shuffled_adding_options &&
+ (global_status.resume_index != -1) &&
+ ((audio_status() & AUDIO_STATUS_PLAY) ||
+ (selected_file_attr & ATTR_DIRECTORY) ||
+ ((selected_file_attr & FILE_ATTR_MASK) == FILE_ATTR_M3U)))
+ {
+ return action;
+ }
+ }
+ else if (this_item == &q_shuf_pl_submenu_item ||
+ (this_item == &q_shuf_pl_item &&
+ global_settings.show_queue_options == QUEUE_SHOW_AT_TOPLEVEL))
+ {
+ if (global_settings.show_shuffled_adding_options &&
+ (audio_status() & AUDIO_STATUS_PLAY))
{
return action;
}
}
else if (this_item == &i_last_shuf_pl_item ||
- this_item == &q_last_shuf_pl_item)
+ this_item == &q_last_shuf_pl_submenu_item ||
+ (this_item == &q_last_shuf_pl_item &&
+ global_settings.show_queue_options == QUEUE_SHOW_AT_TOPLEVEL))
{
- if ((playlist_amount() > 0) &&
+ if (global_settings.show_shuffled_adding_options &&
+ (playlist_amount() > 0) &&
(audio_status() & AUDIO_STATUS_PLAY) &&
((selected_file_attr & ATTR_DIRECTORY) ||
- ((selected_file_attr & FILE_ATTR_MASK) == FILE_ATTR_M3U)))
+ ((selected_file_attr & FILE_ATTR_MASK) == FILE_ATTR_M3U)))
{
return action;
}