summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorPeter D'Hoye <peter.dhoye@gmail.com>2009-10-09 19:16:32 +0000
committerPeter D'Hoye <peter.dhoye@gmail.com>2009-10-09 19:16:32 +0000
commitdcdc2b93ae910c30a8e1abe3fc78a739a0d4bf10 (patch)
tree136bf02ebebfa95bce9636872a58cc6f16574714 /apps
parente74daf29734cfa51516c736fd5ae127b88766802 (diff)
downloadrockbox-dcdc2b93ae910c30a8e1abe3fc78a739a0d4bf10.tar.gz
rockbox-dcdc2b93ae910c30a8e1abe3fc78a739a0d4bf10.tar.bz2
rockbox-dcdc2b93ae910c30a8e1abe3fc78a739a0d4bf10.zip
Correct a recording screen usability issue created in r21034. Pause used to start too, then was set to only start and now only pauses. Rec used to start and split, then only split and now again starts and splits.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23055 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/recorder/recording.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index d461df555d..b86c884c7a 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -1518,19 +1518,13 @@ bool recording_screen(bool no_source)
break;
#endif
case ACTION_REC_NEWFILE:
-
- /* Only act if in the middle of recording. */
+ /* start recording or start a new file */
if(audio_stat & AUDIO_STATUS_RECORD)
{
rec_command(RECORDING_CMD_START_NEWFILE);
last_seconds = 0;
}
- break;
-
- case ACTION_REC_PAUSE:
-
- /* Only act if the mpeg is stopped */
- if(!(audio_stat & AUDIO_STATUS_RECORD))
+ else
{
/* is this manual or triggered recording? */
if ((global_settings.rec_trigger_mode == TRIG_MODE_OFF) ||
@@ -1556,8 +1550,11 @@ bool recording_screen(bool no_source)
peak_meter_set_trigger_listener(&trigger_listener);
}
}
- /* If we're in the middle of recording */
- else
+ 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)
{
/* if pause button pressed, pause or resume */
if(audio_stat & AUDIO_STATUS_PAUSE)