diff options
| author | Peter D'Hoye <peter.dhoye@gmail.com> | 2009-10-29 23:07:26 +0000 |
|---|---|---|
| committer | Peter D'Hoye <peter.dhoye@gmail.com> | 2009-10-29 23:07:26 +0000 |
| commit | d93d2fd40c7b8c32712c08d0632d027164b2c795 (patch) | |
| tree | 59e6710da8661751e28bff30af7c109de634d69d /apps | |
| parent | d0bc525df189da49203e9d0f4b96ab7f7dc281a4 (diff) | |
Revert the recording key functionality changes back to before r21034: Both play and rec start recording. Fixes the Archos recording usability issue. To Do: see which targets have usability issues left.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23414 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/recorder/recording.c | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 37244a65c6..7e24ab9a30 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -1510,14 +1510,10 @@ bool recording_screen(bool no_source) update_countdown = 0; /* Update immediately */ break; #endif + case ACTION_REC_PAUSE: case ACTION_REC_NEWFILE: - /* start recording or start a new file */ - if(audio_stat & AUDIO_STATUS_RECORD) - { - rec_command(RECORDING_CMD_START_NEWFILE); - last_seconds = 0; - } - else + /* Only act if the mpeg is stopped */ + if(!(audio_stat & AUDIO_STATUS_RECORD)) { /* is this manual or triggered recording? */ if ((global_settings.rec_trigger_mode == TRIG_MODE_OFF) || @@ -1543,25 +1539,30 @@ bool recording_screen(bool no_source) peak_meter_set_trigger_listener(&trigger_listener); } } - update_countdown = 0; /* Update immediately */ - break; - case ACTION_REC_PAUSE: - /* Only act if a recording is ongoing (paused or not) */ - if(audio_stat & AUDIO_STATUS_RECORD) + else { - /* if pause button pressed, pause or resume */ - if(audio_stat & AUDIO_STATUS_PAUSE) + /*if new file button pressed, start new file */ + if (button == ACTION_REC_NEWFILE) { - rec_command(RECORDING_CMD_RESUME); - if (global_settings.talk_menu) - { - /* no voice possible here, but a beep */ - audio_beep(HZ/4); /* short beep on resume */ - } + rec_command(RECORDING_CMD_START_NEWFILE); + last_seconds = 0; } else + /* if pause button pressed, pause or resume */ { - rec_command(RECORDING_CMD_PAUSE); + if(audio_stat & AUDIO_STATUS_PAUSE) + { + rec_command(RECORDING_CMD_RESUME); + if (global_settings.talk_menu) + { + /* no voice possible here, but a beep */ + audio_beep(HZ/4); /* short beep on resume */ + } + } + else + { + rec_command(RECORDING_CMD_PAUSE); + } } } update_countdown = 0; /* Update immediately */ |