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 | |
| parent | c52ae7abe7bdcf398d4adf79b5f5bd0760fda73a (diff) | |
| download | rockbox-aaee4fb4a0827fa0afd4b5f18d85c66b3822f36c.zip rockbox-aaee4fb4a0827fa0afd4b5f18d85c66b3822f36c.tar.gz rockbox-aaee4fb4a0827fa0afd4b5f18d85c66b3822f36c.tar.bz2 rockbox-aaee4fb4a0827fa0afd4b5f18d85c66b3822f36c.tar.xz | |
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')
| -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 1141f23..436212a 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -114,13 +114,16 @@ #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) #define REC_SHUTDOWN (BUTTON_POWER | BUTTON_REPEAT) -#define REC_STOPEXIT BUTTON_POWER -#define REC_RECPAUSE BUTTON_REC +#define REC_STOPEXIT (BUTTON_PLAY | BUTTON_REPEAT) +#define REC_RECPAUSE_PRE BUTTON_PLAY +#define REC_RECPAUSE (BUTTON_PLAY | BUTTON_REL) #define REC_INC BUTTON_RIGHT #define REC_DEC BUTTON_LEFT #define REC_NEXT BUTTON_DOWN #define REC_PREV BUTTON_UP -#define REC_SETTINGS BUTTON_PLAY +#define REC_NEWFILE_PRE BUTTON_REC +#define REC_SETTINGS (BUTTON_REC | BUTTON_REPEAT) +#define REC_NEWFILE (BUTTON_REC | BUTTON_REL) #elif CONFIG_KEYPAD == GMINI100_PAD #define REC_SHUTDOWN (BUTTON_OFF | BUTTON_REPEAT) @@ -520,16 +523,23 @@ bool recording_screen(void) #ifdef REC_RC_RECPAUSE case REC_RC_RECPAUSE: #endif +#ifdef REC_RECPAUSE_PRE + if (lastbutton != REC_RECPAUSE_PRE) + break; +#endif #ifdef REC_NEWFILE case REC_NEWFILE: #endif #ifdef REC_RC_NEWFILE case REC_RC_NEWFILE: #endif -#ifdef REC_RECPAUSE_PRE - if (lastbutton != REC_RECPAUSE_PRE) - break; +#ifdef REC_NEWFILE_PRE + if (button == REC_NEWFILE){ + if (lastbutton != REC_NEWFILE_PRE) + break; + } #endif + /* Only act if the mpeg is stopped */ if(!(audio_stat & AUDIO_STATUS_RECORD)) { |