diff options
Diffstat (limited to 'apps/onplay.c')
-rw-r--r-- | apps/onplay.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/apps/onplay.c b/apps/onplay.c index 0bb3b6ae3c..0172f96c21 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -1558,6 +1558,8 @@ static bool onplay_load_plugin(void *param) | |||
1558 | onplay_result = ONPLAY_RELOAD_DIR; | 1558 | onplay_result = ONPLAY_RELOAD_DIR; |
1559 | else if (ret == PLUGIN_GOTO_PLUGIN) | 1559 | else if (ret == PLUGIN_GOTO_PLUGIN) |
1560 | onplay_result = ONPLAY_PLUGIN; | 1560 | onplay_result = ONPLAY_PLUGIN; |
1561 | else if (ret == PLUGIN_GOTO_WPS) | ||
1562 | onplay_result = ONPLAY_START_PLAY; | ||
1561 | return false; | 1563 | return false; |
1562 | } | 1564 | } |
1563 | 1565 | ||
@@ -1818,6 +1820,14 @@ static int playlist_insert_shuffled(void) | |||
1818 | return ONPLAY_RELOAD_DIR; | 1820 | return ONPLAY_RELOAD_DIR; |
1819 | } | 1821 | } |
1820 | 1822 | ||
1823 | static int tree_hotkey_run_plugin(void *param) | ||
1824 | { | ||
1825 | if (filetype_load_plugin((const char*)param, selected_file) == PLUGIN_GOTO_WPS) | ||
1826 | return ONPLAY_START_PLAY; | ||
1827 | |||
1828 | return ONPLAY_RELOAD_DIR; | ||
1829 | } | ||
1830 | |||
1821 | static void hotkey_run_plugin(void) | 1831 | static void hotkey_run_plugin(void) |
1822 | { | 1832 | { |
1823 | open_plugin_run(ID2P(LANG_HOTKEY_WPS)); | 1833 | open_plugin_run(ID2P(LANG_HOTKEY_WPS)); |
@@ -1866,12 +1876,12 @@ static struct hotkey_assignment hotkey_items[] = { | |||
1866 | HOTKEY_FUNC(bookmark_create_menu, NULL), | 1876 | HOTKEY_FUNC(bookmark_create_menu, NULL), |
1867 | ONPLAY_OK }, | 1877 | ONPLAY_OK }, |
1868 | { HOTKEY_PROPERTIES, LANG_PROPERTIES, | 1878 | { HOTKEY_PROPERTIES, LANG_PROPERTIES, |
1869 | HOTKEY_FUNC(onplay_load_plugin, (void *)"properties"), | 1879 | HOTKEY_FUNC(tree_hotkey_run_plugin, (void *)"properties"), |
1870 | ONPLAY_RELOAD_DIR }, | 1880 | ONPLAY_OK }, |
1871 | #ifdef HAVE_TAGCACHE | 1881 | #ifdef HAVE_TAGCACHE |
1872 | { HOTKEY_PICTUREFLOW, LANG_ONPLAY_PICTUREFLOW, | 1882 | { HOTKEY_PICTUREFLOW, LANG_ONPLAY_PICTUREFLOW, |
1873 | HOTKEY_FUNC(onplay_load_plugin, (void *)"pictureflow"), | 1883 | HOTKEY_FUNC(tree_hotkey_run_plugin, (void *)"pictureflow"), |
1874 | ONPLAY_RELOAD_DIR }, | 1884 | ONPLAY_OK }, |
1875 | #endif | 1885 | #endif |
1876 | }; | 1886 | }; |
1877 | 1887 | ||