summaryrefslogtreecommitdiff
path: root/apps/recorder/recording.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/recorder/recording.c')
-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)
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)