summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2019-01-01 19:37:13 -0500
committerSolomon Peachy <pizza@shaftnet.org>2019-01-02 17:35:48 +0100
commit5e8db1662befb2d75807f60593f408c2850875a4 (patch)
treefe5372bbb1cc717da2cc2bab485e92d8422fb438 /apps
parent1b2fd8918f22b566e397d00adf8d6c6db9a915dd (diff)
downloadrockbox-5e8db1662befb2d75807f60593f408c2850875a4.tar.gz
rockbox-5e8db1662befb2d75807f60593f408c2850875a4.zip
FS#11711: Add ability to create bookmark from WPS hotkey
Original patch Michael Gentry Updated by Igor Poretsky Change-Id: Id0fd67d2b2f6c257e3cbbe9bfda5c0eace5caca5
Diffstat (limited to 'apps')
-rw-r--r--apps/onplay.c3
-rw-r--r--apps/onplay.h1
-rw-r--r--apps/settings_list.c8
3 files changed, 8 insertions, 4 deletions
diff --git a/apps/onplay.c b/apps/onplay.c
index f44d339246..7c4c83a991 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -1496,6 +1496,9 @@ static struct hotkey_assignment hotkey_items[] = {
HOTKEY_FUNC(NULL, NULL),
ONPLAY_PICTUREFLOW },
#endif
+ { HOTKEY_BOOKMARK, LANG_BOOKMARK_MENU_CREATE,
+ HOTKEY_FUNC(bookmark_create_menu, NULL),
+ ONPLAY_OK },
};
/* Return the language ID for this action */
diff --git a/apps/onplay.h b/apps/onplay.h
index d24bf567b1..24637ac18c 100644
--- a/apps/onplay.h
+++ b/apps/onplay.h
@@ -45,6 +45,7 @@ enum hotkey_action {
HOTKEY_INSERT,
HOTKEY_INSERT_SHUFFLED,
HOTKEY_PICTUREFLOW,
+ HOTKEY_BOOKMARK,
};
#endif
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 1c41954390..d189e31b9b 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -2213,19 +2213,19 @@ const struct settings_list settings[] = {
#ifdef HAVE_HOTKEY
TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_wps,
LANG_HOTKEY_WPS, HOTKEY_VIEW_PLAYLIST, "hotkey wps",
- "off,view playlist,show track info,pitchscreen,open with,delete"
+ "off,view playlist,show track info,pitchscreen,open with,delete,bookmark"
#ifdef HAVE_PICTUREFLOW_INTEGRATION
",pictureflow"
#endif
,UNIT_INT, hotkey_formatter, hotkey_getlang, NULL,
#ifdef HAVE_PICTUREFLOW_INTEGRATION
- 7,
+ 8,
#else
- 6,
+ 7,
#endif
HOTKEY_OFF,
HOTKEY_VIEW_PLAYLIST, HOTKEY_SHOW_TRACK_INFO, HOTKEY_PITCHSCREEN,
- HOTKEY_OPEN_WITH, HOTKEY_DELETE
+ HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_BOOKMARK
#ifdef HAVE_PICTUREFLOW_INTEGRATION
, HOTKEY_PICTUREFLOW
#endif