diff options
author | William Wilgus <wilgus.william@gmail.com> | 2022-12-17 03:27:21 -0500 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2022-12-17 04:24:37 -0500 |
commit | c85a4f1fa4062e69f8ad8d9f4a8d70fe8c32bb82 (patch) | |
tree | 5b3fad1b7db0925c44247840a1459ac430f4b6d5 /apps/onplay.c | |
parent | ccf1aaa5bede11c95d219adbf6267426b57613d2 (diff) | |
download | rockbox-c85a4f1fa4062e69f8ad8d9f4a8d70fe8c32bb82.tar.gz rockbox-c85a4f1fa4062e69f8ad8d9f4a8d70fe8c32bb82.zip |
menus remove reserved 'param' parameter
-- missed the plugin menu --
Change-Id: Iac2c9b0b8212ab5f3ac2ef90e1ac2723d212f86c
Diffstat (limited to 'apps/onplay.c')
-rw-r--r-- | apps/onplay.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/apps/onplay.c b/apps/onplay.c index 9976e5f085..ec38ad9132 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -158,11 +158,11 @@ static int bookmark_menu_callback(int action, | |||
158 | struct gui_synclist *this_list); | 158 | struct gui_synclist *this_list); |
159 | MENUITEM_FUNCTION(bookmark_create_menu_item, 0, | 159 | MENUITEM_FUNCTION(bookmark_create_menu_item, 0, |
160 | ID2P(LANG_BOOKMARK_MENU_CREATE), | 160 | ID2P(LANG_BOOKMARK_MENU_CREATE), |
161 | bookmark_create_menu, NULL, | 161 | bookmark_create_menu, |
162 | bookmark_menu_callback, Icon_Bookmark); | 162 | bookmark_menu_callback, Icon_Bookmark); |
163 | MENUITEM_FUNCTION(bookmark_load_menu_item, 0, | 163 | MENUITEM_FUNCTION(bookmark_load_menu_item, 0, |
164 | ID2P(LANG_BOOKMARK_MENU_LIST), | 164 | ID2P(LANG_BOOKMARK_MENU_LIST), |
165 | bookmark_load_menu_wrapper, NULL, | 165 | bookmark_load_menu_wrapper, |
166 | bookmark_menu_callback, Icon_Bookmark); | 166 | bookmark_menu_callback, Icon_Bookmark); |
167 | MAKE_ONPLAYMENU(bookmark_menu, ID2P(LANG_BOOKMARK_MENU), | 167 | MAKE_ONPLAYMENU(bookmark_menu, ID2P(LANG_BOOKMARK_MENU), |
168 | bookmark_menu_callback, Icon_Bookmark, | 168 | bookmark_menu_callback, Icon_Bookmark, |
@@ -482,15 +482,15 @@ static int wps_view_cur_playlist(void) | |||
482 | } | 482 | } |
483 | 483 | ||
484 | MENUITEM_FUNCTION(wps_view_cur_playlist_item, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), | 484 | MENUITEM_FUNCTION(wps_view_cur_playlist_item, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), |
485 | wps_view_cur_playlist, NULL, NULL, Icon_NOICON); | 485 | wps_view_cur_playlist, NULL, Icon_NOICON); |
486 | MENUITEM_FUNCTION(search_playlist_item, 0, ID2P(LANG_SEARCH_IN_PLAYLIST), | 486 | MENUITEM_FUNCTION(search_playlist_item, 0, ID2P(LANG_SEARCH_IN_PLAYLIST), |
487 | search_playlist, NULL, NULL, Icon_Playlist); | 487 | search_playlist, NULL, Icon_Playlist); |
488 | MENUITEM_FUNCTION(playlist_save_item, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), | 488 | MENUITEM_FUNCTION(playlist_save_item, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), |
489 | save_playlist, NULL, NULL, Icon_Playlist); | 489 | save_playlist, NULL, Icon_Playlist); |
490 | MENUITEM_FUNCTION(reshuffle_item, 0, ID2P(LANG_SHUFFLE_PLAYLIST), | 490 | MENUITEM_FUNCTION(reshuffle_item, 0, ID2P(LANG_SHUFFLE_PLAYLIST), |
491 | shuffle_playlist, NULL, NULL, Icon_Playlist); | 491 | shuffle_playlist, NULL, Icon_Playlist); |
492 | MENUITEM_FUNCTION(playing_time_item, 0, ID2P(LANG_PLAYING_TIME), | 492 | MENUITEM_FUNCTION(playing_time_item, 0, ID2P(LANG_PLAYING_TIME), |
493 | playing_time, NULL, NULL, Icon_Playlist); | 493 | playing_time, NULL, Icon_Playlist); |
494 | MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST), | 494 | MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST), |
495 | NULL, Icon_Playlist, | 495 | NULL, Icon_Playlist, |
496 | &wps_view_cur_playlist_item, &search_playlist_item, | 496 | &wps_view_cur_playlist_item, &search_playlist_item, |
@@ -807,16 +807,16 @@ static bool set_catalogdir(void) | |||
807 | return false; | 807 | return false; |
808 | } | 808 | } |
809 | MENUITEM_FUNCTION(set_catalogdir_item, 0, ID2P(LANG_SET_AS_PLAYLISTCAT_DIR), | 809 | MENUITEM_FUNCTION(set_catalogdir_item, 0, ID2P(LANG_SET_AS_PLAYLISTCAT_DIR), |
810 | set_catalogdir, NULL, clipboard_callback, Icon_Playlist); | 810 | set_catalogdir, clipboard_callback, Icon_Playlist); |
811 | 811 | ||
812 | static int cat_playlist_callback(int action, | 812 | static int cat_playlist_callback(int action, |
813 | const struct menu_item_ex *this_item, | 813 | const struct menu_item_ex *this_item, |
814 | struct gui_synclist *this_list); | 814 | struct gui_synclist *this_list); |
815 | 815 | ||
816 | MENUITEM_FUNCTION(cat_add_to_list, 0, ID2P(LANG_CATALOG_ADD_TO), | 816 | MENUITEM_FUNCTION(cat_add_to_list, 0, ID2P(LANG_CATALOG_ADD_TO), |
817 | cat_add_to_a_playlist, 0, NULL, Icon_Playlist); | 817 | cat_add_to_a_playlist, NULL, Icon_Playlist); |
818 | MENUITEM_FUNCTION(cat_add_to_new, 0, ID2P(LANG_CATALOG_ADD_TO_NEW), | 818 | MENUITEM_FUNCTION(cat_add_to_new, 0, ID2P(LANG_CATALOG_ADD_TO_NEW), |
819 | cat_add_to_a_new_playlist, 0, NULL, Icon_Playlist); | 819 | cat_add_to_a_new_playlist, NULL, Icon_Playlist); |
820 | MAKE_ONPLAYMENU(cat_playlist_menu, ID2P(LANG_CATALOG), | 820 | MAKE_ONPLAYMENU(cat_playlist_menu, ID2P(LANG_CATALOG), |
821 | cat_playlist_callback, Icon_Playlist, | 821 | cat_playlist_callback, Icon_Playlist, |
822 | &cat_add_to_list, &cat_add_to_new, &set_catalogdir_item); | 822 | &cat_add_to_list, &cat_add_to_new, &set_catalogdir_item); |
@@ -1481,7 +1481,7 @@ static int ratingitem_callback(int action, | |||
1481 | return action; | 1481 | return action; |
1482 | } | 1482 | } |
1483 | MENUITEM_FUNCTION(rating_item, 0, ID2P(LANG_MENU_SET_RATING), | 1483 | MENUITEM_FUNCTION(rating_item, 0, ID2P(LANG_MENU_SET_RATING), |
1484 | set_rating_inline, NULL, | 1484 | set_rating_inline, |
1485 | ratingitem_callback, Icon_Questionmark); | 1485 | ratingitem_callback, Icon_Questionmark); |
1486 | #endif | 1486 | #endif |
1487 | MENUITEM_RETURNVALUE(plugin_item, ID2P(LANG_OPEN_PLUGIN), | 1487 | MENUITEM_RETURNVALUE(plugin_item, ID2P(LANG_OPEN_PLUGIN), |
@@ -1514,7 +1514,7 @@ static int view_cue_item_callback(int action, | |||
1514 | return action; | 1514 | return action; |
1515 | } | 1515 | } |
1516 | MENUITEM_FUNCTION(view_cue_item, 0, ID2P(LANG_BROWSE_CUESHEET), | 1516 | MENUITEM_FUNCTION(view_cue_item, 0, ID2P(LANG_BROWSE_CUESHEET), |
1517 | view_cue, NULL, view_cue_item_callback, Icon_NOICON); | 1517 | view_cue, view_cue_item_callback, Icon_NOICON); |
1518 | 1518 | ||
1519 | 1519 | ||
1520 | static int browse_id3_wrapper(void) | 1520 | static int browse_id3_wrapper(void) |
@@ -1531,10 +1531,10 @@ static int browse_id3_wrapper(void) | |||
1531 | 1531 | ||
1532 | /* CONTEXT_WPS items */ | 1532 | /* CONTEXT_WPS items */ |
1533 | MENUITEM_FUNCTION(browse_id3_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_MENU_SHOW_ID3_INFO), | 1533 | MENUITEM_FUNCTION(browse_id3_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_MENU_SHOW_ID3_INFO), |
1534 | browse_id3_wrapper, NULL, NULL, Icon_NOICON); | 1534 | browse_id3_wrapper, NULL, Icon_NOICON); |
1535 | #ifdef HAVE_PITCHCONTROL | 1535 | #ifdef HAVE_PITCHCONTROL |
1536 | MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH), | 1536 | MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH), |
1537 | gui_syncpitchscreen_run, NULL, NULL, Icon_Audio); | 1537 | gui_syncpitchscreen_run, NULL, Icon_Audio); |
1538 | #endif | 1538 | #endif |
1539 | 1539 | ||
1540 | /* CONTEXT_[TREE|ID3DB] items */ | 1540 | /* CONTEXT_[TREE|ID3DB] items */ |
@@ -1543,19 +1543,19 @@ static int clipboard_callback(int action, | |||
1543 | struct gui_synclist *this_list); | 1543 | struct gui_synclist *this_list); |
1544 | 1544 | ||
1545 | MENUITEM_FUNCTION(rename_file_item, 0, ID2P(LANG_RENAME), | 1545 | MENUITEM_FUNCTION(rename_file_item, 0, ID2P(LANG_RENAME), |
1546 | rename_file, NULL, clipboard_callback, Icon_NOICON); | 1546 | rename_file, clipboard_callback, Icon_NOICON); |
1547 | MENUITEM_FUNCTION(clipboard_cut_item, 0, ID2P(LANG_CUT), | 1547 | MENUITEM_FUNCTION(clipboard_cut_item, 0, ID2P(LANG_CUT), |
1548 | clipboard_cut, NULL, clipboard_callback, Icon_NOICON); | 1548 | clipboard_cut, clipboard_callback, Icon_NOICON); |
1549 | MENUITEM_FUNCTION(clipboard_copy_item, 0, ID2P(LANG_COPY), | 1549 | MENUITEM_FUNCTION(clipboard_copy_item, 0, ID2P(LANG_COPY), |
1550 | clipboard_copy, NULL, clipboard_callback, Icon_NOICON); | 1550 | clipboard_copy, clipboard_callback, Icon_NOICON); |
1551 | MENUITEM_FUNCTION(clipboard_paste_item, 0, ID2P(LANG_PASTE), | 1551 | MENUITEM_FUNCTION(clipboard_paste_item, 0, ID2P(LANG_PASTE), |
1552 | clipboard_paste, NULL, clipboard_callback, Icon_NOICON); | 1552 | clipboard_paste, clipboard_callback, Icon_NOICON); |
1553 | MENUITEM_FUNCTION(delete_file_item, 0, ID2P(LANG_DELETE), | 1553 | MENUITEM_FUNCTION(delete_file_item, 0, ID2P(LANG_DELETE), |
1554 | delete_file_dir, NULL, clipboard_callback, Icon_NOICON); | 1554 | delete_file_dir, clipboard_callback, Icon_NOICON); |
1555 | MENUITEM_FUNCTION(delete_dir_item, 0, ID2P(LANG_DELETE_DIR), | 1555 | MENUITEM_FUNCTION(delete_dir_item, 0, ID2P(LANG_DELETE_DIR), |
1556 | delete_file_dir, NULL, clipboard_callback, Icon_NOICON); | 1556 | delete_file_dir, clipboard_callback, Icon_NOICON); |
1557 | MENUITEM_FUNCTION(create_dir_item, 0, ID2P(LANG_CREATE_DIR), | 1557 | MENUITEM_FUNCTION(create_dir_item, 0, ID2P(LANG_CREATE_DIR), |
1558 | create_dir, NULL, clipboard_callback, Icon_NOICON); | 1558 | create_dir, clipboard_callback, Icon_NOICON); |
1559 | 1559 | ||
1560 | /* other items */ | 1560 | /* other items */ |
1561 | static bool list_viewers(void) | 1561 | static bool list_viewers(void) |
@@ -1579,7 +1579,7 @@ static bool onplay_load_plugin(void *param) | |||
1579 | } | 1579 | } |
1580 | 1580 | ||
1581 | MENUITEM_FUNCTION(list_viewers_item, 0, ID2P(LANG_ONPLAY_OPEN_WITH), | 1581 | MENUITEM_FUNCTION(list_viewers_item, 0, ID2P(LANG_ONPLAY_OPEN_WITH), |
1582 | list_viewers, NULL, clipboard_callback, Icon_NOICON); | 1582 | list_viewers, clipboard_callback, Icon_NOICON); |
1583 | MENUITEM_FUNCTION_W_PARAM(properties_item, 0, ID2P(LANG_PROPERTIES), | 1583 | MENUITEM_FUNCTION_W_PARAM(properties_item, 0, ID2P(LANG_PROPERTIES), |
1584 | onplay_load_plugin, (void *)"properties", | 1584 | onplay_load_plugin, (void *)"properties", |
1585 | clipboard_callback, Icon_NOICON); | 1585 | clipboard_callback, Icon_NOICON); |
@@ -1597,7 +1597,7 @@ static bool onplay_add_to_shortcuts(void) | |||
1597 | return false; | 1597 | return false; |
1598 | } | 1598 | } |
1599 | MENUITEM_FUNCTION(add_to_faves_item, 0, ID2P(LANG_ADD_TO_FAVES), | 1599 | MENUITEM_FUNCTION(add_to_faves_item, 0, ID2P(LANG_ADD_TO_FAVES), |
1600 | onplay_add_to_shortcuts, NULL, | 1600 | onplay_add_to_shortcuts, |
1601 | clipboard_callback, Icon_NOICON); | 1601 | clipboard_callback, Icon_NOICON); |
1602 | 1602 | ||
1603 | #if LCD_DEPTH > 1 | 1603 | #if LCD_DEPTH > 1 |
@@ -1611,7 +1611,7 @@ static bool set_backdrop(void) | |||
1611 | return true; | 1611 | return true; |
1612 | } | 1612 | } |
1613 | MENUITEM_FUNCTION(set_backdrop_item, 0, ID2P(LANG_SET_AS_BACKDROP), | 1613 | MENUITEM_FUNCTION(set_backdrop_item, 0, ID2P(LANG_SET_AS_BACKDROP), |
1614 | set_backdrop, NULL, clipboard_callback, Icon_NOICON); | 1614 | set_backdrop, clipboard_callback, Icon_NOICON); |
1615 | #endif | 1615 | #endif |
1616 | #ifdef HAVE_RECORDING | 1616 | #ifdef HAVE_RECORDING |
1617 | static bool set_recdir(void) | 1617 | static bool set_recdir(void) |
@@ -1622,7 +1622,7 @@ static bool set_recdir(void) | |||
1622 | return false; | 1622 | return false; |
1623 | } | 1623 | } |
1624 | MENUITEM_FUNCTION(set_recdir_item, 0, ID2P(LANG_SET_AS_REC_DIR), | 1624 | MENUITEM_FUNCTION(set_recdir_item, 0, ID2P(LANG_SET_AS_REC_DIR), |
1625 | set_recdir, NULL, clipboard_callback, Icon_Recording); | 1625 | set_recdir, clipboard_callback, Icon_Recording); |
1626 | #endif | 1626 | #endif |
1627 | static bool set_startdir(void) | 1627 | static bool set_startdir(void) |
1628 | { | 1628 | { |
@@ -1633,7 +1633,7 @@ static bool set_startdir(void) | |||
1633 | return false; | 1633 | return false; |
1634 | } | 1634 | } |
1635 | MENUITEM_FUNCTION(set_startdir_item, 0, ID2P(LANG_SET_AS_START_DIR), | 1635 | MENUITEM_FUNCTION(set_startdir_item, 0, ID2P(LANG_SET_AS_START_DIR), |
1636 | set_startdir, NULL, clipboard_callback, Icon_file_view_menu); | 1636 | set_startdir, clipboard_callback, Icon_file_view_menu); |
1637 | 1637 | ||
1638 | static int clipboard_callback(int action, | 1638 | static int clipboard_callback(int action, |
1639 | const struct menu_item_ex *this_item, | 1639 | const struct menu_item_ex *this_item, |
@@ -1747,7 +1747,7 @@ MAKE_ONPLAYMENU( wps_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE), | |||
1747 | ); | 1747 | ); |
1748 | 1748 | ||
1749 | MENUITEM_FUNCTION(view_playlist_item, 0, ID2P(LANG_VIEW), | 1749 | MENUITEM_FUNCTION(view_playlist_item, 0, ID2P(LANG_VIEW), |
1750 | view_playlist, NULL, | 1750 | view_playlist, |
1751 | onplaymenu_callback, Icon_Playlist); | 1751 | onplaymenu_callback, Icon_Playlist); |
1752 | 1752 | ||
1753 | /* used when onplay() is not called in the CONTEXT_WPS context */ | 1753 | /* used when onplay() is not called in the CONTEXT_WPS context */ |