summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/action.h6
-rw-r--r--apps/keymaps/keymap-h1x0_h3x0.c60
-rw-r--r--apps/keymaps/keymap-ondio.c12
-rw-r--r--apps/keymaps/keymap-recorder.c15
-rw-r--r--apps/keymaps/keymap-x5.c15
-rw-r--r--apps/recorder/peakmeter.c3
-rw-r--r--apps/recorder/recording.c166
7 files changed, 122 insertions, 155 deletions
diff --git a/apps/action.h b/apps/action.h
index e95d009a0f..a74a2e145d 100644
--- a/apps/action.h
+++ b/apps/action.h
@@ -53,6 +53,7 @@ enum {
53 CONTEXT_BOOKMARKSCREEN, /*NOTE: requires the action_setting_* mappings also */ 53 CONTEXT_BOOKMARKSCREEN, /*NOTE: requires the action_setting_* mappings also */
54 CONTEXT_QUICKSCREEN, /* uses ACTION_QS_ defines below */ 54 CONTEXT_QUICKSCREEN, /* uses ACTION_QS_ defines below */
55 CONTEXT_PITCHSCREEN, /* uses ACTION_PS_ defines below */ 55 CONTEXT_PITCHSCREEN, /* uses ACTION_PS_ defines below */
56 CONTEXT_RECSCREEN,
56}; 57};
57 58
58 59
@@ -111,6 +112,11 @@ enum {
111 ACTION_TREE_WPS, 112 ACTION_TREE_WPS,
112 113
113 /* recording screen */ 114 /* recording screen */
115 ACTION_REC_LCD,
116 ACTION_REC_PAUSE,
117 ACTION_REC_NEWFILE,
118 ACTION_REC_F2,
119 ACTION_REC_F3,
114 120
115 /* main menu */ 121 /* main menu */
116 122
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index 5a6f823d53..969bb9c46b 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -197,6 +197,17 @@ const struct button_mapping button_context_pitchscreen[] = {
197 LAST_ITEM_IN_LIST 197 LAST_ITEM_IN_LIST
198}; /* button_context_pitchcreen */ 198}; /* button_context_pitchcreen */
199 199
200const struct button_mapping button_context_recscreen[] = {
201 { ACTION_REC_PAUSE, BUTTON_ON, BUTTON_NONE },
202 { ACTION_REC_NEWFILE, BUTTON_REC, BUTTON_NONE },
203 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
204 { ACTION_SETTINGS_INC, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
205 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
206 { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
207
208 LAST_ITEM_IN_LIST
209}; /* button_context_recscreen */
210
200/***************************************************************************** 211/*****************************************************************************
201 * Remote control mappings 212 * Remote control mappings
202 *****************************************************************************/ 213 *****************************************************************************/
@@ -384,7 +395,7 @@ const struct button_mapping button_context_settingsgraphical_h100remote[] = {
384 { ACTION_STD_NEXTREPEAT, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, 395 { ACTION_STD_NEXTREPEAT, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE },
385 396
386 LAST_ITEM_IN_LIST 397 LAST_ITEM_IN_LIST
387}; 398}; /* button_context_recscreen_h100remote*/
388 399
389const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = { 400const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = {
390 { ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE }, 401 { ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE },
@@ -397,7 +408,7 @@ const struct button_mapping button_context_settingsgraphical_h300lcdremote[] =
397 { ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 408 { ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
398 409
399 LAST_ITEM_IN_LIST 410 LAST_ITEM_IN_LIST
400}; 411}; /* button_context_recscreen_h300lcdremote */
401 412
402const struct button_mapping button_context_yesno_h100remote[] = { 413const struct button_mapping button_context_yesno_h100remote[] = {
403 { ACTION_YESNO_ACCEPT, BUTTON_RC_MENU, BUTTON_NONE }, 414 { ACTION_YESNO_ACCEPT, BUTTON_RC_MENU, BUTTON_NONE },
@@ -477,6 +488,29 @@ const struct button_mapping button_context_pitchscreen_h300lcdremote[] = {
477 LAST_ITEM_IN_LIST 488 LAST_ITEM_IN_LIST
478}; 489};
479 490
491const struct button_mapping button_context_recscreen_h100remote[] = {
492 { ACTION_REC_LCD, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
493 { ACTION_REC_PAUSE, BUTTON_RC_ON, BUTTON_NONE },
494 { ACTION_REC_NEWFILE, BUTTON_RC_REC, BUTTON_NONE },
495 { ACTION_SETTINGS_INC, BUTTON_RC_BITRATE, BUTTON_NONE },
496 { ACTION_SETTINGS_INC, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE },
497 { ACTION_SETTINGS_DEC, BUTTON_RC_SOURCE, BUTTON_NONE },
498 { ACTION_SETTINGS_DEC, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE },
499
500 LAST_ITEM_IN_LIST
501};
502
503const struct button_mapping button_context_recscreen_h300lcdremote[] = {
504 { ACTION_REC_LCD, BUTTON_RC_SOURCE, BUTTON_NONE },
505 { ACTION_REC_PAUSE, BUTTON_RC_ON, BUTTON_NONE },
506 { ACTION_REC_NEWFILE, BUTTON_RC_REC, BUTTON_NONE },
507 { ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE },
508 { ACTION_SETTINGS_INC, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
509 { ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE },
510 { ACTION_SETTINGS_DEC, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
511
512 LAST_ITEM_IN_LIST
513};
480 514
481 515
482/* the actual used tables */ 516/* the actual used tables */
@@ -497,7 +531,9 @@ static const struct button_mapping
497 *remote_btn_ctxt_quickscreen 531 *remote_btn_ctxt_quickscreen
498 = button_context_quickscreen_h100remote, 532 = button_context_quickscreen_h100remote,
499 *remote_btn_ctxt_pitchscreen 533 *remote_btn_ctxt_pitchscreen
500 = button_context_pitchscreen_h100remote; 534 = button_context_pitchscreen_h100remote,
535 *remote_button_ctxt_recscreen
536 = button_context_recscreen_h100remote;
501 537
502static int _remote_type = 0; 538static int _remote_type = 0;
503 539
@@ -519,6 +555,7 @@ static void remap_remote(void)
519 remote_btn_ctxt_bmark = NULL; 555 remote_btn_ctxt_bmark = NULL;
520 remote_btn_ctxt_quickscreen = NULL; 556 remote_btn_ctxt_quickscreen = NULL;
521 remote_btn_ctxt_pitchscreen = NULL; 557 remote_btn_ctxt_pitchscreen = NULL;
558 remote_button_ctxt_recscreen = NULL;
522 break; 559 break;
523 560
524 case REMOTETYPE_H100_LCD: 561 case REMOTETYPE_H100_LCD:
@@ -538,7 +575,9 @@ static void remap_remote(void)
538 remote_btn_ctxt_quickscreen 575 remote_btn_ctxt_quickscreen
539 = button_context_quickscreen_h100remote, 576 = button_context_quickscreen_h100remote,
540 remote_btn_ctxt_pitchscreen 577 remote_btn_ctxt_pitchscreen
541 = button_context_pitchscreen_h100remote; 578 = button_context_pitchscreen_h100remote,
579 remote_button_ctxt_recscreen
580 = button_context_recscreen_h100remote;
542 break; 581 break;
543 582
544 case REMOTETYPE_H300_LCD: 583 case REMOTETYPE_H300_LCD:
@@ -558,7 +597,9 @@ static void remap_remote(void)
558 remote_btn_ctxt_quickscreen 597 remote_btn_ctxt_quickscreen
559 = button_context_quickscreen_h300lcdremote, 598 = button_context_quickscreen_h300lcdremote,
560 remote_btn_ctxt_pitchscreen 599 remote_btn_ctxt_pitchscreen
561 = button_context_pitchscreen_h300lcdremote; 600 = button_context_pitchscreen_h300lcdremote,
601 remote_button_ctxt_recscreen
602 = button_context_recscreen_h300lcdremote;
562 break; 603 break;
563 604
564 case REMOTETYPE_H300_NONLCD: /* FIXME: add its tables */ 605 case REMOTETYPE_H300_NONLCD: /* FIXME: add its tables */
@@ -578,7 +619,9 @@ static void remap_remote(void)
578 remote_btn_ctxt_quickscreen 619 remote_btn_ctxt_quickscreen
579 = button_context_quickscreen_h300lcdremote, 620 = button_context_quickscreen_h300lcdremote,
580 remote_btn_ctxt_pitchscreen 621 remote_btn_ctxt_pitchscreen
581 = button_context_pitchscreen_h300lcdremote; 622 = button_context_pitchscreen_h300lcdremote,
623 remote_button_ctxt_recscreen
624 = button_context_recscreen_h300lcdremote;
582#if 0 625#if 0
583 remote_btn_ctxt_std = 626 remote_btn_ctxt_std =
584 remote_btn_ctxt_wps = 627 remote_btn_ctxt_wps =
@@ -592,6 +635,7 @@ static void remap_remote(void)
592 remote_btn_ctxt_bmark = 635 remote_btn_ctxt_bmark =
593 remote_btn_ctxt_quickscreen = 636 remote_btn_ctxt_quickscreen =
594 remote_btn_ctxt_pitchscreen = 637 remote_btn_ctxt_pitchscreen =
638 remote_button_ctxt_recscreen =
595#endif 639#endif
596 break; 640 break;
597 641
@@ -641,6 +685,8 @@ const struct button_mapping* get_context_mapping_remote(int context)
641 return remote_btn_ctxt_quickscreen; 685 return remote_btn_ctxt_quickscreen;
642 case CONTEXT_PITCHSCREEN: 686 case CONTEXT_PITCHSCREEN:
643 return remote_btn_ctxt_pitchscreen; 687 return remote_btn_ctxt_pitchscreen;
688 case CONTEXT_RECSCREEN:
689 return remote_button_ctxt_recscreen;
644 } 690 }
645 return remote_btn_ctxt_std; 691 return remote_btn_ctxt_std;
646} 692}
@@ -683,6 +729,8 @@ const struct button_mapping* get_context_mapping(int context)
683 return button_context_quickscreen; 729 return button_context_quickscreen;
684 case CONTEXT_PITCHSCREEN: 730 case CONTEXT_PITCHSCREEN:
685 return button_context_pitchscreen; 731 return button_context_pitchscreen;
732 case CONTEXT_RECSCREEN:
733 return button_context_recscreen;
686 } 734 }
687 return button_context_standard; 735 return button_context_standard;
688} 736}
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c
index 5476268065..57bdcc324a 100644
--- a/apps/keymaps/keymap-ondio.c
+++ b/apps/keymaps/keymap-ondio.c
@@ -127,6 +127,16 @@ const struct button_mapping button_context_pitchscreen[] = {
127 LAST_ITEM_IN_LIST 127 LAST_ITEM_IN_LIST
128}; /* button_context_quickscreen */ 128}; /* button_context_quickscreen */
129 129
130const struct button_mapping button_context_recscreen[] = {
131 { ACTION_REC_PAUSE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
132 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
133 { ACTION_SETTINGS_INC, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
134 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
135 { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
136
137 LAST_ITEM_IN_LIST
138}; /* button_context_recscreen */
139
130const struct button_mapping* get_context_mapping( int context ) 140const struct button_mapping* get_context_mapping( int context )
131{ 141{
132 switch( context ) 142 switch( context )
@@ -153,6 +163,8 @@ const struct button_mapping* get_context_mapping( int context )
153 /* else fall through to CUSTOM|1 */ 163 /* else fall through to CUSTOM|1 */
154 case CONTEXT_CUSTOM|1: 164 case CONTEXT_CUSTOM|1:
155 return button_context_tree; 165 return button_context_tree;
166 case CONTEXT_RECSCREEN:
167 return button_context_recscreen;
156 168
157 case CONTEXT_LIST: 169 case CONTEXT_LIST:
158 case CONTEXT_MAINMENU: 170 case CONTEXT_MAINMENU:
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index 8cb6790fe7..72e04071a9 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -143,6 +143,18 @@ static const struct button_mapping button_context_pitchscreen[] = {
143 LAST_ITEM_IN_LIST 143 LAST_ITEM_IN_LIST
144}; /* button_context_pitchcreen */ 144}; /* button_context_pitchcreen */
145 145
146const struct button_mapping button_context_recscreen[] = {
147 { ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE },
148 { ACTION_REC_F2, BUTTON_F2, BUTTON_NONE },
149 { ACTION_REC_F3, BUTTON_F3, BUTTON_NONE },
150 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
151 { ACTION_SETTINGS_INC, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
152 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
153 { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
154
155 LAST_ITEM_IN_LIST
156}; /* button_context_recscreen */
157
146/***************************************************************************** 158/*****************************************************************************
147 * Remote control mappings 159 * Remote control mappings
148 *****************************************************************************/ 160 *****************************************************************************/
@@ -212,6 +224,9 @@ const struct button_mapping* get_context_mapping( int context )
212 case CONTEXT_QUICKSCREEN: 224 case CONTEXT_QUICKSCREEN:
213 return button_context_quickscreen; 225 return button_context_quickscreen;
214 226
227 case CONTEXT_RECSCREEN:
228 return button_context_recscreen;
229
215 case CONTEXT_STD: 230 case CONTEXT_STD:
216 case CONTEXT_LIST: 231 case CONTEXT_LIST:
217 case CONTEXT_MAINMENU: 232 case CONTEXT_MAINMENU:
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index b04932f02f..3752b35f9c 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -202,6 +202,19 @@ const struct button_mapping remote_button_context_wps[] = {
202 LAST_ITEM_IN_LIST 202 LAST_ITEM_IN_LIST
203}; 203};
204 204
205const struct button_mapping button_context_recscreen[] = {
206 { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
207 { ACTION_STD_CANCEL, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
208 { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC },
209 { ACTION_STD_MENU, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC },
210 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
211 { ACTION_SETTINGS_INC, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
212 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
213 { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
214
215 LAST_ITEM_IN_LIST
216}; /* button_context_recscreen */
217
205 218
206static const struct button_mapping* get_context_mapping_remote( int context ) 219static const struct button_mapping* get_context_mapping_remote( int context )
207{ 220{
@@ -252,6 +265,8 @@ const struct button_mapping* get_context_mapping( int context )
252 return button_context_quickscreen; 265 return button_context_quickscreen;
253 case CONTEXT_PITCHSCREEN: 266 case CONTEXT_PITCHSCREEN:
254 return button_context_pitchscreen; 267 return button_context_pitchscreen;
268 case CONTEXT_RECSCREEN:
269 return button_context_recscreen;
255 case CONTEXT_LIST: 270 case CONTEXT_LIST:
256 case CONTEXT_MAINMENU: 271 case CONTEXT_MAINMENU:
257 default: 272 default:
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c
index 39444fe787..0370f4deea 100644
--- a/apps/recorder/peakmeter.c
+++ b/apps/recorder/peakmeter.c
@@ -37,6 +37,7 @@
37#ifdef CONFIG_BACKLIGHT 37#ifdef CONFIG_BACKLIGHT
38#include "backlight.h" 38#include "backlight.h"
39#endif 39#endif
40#include "action.h"
40 41
41#if CONFIG_CODEC == SWCODEC 42#if CONFIG_CODEC == SWCODEC
42#include "pcm_playback.h" 43#include "pcm_playback.h"
@@ -1222,7 +1223,7 @@ int peak_meter_draw_get_btn(int x, int y[], int height, int nb_screens)
1222 bool dopeek = true; 1223 bool dopeek = true;
1223 1224
1224 while (TIME_BEFORE(current_tick, next_big_refresh)) { 1225 while (TIME_BEFORE(current_tick, next_big_refresh)) {
1225 button = button_get(false); 1226 button = get_action(CONTEXT_RECSCREEN, TIMEOUT_NOBLOCK);
1226 if (button != BUTTON_NONE) { 1227 if (button != BUTTON_NONE) {
1227 break; 1228 break;
1228 } 1229 }
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 0d4f12742f..e6b06d56dc 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -65,75 +65,9 @@
65#include "ata.h" 65#include "ata.h"
66#include "splash.h" 66#include "splash.h"
67#include "screen_access.h" 67#include "screen_access.h"
68#include "action.h"
68#ifdef HAVE_RECORDING 69#ifdef HAVE_RECORDING
69 70
70
71#if CONFIG_KEYPAD == RECORDER_PAD
72#define REC_SHUTDOWN (BUTTON_OFF | BUTTON_REPEAT)
73#define REC_STOPEXIT BUTTON_OFF
74#define REC_RECPAUSE BUTTON_PLAY
75#define REC_INC BUTTON_RIGHT
76#define REC_DEC BUTTON_LEFT
77#define REC_NEXT BUTTON_DOWN
78#define REC_PREV BUTTON_UP
79#define REC_SETTINGS BUTTON_F1
80#define REC_F2 BUTTON_F2
81#define REC_F3 BUTTON_F3
82
83#elif CONFIG_KEYPAD == ONDIO_PAD /* only limited features */
84#define REC_SHUTDOWN (BUTTON_OFF | BUTTON_REPEAT)
85#define REC_STOPEXIT BUTTON_OFF
86#define REC_RECPAUSE_PRE BUTTON_MENU
87#define REC_RECPAUSE (BUTTON_MENU | BUTTON_REL)
88#define REC_INC BUTTON_RIGHT
89#define REC_DEC BUTTON_LEFT
90#define REC_NEXT BUTTON_DOWN
91#define REC_PREV BUTTON_UP
92#define REC_SETTINGS (BUTTON_MENU | BUTTON_REPEAT)
93
94#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
95#define REC_SHUTDOWN (BUTTON_OFF | BUTTON_REPEAT)
96#define REC_STOPEXIT BUTTON_OFF
97#define REC_RECPAUSE BUTTON_ON
98#define REC_NEWFILE BUTTON_REC
99#define REC_INC BUTTON_RIGHT
100#define REC_DEC BUTTON_LEFT
101#define REC_NEXT BUTTON_DOWN
102#define REC_PREV BUTTON_UP
103#define REC_SETTINGS BUTTON_MODE
104
105#define REC_RC_SHUTDOWN (BUTTON_RC_STOP | BUTTON_REPEAT)
106#define REC_RC_STOPEXIT BUTTON_RC_STOP
107#define REC_RC_RECPAUSE BUTTON_RC_ON
108#define REC_RC_NEWFILE BUTTON_RC_REC
109#define REC_RC_INC BUTTON_RC_BITRATE
110#define REC_RC_DEC BUTTON_RC_SOURCE
111#define REC_RC_NEXT BUTTON_RC_FF
112#define REC_RC_PREV BUTTON_RC_REW
113#define REC_RC_SETTINGS BUTTON_RC_MODE
114#define BUTTON_RC_DISPLAY BUTTON_RC_VOL_DOWN
115
116#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
117#define REC_SHUTDOWN (BUTTON_POWER | BUTTON_REPEAT)
118#define REC_STOPEXIT (BUTTON_PLAY | BUTTON_REPEAT)
119#define REC_RECPAUSE_PRE BUTTON_PLAY
120#define REC_RECPAUSE (BUTTON_PLAY | BUTTON_REL)
121#define REC_INC BUTTON_RIGHT
122#define REC_DEC BUTTON_LEFT
123#define REC_NEXT BUTTON_DOWN
124#define REC_PREV BUTTON_UP
125#define REC_NEWFILE_PRE BUTTON_REC
126#define REC_SETTINGS (BUTTON_REC | BUTTON_REPEAT)
127#define REC_NEWFILE (BUTTON_REC | BUTTON_REL)
128
129#elif CONFIG_KEYPAD == GMINI100_PAD
130#define REC_SHUTDOWN (BUTTON_OFF | BUTTON_REPEAT)
131#define REC_STOPEXIT BUTTON_OFF
132#define REC_RECPAUSE BUTTON_ON
133#define REC_INC BUTTON_RIGHT
134#define REC_DEC BUTTON_LEFT
135#endif
136
137#define PM_HEIGHT ((LCD_HEIGHT >= 72) ? 2 : 1) 71#define PM_HEIGHT ((LCD_HEIGHT >= 72) ? 2 : 1)
138 72
139bool f2_rec_screen(void); 73bool f2_rec_screen(void);
@@ -830,8 +764,7 @@ bool recording_screen(void)
830 764
831 switch(button) 765 switch(button)
832 { 766 {
833#ifdef BUTTON_RC_DISPLAY 767 case ACTION_REC_LCD:
834 case BUTTON_RC_DISPLAY:
835 if (remote_display_on) 768 if (remote_display_on)
836 { 769 {
837 remote_display_on = false; 770 remote_display_on = false;
@@ -849,15 +782,8 @@ bool recording_screen(void)
849 screen_update = NB_SCREENS; 782 screen_update = NB_SCREENS;
850 } 783 }
851 break; 784 break;
852#endif 785
853 case REC_STOPEXIT: 786 case ACTION_STD_CANCEL:
854 case REC_SHUTDOWN:
855#ifdef REC_RC_STOPEXIT
856 case REC_RC_STOPEXIT:
857#endif
858#ifdef REC_RC_SHUTDOWN
859 case REC_RC_SHUTDOWN:
860#endif
861 /* turn off the trigger */ 787 /* turn off the trigger */
862 peak_meter_trigger(false); 788 peak_meter_trigger(false);
863 peak_meter_set_trigger_listener(NULL); 789 peak_meter_set_trigger_listener(NULL);
@@ -877,27 +803,8 @@ bool recording_screen(void)
877 update_countdown = 1; /* Update immediately */ 803 update_countdown = 1; /* Update immediately */
878 break; 804 break;
879 805
880 case REC_RECPAUSE: 806 case ACTION_REC_PAUSE:
881#ifdef REC_RC_RECPAUSE 807 case ACTION_REC_NEWFILE:
882 case REC_RC_RECPAUSE:
883#endif
884#ifdef REC_RECPAUSE_PRE
885 if (lastbutton != REC_RECPAUSE_PRE)
886 break;
887#endif
888#ifdef REC_NEWFILE
889 case REC_NEWFILE:
890#endif
891#ifdef REC_RC_NEWFILE
892 case REC_RC_NEWFILE:
893#endif
894#ifdef REC_NEWFILE_PRE
895 if (button == REC_NEWFILE){
896 if (lastbutton != REC_NEWFILE_PRE)
897 break;
898 }
899#endif
900
901 /* Only act if the mpeg is stopped */ 808 /* Only act if the mpeg is stopped */
902 if(!(audio_stat & AUDIO_STATUS_RECORD)) 809 if(!(audio_stat & AUDIO_STATUS_RECORD))
903 { 810 {
@@ -928,19 +835,13 @@ bool recording_screen(void)
928 } 835 }
929 else 836 else
930 { 837 {
931#ifdef REC_NEWFILE
932 /*if new file button pressed, start new file */ 838 /*if new file button pressed, start new file */
933 if ((button == REC_NEWFILE) 839 if (button == ACTION_REC_NEWFILE)
934#ifdef REC_RC_NEWFILE
935 || (button == REC_RC_NEWFILE)
936#endif
937 )
938 { 840 {
939 audio_new_file(rec_create_filename(path_buffer)); 841 audio_new_file(rec_create_filename(path_buffer));
940 last_seconds = 0; 842 last_seconds = 0;
941 } 843 }
942 else 844 else
943#endif
944 /* if pause button pressed, pause or resume */ 845 /* if pause button pressed, pause or resume */
945 { 846 {
946 if(audio_stat & AUDIO_STATUS_PAUSE) 847 if(audio_stat & AUDIO_STATUS_PAUSE)
@@ -960,34 +861,19 @@ bool recording_screen(void)
960 update_countdown = 1; /* Update immediately */ 861 update_countdown = 1; /* Update immediately */
961 break; 862 break;
962 863
963#ifdef REC_PREV 864 case ACTION_STD_PREV:
964 case REC_PREV:
965#ifdef REC_RC_PREV
966 case REC_RC_PREV:
967#endif
968 cursor--; 865 cursor--;
969 adjust_cursor(); 866 adjust_cursor();
970 update_countdown = 1; /* Update immediately */ 867 update_countdown = 1; /* Update immediately */
971 break; 868 break;
972#endif
973 869
974#ifdef REC_NEXT 870 case ACTION_STD_NEXT:
975 case REC_NEXT:
976#ifdef REC_RC_NEXT
977 case REC_RC_NEXT:
978#endif
979 cursor++; 871 cursor++;
980 adjust_cursor(); 872 adjust_cursor();
981 update_countdown = 1; /* Update immediately */ 873 update_countdown = 1; /* Update immediately */
982 break; 874 break;
983#endif
984 875
985 case REC_INC: 876 case ACTION_SETTINGS_INC:
986 case REC_INC | BUTTON_REPEAT:
987#ifdef REC_RC_INC
988 case REC_RC_INC:
989 case REC_RC_INC | BUTTON_REPEAT:
990#endif
991 switch(cursor) 877 switch(cursor)
992 { 878 {
993 case 0: 879 case 0:
@@ -1055,12 +941,7 @@ bool recording_screen(void)
1055 update_countdown = 1; /* Update immediately */ 941 update_countdown = 1; /* Update immediately */
1056 break; 942 break;
1057 943
1058 case REC_DEC: 944 case ACTION_SETTINGS_DEC:
1059 case REC_DEC | BUTTON_REPEAT:
1060#ifdef REC_RC_DEC
1061 case REC_RC_DEC:
1062 case REC_RC_DEC | BUTTON_REPEAT:
1063#endif
1064 switch(cursor) 945 switch(cursor)
1065 { 946 {
1066 case 0: 947 case 0:
@@ -1128,11 +1009,7 @@ bool recording_screen(void)
1128 update_countdown = 1; /* Update immediately */ 1009 update_countdown = 1; /* Update immediately */
1129 break; 1010 break;
1130 1011
1131#ifdef REC_SETTINGS 1012 case ACTION_STD_MENU:
1132 case REC_SETTINGS:
1133#ifdef REC_RC_SETTINGS
1134 case REC_RC_SETTINGS:
1135#endif
1136 if(audio_stat != AUDIO_STATUS_RECORD) 1013 if(audio_stat != AUDIO_STATUS_RECORD)
1137 { 1014 {
1138#if CONFIG_LED == LED_REAL 1015#if CONFIG_LED == LED_REAL
@@ -1178,10 +1055,8 @@ bool recording_screen(void)
1178 } 1055 }
1179 } 1056 }
1180 break; 1057 break;
1181#endif 1058#if CONFIG_KEYPAD == RECORDER_PAD
1182 1059 case ACTION_REC_F2:
1183#ifdef REC_F2
1184 case REC_F2:
1185 if(audio_stat != AUDIO_STATUS_RECORD) 1060 if(audio_stat != AUDIO_STATUS_RECORD)
1186 { 1061 {
1187#if CONFIG_LED == LED_REAL 1062#if CONFIG_LED == LED_REAL
@@ -1197,10 +1072,8 @@ bool recording_screen(void)
1197 update_countdown = 1; /* Update immediately */ 1072 update_countdown = 1; /* Update immediately */
1198 } 1073 }
1199 break; 1074 break;
1200#endif
1201 1075
1202#ifdef REC_F3 1076 case ACTION_REC_F3:
1203 case REC_F3:
1204 if(audio_stat & AUDIO_STATUS_RECORD) 1077 if(audio_stat & AUDIO_STATUS_RECORD)
1205 { 1078 {
1206 audio_new_file(rec_create_filename(path_buffer)); 1079 audio_new_file(rec_create_filename(path_buffer));
@@ -1653,8 +1526,7 @@ bool recording_screen(void)
1653 1526
1654 while(1) 1527 while(1)
1655 { 1528 {
1656 button = button_get(true); 1529 if (action_userabort(TIMEOUT_NOBLOCK))
1657 if(button == (REC_STOPEXIT | BUTTON_REL))
1658 break; 1530 break;
1659 } 1531 }
1660 } 1532 }
@@ -1690,7 +1562,7 @@ bool recording_screen(void)
1690 return been_in_usb_mode; 1562 return been_in_usb_mode;
1691} 1563}
1692 1564
1693#ifdef REC_F2 1565#if CONFIG_KEYPAD == RECORDER_PAD
1694bool f2_rec_screen(void) 1566bool f2_rec_screen(void)
1695{ 1567{
1696 bool exit = false; 1568 bool exit = false;
@@ -1826,9 +1698,7 @@ bool f2_rec_screen(void)
1826 1698
1827 return false; 1699 return false;
1828} 1700}
1829#endif /* #ifdef REC_F2 */
1830 1701
1831#ifdef REC_F3
1832bool f3_rec_screen(void) 1702bool f3_rec_screen(void)
1833{ 1703{
1834 bool exit = false; 1704 bool exit = false;
@@ -1931,7 +1801,7 @@ bool f3_rec_screen(void)
1931 1801
1932 return false; 1802 return false;
1933} 1803}
1934#endif /* #ifdef REC_F3 */ 1804#endif /* #ifdef RECORDER_PAD */
1935 1805
1936#if CONFIG_CODEC == SWCODEC 1806#if CONFIG_CODEC == SWCODEC
1937void audio_beep(int duration) 1807void audio_beep(int duration)
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-27 23:18:23 +0000