devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

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.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23414 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Peter D'Hoye 2009-10-29 23:07:26 +00:00
parent d0bc525df1
commit d93d2fd40c
2 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

43
apps/recorder/recording.c
View file

@ -1510,14 +1510,10 @@ bool recording_screen(bool no_source)
update_countdown = 0; /* Update immediately */ update_countdown = 0; /* Update immediately */
break; break;
#endif #endif
case ACTION_REC_PAUSE:
case ACTION_REC_NEWFILE: case ACTION_REC_NEWFILE:
/* start recording or start a new file */ /* Only act if the mpeg is stopped */
if(audio_stat & AUDIO_STATUS_RECORD) if(!(audio_stat & AUDIO_STATUS_RECORD))
{
rec_command(RECORDING_CMD_START_NEWFILE);
last_seconds = 0;
}
else
{ {
/* is this manual or triggered recording? */ /* is this manual or triggered recording? */
if ((global_settings.rec_trigger_mode == TRIG_MODE_OFF) || 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); peak_meter_set_trigger_listener(&trigger_listener);
} }
} }
update_countdown = 0; /* Update immediately */ else
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 new file button pressed, start new file */
if(audio_stat & AUDIO_STATUS_PAUSE) if (button == ACTION_REC_NEWFILE)
{ {
rec_command(RECORDING_CMD_RESUME); rec_command(RECORDING_CMD_START_NEWFILE);
if (global_settings.talk_menu) last_seconds = 0;
{
/* no voice possible here, but a beep */
audio_beep(HZ/4); /* short beep on resume */
}
} }
else 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 */ update_countdown = 0; /* Update immediately */

3
manual/main_menu/recording_screen.tex
View file

@ -40,7 +40,8 @@ The controls for this screen are:
% %
\ActionRecPause \ActionRecPause
\opt{HAVEREMOTEKEYMAP}{& \ActionRCRecPause} \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecPause}
& While recording: pause recording (press again to & Start Recording.\\
& While recording: pause recording (press again to
continue).\\ continue).\\
% %
\ActionRecExit \ActionRecExit