FS#10230 - Remove 'start new file if not recording' functionality from ACTION_REC_NEWFILE
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21034 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
8872b60fb9
commit
814b3dbfbc
1 changed files with 21 additions and 19 deletions
|
@ -1518,8 +1518,18 @@ bool recording_screen(bool no_source)
|
|||
update_countdown = 0; /* Update immediately */
|
||||
break;
|
||||
#endif
|
||||
case ACTION_REC_PAUSE:
|
||||
case ACTION_REC_NEWFILE:
|
||||
|
||||
/* Only act if in the middle of recording. */
|
||||
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))
|
||||
{
|
||||
|
@ -1547,17 +1557,10 @@ bool recording_screen(bool no_source)
|
|||
peak_meter_set_trigger_listener(&trigger_listener);
|
||||
}
|
||||
}
|
||||
/* If we're in the middle of recording */
|
||||
else
|
||||
{
|
||||
/*if new file button pressed, start new file */
|
||||
if (button == ACTION_REC_NEWFILE)
|
||||
{
|
||||
rec_command(RECORDING_CMD_START_NEWFILE);
|
||||
last_seconds = 0;
|
||||
}
|
||||
else
|
||||
/* if pause button pressed, pause or resume */
|
||||
{
|
||||
if(audio_stat & AUDIO_STATUS_PAUSE)
|
||||
{
|
||||
rec_command(RECORDING_CMD_RESUME);
|
||||
|
@ -1572,7 +1575,6 @@ bool recording_screen(bool no_source)
|
|||
rec_command(RECORDING_CMD_PAUSE);
|
||||
}
|
||||
}
|
||||
}
|
||||
update_countdown = 0; /* Update immediately */
|
||||
break;
|
||||
case ACTION_STD_MENU:
|
||||
|
|
Loading…
Reference in a new issue