diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/action.h | 2 | ||||
-rw-r--r-- | apps/gui/gwps.c | 10 | ||||
-rw-r--r-- | apps/keymaps/keymap-e200.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-h1x0_h3x0.c | 2 | ||||
-rw-r--r-- | apps/menu.c | 8 | ||||
-rw-r--r-- | apps/tree.c | 5 |
6 files changed, 28 insertions, 1 deletions
diff --git a/apps/action.h b/apps/action.h index 5beacaa0e2..9859c2c50c 100644 --- a/apps/action.h +++ b/apps/action.h | |||
@@ -91,6 +91,7 @@ enum { | |||
91 | ACTION_STD_MENU, | 91 | ACTION_STD_MENU, |
92 | ACTION_STD_QUICKSCREEN, | 92 | ACTION_STD_QUICKSCREEN, |
93 | ACTION_STD_KEYLOCK, | 93 | ACTION_STD_KEYLOCK, |
94 | ACTION_STD_REC, | ||
94 | 95 | ||
95 | ACTION_F3, /* just so everything works again, possibly change me */ | 96 | ACTION_F3, /* just so everything works again, possibly change me */ |
96 | /* code context actions */ | 97 | /* code context actions */ |
@@ -111,6 +112,7 @@ enum { | |||
111 | ACTION_WPS_CONTEXT, | 112 | ACTION_WPS_CONTEXT, |
112 | ACTION_WPS_QUICKSCREEN,/* optional */ | 113 | ACTION_WPS_QUICKSCREEN,/* optional */ |
113 | ACTION_WPS_MENU, /*this should be the same as ACTION_STD_MENU */ | 114 | ACTION_WPS_MENU, /*this should be the same as ACTION_STD_MENU */ |
115 | ACTION_WPS_REC, | ||
114 | #if 0 | 116 | #if 0 |
115 | ACTION_WPSAB_SINGLE, /* This needs to be #defined in | 117 | ACTION_WPSAB_SINGLE, /* This needs to be #defined in |
116 | the config-<target>.h to one of the ACTION_WPS_ actions | 118 | the config-<target>.h to one of the ACTION_WPS_ actions |
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 714dfe8ee9..3defead099 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -618,7 +618,11 @@ long gui_wps_show(void) | |||
618 | update_track = true; | 618 | update_track = true; |
619 | ffwd_rew(button); /* hopefully fix the ffw/rwd bug */ | 619 | ffwd_rew(button); /* hopefully fix the ffw/rwd bug */ |
620 | break; | 620 | break; |
621 | 621 | #ifdef HAVE_RECORDING | |
622 | case ACTION_WPS_REC: | ||
623 | exit = true; | ||
624 | break; | ||
625 | #endif | ||
622 | case SYS_POWEROFF: | 626 | case SYS_POWEROFF: |
623 | bookmark_autobookmark(); | 627 | bookmark_autobookmark(); |
624 | #if LCD_DEPTH > 1 | 628 | #if LCD_DEPTH > 1 |
@@ -677,6 +681,10 @@ long gui_wps_show(void) | |||
677 | #ifdef AB_REPEAT_ENABLE | 681 | #ifdef AB_REPEAT_ENABLE |
678 | ab_reset_markers(); | 682 | ab_reset_markers(); |
679 | #endif | 683 | #endif |
684 | #ifdef HAVE_RECORDING | ||
685 | if (button == ACTION_WPS_REC) | ||
686 | return GO_TO_RECSCREEN; | ||
687 | #endif | ||
680 | if (global_settings.browse_current) | 688 | if (global_settings.browse_current) |
681 | return GO_TO_PREVIOUS_BROWSER; | 689 | return GO_TO_PREVIOUS_BROWSER; |
682 | return GO_TO_PREVIOUS; | 690 | return GO_TO_PREVIOUS; |
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c index 318f495abe..8ba7e72507 100644 --- a/apps/keymaps/keymap-e200.c +++ b/apps/keymaps/keymap-e200.c | |||
@@ -37,6 +37,7 @@ static const struct button_mapping button_context_standard[] = { | |||
37 | { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 37 | { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
38 | 38 | ||
39 | { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 39 | { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
40 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | ||
40 | 41 | ||
41 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 42 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
42 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | 43 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, |
@@ -76,6 +77,7 @@ static const struct button_mapping button_context_wps[] = { | |||
76 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 77 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, |
77 | 78 | ||
78 | { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 79 | { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
80 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | ||
79 | 81 | ||
80 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, | 82 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, |
81 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, | 83 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, |
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index 0f5911aac7..4ebdfaadc3 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c | |||
@@ -61,6 +61,7 @@ static const struct button_mapping button_context_standard[] = { | |||
61 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 61 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
62 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | 62 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, |
63 | { ACTION_STD_OK, BUTTON_ON|BUTTON_REL, BUTTON_NONE }, | 63 | { ACTION_STD_OK, BUTTON_ON|BUTTON_REL, BUTTON_NONE }, |
64 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | ||
64 | 65 | ||
65 | LAST_ITEM_IN_LIST | 66 | LAST_ITEM_IN_LIST |
66 | }; /* button_context_standard */ | 67 | }; /* button_context_standard */ |
@@ -88,6 +89,7 @@ static const struct button_mapping button_context_wps[] = { | |||
88 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 89 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
89 | { ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, | 90 | { ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, |
90 | { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE }, | 91 | { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE }, |
92 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | ||
91 | 93 | ||
92 | LAST_ITEM_IN_LIST | 94 | LAST_ITEM_IN_LIST |
93 | }; /* button_context_wps */ | 95 | }; /* button_context_wps */ |
diff --git a/apps/menu.c b/apps/menu.c index 60f2424cae..0b6be4c706 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -340,6 +340,14 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected) | |||
340 | continue; | 340 | continue; |
341 | } | 341 | } |
342 | 342 | ||
343 | #ifdef HAVE_RECORDING | ||
344 | if (action == ACTION_STD_REC) | ||
345 | { | ||
346 | ret = GO_TO_RECSCREEN; | ||
347 | done = true; | ||
348 | } | ||
349 | else | ||
350 | #endif | ||
343 | if (action == ACTION_TREE_WPS) | 351 | if (action == ACTION_TREE_WPS) |
344 | { | 352 | { |
345 | ret = GO_TO_PREVIOUS_MUSIC; | 353 | ret = GO_TO_PREVIOUS_MUSIC; |
diff --git a/apps/tree.c b/apps/tree.c index 9ebf91d18e..5a4292d34c 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -630,6 +630,11 @@ static int dirbrowse() | |||
630 | return GO_TO_ROOT; | 630 | return GO_TO_ROOT; |
631 | break; | 631 | break; |
632 | 632 | ||
633 | #ifdef HAVE_RECORDING | ||
634 | case ACTION_STD_REC: | ||
635 | return GO_TO_RECSCREEN; | ||
636 | #endif | ||
637 | |||
633 | case ACTION_TREE_WPS: | 638 | case ACTION_TREE_WPS: |
634 | return GO_TO_PREVIOUS_MUSIC; | 639 | return GO_TO_PREVIOUS_MUSIC; |
635 | break; | 640 | break; |