diff options
author | Peter D'Hoye <peter.dhoye@gmail.com> | 2009-10-09 19:16:32 +0000 |
---|---|---|
committer | Peter D'Hoye <peter.dhoye@gmail.com> | 2009-10-09 19:16:32 +0000 |
commit | dcdc2b93ae910c30a8e1abe3fc78a739a0d4bf10 (patch) | |
tree | 136bf02ebebfa95bce9636872a58cc6f16574714 | |
parent | e74daf29734cfa51516c736fd5ae127b88766802 (diff) | |
download | rockbox-dcdc2b93ae910c30a8e1abe3fc78a739a0d4bf10.tar.gz 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
-rw-r--r-- | apps/recorder/recording.c | 17 | ||||
-rw-r--r-- | manual/main_menu/recording_screen.tex | 10 |
2 files changed, 12 insertions, 15 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) | |||
1518 | break; | 1518 | break; |
1519 | #endif | 1519 | #endif |
1520 | case ACTION_REC_NEWFILE: | 1520 | case ACTION_REC_NEWFILE: |
1521 | 1521 | /* start recording or start a new file */ | |
1522 | /* Only act if in the middle of recording. */ | ||
1523 | if(audio_stat & AUDIO_STATUS_RECORD) | 1522 | if(audio_stat & AUDIO_STATUS_RECORD) |
1524 | { | 1523 | { |
1525 | rec_command(RECORDING_CMD_START_NEWFILE); | 1524 | rec_command(RECORDING_CMD_START_NEWFILE); |
1526 | last_seconds = 0; | 1525 | last_seconds = 0; |
1527 | } | 1526 | } |
1528 | break; | 1527 | else |
1529 | |||
1530 | case ACTION_REC_PAUSE: | ||
1531 | |||
1532 | /* Only act if the mpeg is stopped */ | ||
1533 | if(!(audio_stat & AUDIO_STATUS_RECORD)) | ||
1534 | { | 1528 | { |
1535 | /* is this manual or triggered recording? */ | 1529 | /* is this manual or triggered recording? */ |
1536 | if ((global_settings.rec_trigger_mode == TRIG_MODE_OFF) || | 1530 | if ((global_settings.rec_trigger_mode == TRIG_MODE_OFF) || |
@@ -1556,8 +1550,11 @@ bool recording_screen(bool no_source) | |||
1556 | peak_meter_set_trigger_listener(&trigger_listener); | 1550 | peak_meter_set_trigger_listener(&trigger_listener); |
1557 | } | 1551 | } |
1558 | } | 1552 | } |
1559 | /* If we're in the middle of recording */ | 1553 | update_countdown = 0; /* Update immediately */ |
1560 | else | 1554 | break; |
1555 | case ACTION_REC_PAUSE: | ||
1556 | /* Only act if a recording is ongoing (paused or not) */ | ||
1557 | if(audio_stat & AUDIO_STATUS_RECORD) | ||
1561 | { | 1558 | { |
1562 | /* if pause button pressed, pause or resume */ | 1559 | /* if pause button pressed, pause or resume */ |
1563 | if(audio_stat & AUDIO_STATUS_PAUSE) | 1560 | if(audio_stat & AUDIO_STATUS_PAUSE) |
diff --git a/manual/main_menu/recording_screen.tex b/manual/main_menu/recording_screen.tex index 30f86afd39..5cc6d4cd43 100644 --- a/manual/main_menu/recording_screen.tex +++ b/manual/main_menu/recording_screen.tex | |||
@@ -40,9 +40,7 @@ The controls for this screen are: | |||
40 | % | 40 | % |
41 | \ActionRecPause | 41 | \ActionRecPause |
42 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecPause} | 42 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecPause} |
43 | & Start recording.\\ | 43 | & While recording: pause recording (press again to |
44 | & \opt{HAVEREMOTEKEYMAP}{&} | ||
45 | While recording: pause recording (press again to | ||
46 | continue).\\ | 44 | continue).\\ |
47 | % | 45 | % |
48 | \ActionRecExit | 46 | \ActionRecExit |
@@ -55,8 +53,10 @@ The controls for this screen are: | |||
55 | SANSA_E200_PAD,IPOD_4G_PAD,SANSA_C200_PAD}{ | 53 | SANSA_E200_PAD,IPOD_4G_PAD,SANSA_C200_PAD}{ |
56 | \ActionRecNewfile | 54 | \ActionRecNewfile |
57 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecNewfile} | 55 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecNewfile} |
58 | & While recording: close the current file and open | 56 | & Start Recording.\\ |
59 | a new one.\\ | 57 | & \opt{HAVEREMOTEKEYMAP}{&} |
58 | While recording: close the current file and open | ||
59 | a new one.\\ | ||
60 | } | 60 | } |
61 | % | 61 | % |
62 | \ActionRecMenu | 62 | \ActionRecMenu |