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) 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: % \ActionRecPause \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecPause} - & Start recording.\\ - & \opt{HAVEREMOTEKEYMAP}{&} - While recording: pause recording (press again to + & While recording: pause recording (press again to continue).\\ % \ActionRecExit @@ -55,8 +53,10 @@ The controls for this screen are: SANSA_E200_PAD,IPOD_4G_PAD,SANSA_C200_PAD}{ \ActionRecNewfile \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecNewfile} - & While recording: close the current file and open - a new one.\\ + & Start Recording.\\ + & \opt{HAVEREMOTEKEYMAP}{&} + While recording: close the current file and open + a new one.\\ } % \ActionRecMenu