diff options
Diffstat (limited to 'apps/onplay.c')
-rw-r--r-- | apps/onplay.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/apps/onplay.c b/apps/onplay.c index ead372d4e6..9a308730ad 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -197,7 +197,7 @@ static bool add_to_playlist(int position, bool queue) | |||
197 | /* Ask if user wants to recurse directory */ | 197 | /* Ask if user wants to recurse directory */ |
198 | recurse = (gui_syncyesno_run(&message, NULL, NULL)==YESNO_YES); | 198 | recurse = (gui_syncyesno_run(&message, NULL, NULL)==YESNO_YES); |
199 | } | 199 | } |
200 | 200 | ||
201 | playlist_insert_directory(NULL, selected_file, position, queue, | 201 | playlist_insert_directory(NULL, selected_file, position, queue, |
202 | recurse); | 202 | recurse); |
203 | } | 203 | } |
@@ -342,12 +342,9 @@ static int treeplaylist_callback(int action, | |||
342 | const struct menu_item_ex *this_item); | 342 | const struct menu_item_ex *this_item); |
343 | 343 | ||
344 | /* insert items */ | 344 | /* insert items */ |
345 | MENUITEM_FUNCTION(i_pl_item_no_play, MENU_FUNC_USEPARAM, ID2P(LANG_INSERT), | ||
346 | playlist_insert_func, (intptr_t*)PLAYLIST_INSERT_LAST, | ||
347 | treeplaylist_callback, Icon_Playlist); | ||
348 | MENUITEM_FUNCTION(i_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_INSERT), | 345 | MENUITEM_FUNCTION(i_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_INSERT), |
349 | playlist_insert_func, (intptr_t*)PLAYLIST_INSERT, | 346 | playlist_insert_func, (intptr_t*)PLAYLIST_INSERT, |
350 | treeplaylist_wplayback_callback, Icon_Playlist); | 347 | treeplaylist_callback, Icon_Playlist); |
351 | MENUITEM_FUNCTION(i_first_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_INSERT_FIRST), | 348 | MENUITEM_FUNCTION(i_first_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_INSERT_FIRST), |
352 | playlist_insert_func, (intptr_t*)PLAYLIST_INSERT_FIRST, | 349 | playlist_insert_func, (intptr_t*)PLAYLIST_INSERT_FIRST, |
353 | treeplaylist_wplayback_callback, Icon_Playlist); | 350 | treeplaylist_wplayback_callback, Icon_Playlist); |
@@ -389,7 +386,7 @@ MAKE_ONPLAYMENU( tree_playlist_menu, ID2P(LANG_PLAYLIST), | |||
389 | &view_playlist_item, | 386 | &view_playlist_item, |
390 | 387 | ||
391 | /* insert */ | 388 | /* insert */ |
392 | &i_pl_item_no_play, &i_pl_item, &i_first_pl_item, | 389 | &i_pl_item, &i_first_pl_item, |
393 | &i_last_pl_item, &i_shuf_pl_item, | 390 | &i_last_pl_item, &i_shuf_pl_item, |
394 | 391 | ||
395 | /* queue */ | 392 | /* queue */ |
@@ -426,15 +423,6 @@ static int treeplaylist_callback(int action, | |||
426 | else | 423 | else |
427 | return ACTION_EXIT_MENUITEM; | 424 | return ACTION_EXIT_MENUITEM; |
428 | } | 425 | } |
429 | else if (this_item == &i_pl_item_no_play) | ||
430 | { | ||
431 | if (!(audio_status() & AUDIO_STATUS_PLAY)) | ||
432 | { | ||
433 | return action; | ||
434 | } | ||
435 | else | ||
436 | return ACTION_EXIT_MENUITEM; | ||
437 | } | ||
438 | else if (this_item == &i_shuf_pl_item) | 426 | else if (this_item == &i_shuf_pl_item) |
439 | { | 427 | { |
440 | 428 | ||