diff options
author | Martin Scarratt <mmmm@rockbox.org> | 2006-07-21 19:58:35 +0000 |
---|---|---|
committer | Martin Scarratt <mmmm@rockbox.org> | 2006-07-21 19:58:35 +0000 |
commit | aaee4fb4a0827fa0afd4b5f18d85c66b3822f36c (patch) | |
tree | 694ac21e2c98cf4d0db3dd507d6c244d951a2a06 /apps/recorder | |
parent | c52ae7abe7bdcf398d4adf79b5f5bd0760fda73a (diff) | |
download | rockbox-aaee4fb4a0827fa0afd4b5f18d85c66b3822f36c.tar.gz rockbox-aaee4fb4a0827fa0afd4b5f18d85c66b3822f36c.zip |
on-the-fly track split support for recording with IAudioX5. Also changed button mapping: short record-start new file, long record-settings, short play-pause/resume, long play-stop. Thanks to JhMikeS for testing
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10276 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder')
-rw-r--r-- | apps/recorder/recording.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 1141f2369a..436212a1be 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -114,13 +114,16 @@ | |||
114 | 114 | ||
115 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 115 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) |
116 | #define REC_SHUTDOWN (BUTTON_POWER | BUTTON_REPEAT) | 116 | #define REC_SHUTDOWN (BUTTON_POWER | BUTTON_REPEAT) |
117 | #define REC_STOPEXIT BUTTON_POWER | 117 | #define REC_STOPEXIT (BUTTON_PLAY | BUTTON_REPEAT) |
118 | #define REC_RECPAUSE BUTTON_REC | 118 | #define REC_RECPAUSE_PRE BUTTON_PLAY |
119 | #define REC_RECPAUSE (BUTTON_PLAY | BUTTON_REL) | ||
119 | #define REC_INC BUTTON_RIGHT | 120 | #define REC_INC BUTTON_RIGHT |
120 | #define REC_DEC BUTTON_LEFT | 121 | #define REC_DEC BUTTON_LEFT |
121 | #define REC_NEXT BUTTON_DOWN | 122 | #define REC_NEXT BUTTON_DOWN |
122 | #define REC_PREV BUTTON_UP | 123 | #define REC_PREV BUTTON_UP |
123 | #define REC_SETTINGS BUTTON_PLAY | 124 | #define REC_NEWFILE_PRE BUTTON_REC |
125 | #define REC_SETTINGS (BUTTON_REC | BUTTON_REPEAT) | ||
126 | #define REC_NEWFILE (BUTTON_REC | BUTTON_REL) | ||
124 | 127 | ||
125 | #elif CONFIG_KEYPAD == GMINI100_PAD | 128 | #elif CONFIG_KEYPAD == GMINI100_PAD |
126 | #define REC_SHUTDOWN (BUTTON_OFF | BUTTON_REPEAT) | 129 | #define REC_SHUTDOWN (BUTTON_OFF | BUTTON_REPEAT) |
@@ -520,16 +523,23 @@ bool recording_screen(void) | |||
520 | #ifdef REC_RC_RECPAUSE | 523 | #ifdef REC_RC_RECPAUSE |
521 | case REC_RC_RECPAUSE: | 524 | case REC_RC_RECPAUSE: |
522 | #endif | 525 | #endif |
526 | #ifdef REC_RECPAUSE_PRE | ||
527 | if (lastbutton != REC_RECPAUSE_PRE) | ||
528 | break; | ||
529 | #endif | ||
523 | #ifdef REC_NEWFILE | 530 | #ifdef REC_NEWFILE |
524 | case REC_NEWFILE: | 531 | case REC_NEWFILE: |
525 | #endif | 532 | #endif |
526 | #ifdef REC_RC_NEWFILE | 533 | #ifdef REC_RC_NEWFILE |
527 | case REC_RC_NEWFILE: | 534 | case REC_RC_NEWFILE: |
528 | #endif | 535 | #endif |
529 | #ifdef REC_RECPAUSE_PRE | 536 | #ifdef REC_NEWFILE_PRE |
530 | if (lastbutton != REC_RECPAUSE_PRE) | 537 | if (button == REC_NEWFILE){ |
531 | break; | 538 | if (lastbutton != REC_NEWFILE_PRE) |
539 | break; | ||
540 | } | ||
532 | #endif | 541 | #endif |
542 | |||
533 | /* Only act if the mpeg is stopped */ | 543 | /* Only act if the mpeg is stopped */ |
534 | if(!(audio_stat & AUDIO_STATUS_RECORD)) | 544 | if(!(audio_stat & AUDIO_STATUS_RECORD)) |
535 | { | 545 | { |