diff options
Diffstat (limited to 'apps/onplay.c')
-rw-r--r-- | apps/onplay.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/apps/onplay.c b/apps/onplay.c index f89c3c9474..9976e5f085 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -626,35 +626,35 @@ static int treeplaylist_callback(int action, | |||
626 | struct gui_synclist *this_list); | 626 | struct gui_synclist *this_list); |
627 | 627 | ||
628 | /* insert items */ | 628 | /* insert items */ |
629 | MENUITEM_FUNCTION(i_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_INSERT), | 629 | MENUITEM_FUNCTION_W_PARAM(i_pl_item, 0, ID2P(LANG_INSERT), |
630 | add_to_playlist, &addtopl_insert, | 630 | add_to_playlist, &addtopl_insert, |
631 | treeplaylist_callback, Icon_Playlist); | 631 | treeplaylist_callback, Icon_Playlist); |
632 | MENUITEM_FUNCTION(i_first_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_INSERT_FIRST), | 632 | MENUITEM_FUNCTION_W_PARAM(i_first_pl_item, 0, ID2P(LANG_INSERT_FIRST), |
633 | add_to_playlist, &addtopl_insert_first, | 633 | add_to_playlist, &addtopl_insert_first, |
634 | treeplaylist_callback, Icon_Playlist); | 634 | treeplaylist_callback, Icon_Playlist); |
635 | MENUITEM_FUNCTION(i_last_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_INSERT_LAST), | 635 | MENUITEM_FUNCTION_W_PARAM(i_last_pl_item, 0, ID2P(LANG_INSERT_LAST), |
636 | add_to_playlist, &addtopl_insert_last, | 636 | add_to_playlist, &addtopl_insert_last, |
637 | treeplaylist_callback, Icon_Playlist); | 637 | treeplaylist_callback, Icon_Playlist); |
638 | MENUITEM_FUNCTION(i_shuf_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_INSERT_SHUFFLED), | 638 | MENUITEM_FUNCTION_W_PARAM(i_shuf_pl_item, 0, ID2P(LANG_INSERT_SHUFFLED), |
639 | add_to_playlist, &addtopl_insert_shuf, | 639 | add_to_playlist, &addtopl_insert_shuf, |
640 | treeplaylist_callback, Icon_Playlist); | 640 | treeplaylist_callback, Icon_Playlist); |
641 | MENUITEM_FUNCTION(i_last_shuf_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_INSERT_LAST_SHUFFLED), | 641 | MENUITEM_FUNCTION_W_PARAM(i_last_shuf_pl_item, 0, ID2P(LANG_INSERT_LAST_SHUFFLED), |
642 | add_to_playlist, &addtopl_insert_last_shuf, | 642 | add_to_playlist, &addtopl_insert_last_shuf, |
643 | treeplaylist_callback, Icon_Playlist); | 643 | treeplaylist_callback, Icon_Playlist); |
644 | /* queue items */ | 644 | /* queue items */ |
645 | MENUITEM_FUNCTION(q_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_QUEUE), | 645 | MENUITEM_FUNCTION_W_PARAM(q_pl_item, 0, ID2P(LANG_QUEUE), |
646 | add_to_playlist, &addtopl_queue, | 646 | add_to_playlist, &addtopl_queue, |
647 | treeplaylist_callback, Icon_Playlist); | 647 | treeplaylist_callback, Icon_Playlist); |
648 | MENUITEM_FUNCTION(q_first_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_QUEUE_FIRST), | 648 | MENUITEM_FUNCTION_W_PARAM(q_first_pl_item, 0, ID2P(LANG_QUEUE_FIRST), |
649 | add_to_playlist, &addtopl_queue_first, | 649 | add_to_playlist, &addtopl_queue_first, |
650 | treeplaylist_callback, Icon_Playlist); | 650 | treeplaylist_callback, Icon_Playlist); |
651 | MENUITEM_FUNCTION(q_last_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_QUEUE_LAST), | 651 | MENUITEM_FUNCTION_W_PARAM(q_last_pl_item, 0, ID2P(LANG_QUEUE_LAST), |
652 | add_to_playlist, &addtopl_queue_last, | 652 | add_to_playlist, &addtopl_queue_last, |
653 | treeplaylist_callback, Icon_Playlist); | 653 | treeplaylist_callback, Icon_Playlist); |
654 | MENUITEM_FUNCTION(q_shuf_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_QUEUE_SHUFFLED), | 654 | MENUITEM_FUNCTION_W_PARAM(q_shuf_pl_item, 0, ID2P(LANG_QUEUE_SHUFFLED), |
655 | add_to_playlist, &addtopl_queue_shuf, | 655 | add_to_playlist, &addtopl_queue_shuf, |
656 | treeplaylist_callback, Icon_Playlist); | 656 | treeplaylist_callback, Icon_Playlist); |
657 | MENUITEM_FUNCTION(q_last_shuf_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_QUEUE_LAST_SHUFFLED), | 657 | MENUITEM_FUNCTION_W_PARAM(q_last_shuf_pl_item, 0, ID2P(LANG_QUEUE_LAST_SHUFFLED), |
658 | add_to_playlist, &addtopl_queue_last_shuf, | 658 | add_to_playlist, &addtopl_queue_last_shuf, |
659 | treeplaylist_callback, Icon_Playlist); | 659 | treeplaylist_callback, Icon_Playlist); |
660 | 660 | ||
@@ -668,11 +668,11 @@ MAKE_ONPLAYMENU(queue_menu, ID2P(LANG_QUEUE_MENU), | |||
668 | &q_last_shuf_pl_item); | 668 | &q_last_shuf_pl_item); |
669 | 669 | ||
670 | /* replace playlist */ | 670 | /* replace playlist */ |
671 | MENUITEM_FUNCTION(replace_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_PLAY), | 671 | MENUITEM_FUNCTION_W_PARAM(replace_pl_item, 0, ID2P(LANG_PLAY), |
672 | add_to_playlist, &addtopl_replace, | 672 | add_to_playlist, &addtopl_replace, |
673 | treeplaylist_callback, Icon_Playlist); | 673 | treeplaylist_callback, Icon_Playlist); |
674 | 674 | ||
675 | MENUITEM_FUNCTION(replace_shuf_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_PLAY_SHUFFLED), | 675 | MENUITEM_FUNCTION_W_PARAM(replace_shuf_pl_item, 0, ID2P(LANG_PLAY_SHUFFLED), |
676 | add_to_playlist, &addtopl_replace_shuffled, | 676 | add_to_playlist, &addtopl_replace_shuffled, |
677 | treeplaylist_callback, Icon_Playlist); | 677 | treeplaylist_callback, Icon_Playlist); |
678 | 678 | ||
@@ -726,10 +726,10 @@ static int treeplaylist_callback(int action, | |||
726 | if (!(audio_status() & AUDIO_STATUS_PLAY)) | 726 | if (!(audio_status() & AUDIO_STATUS_PLAY)) |
727 | return ACTION_EXIT_MENUITEM; | 727 | return ACTION_EXIT_MENUITEM; |
728 | } | 728 | } |
729 | else if ((this_item->flags & MENU_TYPE_MASK) == MT_FUNCTION_CALL && | 729 | else if ((this_item->flags & MENU_TYPE_MASK) == MT_FUNCTION_CALL_W_PARAM && |
730 | this_item->function->function_w_param == add_to_playlist) | 730 | this_item->function_param->function_w_param == add_to_playlist) |
731 | { | 731 | { |
732 | struct add_to_pl_param *param = this_item->function->param; | 732 | struct add_to_pl_param *param = this_item->function_param->param; |
733 | 733 | ||
734 | if (param->queue) | 734 | if (param->queue) |
735 | { | 735 | { |
@@ -1580,14 +1580,14 @@ static bool onplay_load_plugin(void *param) | |||
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, NULL, clipboard_callback, Icon_NOICON); |
1583 | MENUITEM_FUNCTION(properties_item, MENU_FUNC_USEPARAM, 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); |
1586 | MENUITEM_FUNCTION(track_info_item, MENU_FUNC_USEPARAM, ID2P(LANG_MENU_SHOW_ID3_INFO), | 1586 | MENUITEM_FUNCTION_W_PARAM(track_info_item, 0, ID2P(LANG_MENU_SHOW_ID3_INFO), |
1587 | onplay_load_plugin, (void *)"properties", | 1587 | onplay_load_plugin, (void *)"properties", |
1588 | clipboard_callback, Icon_NOICON); | 1588 | clipboard_callback, Icon_NOICON); |
1589 | #ifdef HAVE_TAGCACHE | 1589 | #ifdef HAVE_TAGCACHE |
1590 | MENUITEM_FUNCTION(pictureflow_item, MENU_FUNC_USEPARAM, ID2P(LANG_ONPLAY_PICTUREFLOW), | 1590 | MENUITEM_FUNCTION_W_PARAM(pictureflow_item, 0, ID2P(LANG_ONPLAY_PICTUREFLOW), |
1591 | onplay_load_plugin, (void *)"pictureflow", | 1591 | onplay_load_plugin, (void *)"pictureflow", |
1592 | clipboard_callback, Icon_NOICON); | 1592 | clipboard_callback, Icon_NOICON); |
1593 | #endif | 1593 | #endif |
@@ -1938,7 +1938,7 @@ static int execute_hotkey(bool is_wps) | |||
1938 | const struct hotkey_assignment *this_item = get_hotkey(action); | 1938 | const struct hotkey_assignment *this_item = get_hotkey(action); |
1939 | 1939 | ||
1940 | /* run the associated function (with optional param), if any */ | 1940 | /* run the associated function (with optional param), if any */ |
1941 | const struct menu_func func = this_item->func; | 1941 | const struct menu_func_param func = this_item->func; |
1942 | 1942 | ||
1943 | int func_return = ONPLAY_RELOAD_DIR; | 1943 | int func_return = ONPLAY_RELOAD_DIR; |
1944 | if (func.function != NULL) | 1944 | if (func.function != NULL) |