diff options
author | Marc Guay <marcguay@rockbox.org> | 2009-05-22 13:51:56 +0000 |
---|---|---|
committer | Marc Guay <marcguay@rockbox.org> | 2009-05-22 13:51:56 +0000 |
commit | 814b3dbfbc095fcedab3737c45f93283f84cb1ea (patch) | |
tree | 7711ee08d6c99126d2ecc13c573cb291e2146442 /apps | |
parent | 8872b60fb92da185ad3e387730fa1b57c6fbe11a (diff) | |
download | rockbox-814b3dbfbc095fcedab3737c45f93283f84cb1ea.tar.gz rockbox-814b3dbfbc095fcedab3737c45f93283f84cb1ea.zip |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/recorder/recording.c | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 5b5dc55b40..f627399738 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -1518,8 +1518,18 @@ bool recording_screen(bool no_source) | |||
1518 | update_countdown = 0; /* Update immediately */ | 1518 | update_countdown = 0; /* Update immediately */ |
1519 | break; | 1519 | break; |
1520 | #endif | 1520 | #endif |
1521 | case ACTION_REC_PAUSE: | ||
1522 | case ACTION_REC_NEWFILE: | 1521 | case ACTION_REC_NEWFILE: |
1522 | |||
1523 | /* Only act if in the middle of recording. */ | ||
1524 | if(audio_stat & AUDIO_STATUS_RECORD) | ||
1525 | { | ||
1526 | rec_command(RECORDING_CMD_START_NEWFILE); | ||
1527 | last_seconds = 0; | ||
1528 | } | ||
1529 | break; | ||
1530 | |||
1531 | case ACTION_REC_PAUSE: | ||
1532 | |||
1523 | /* Only act if the mpeg is stopped */ | 1533 | /* Only act if the mpeg is stopped */ |
1524 | if(!(audio_stat & AUDIO_STATUS_RECORD)) | 1534 | if(!(audio_stat & AUDIO_STATUS_RECORD)) |
1525 | { | 1535 | { |
@@ -1547,30 +1557,22 @@ bool recording_screen(bool no_source) | |||
1547 | peak_meter_set_trigger_listener(&trigger_listener); | 1557 | peak_meter_set_trigger_listener(&trigger_listener); |
1548 | } | 1558 | } |
1549 | } | 1559 | } |
1560 | /* If we're in the middle of recording */ | ||
1550 | else | 1561 | else |
1551 | { | 1562 | { |
1552 | /*if new file button pressed, start new file */ | 1563 | /* if pause button pressed, pause or resume */ |
1553 | if (button == ACTION_REC_NEWFILE) | 1564 | if(audio_stat & AUDIO_STATUS_PAUSE) |
1554 | { | 1565 | { |
1555 | rec_command(RECORDING_CMD_START_NEWFILE); | 1566 | rec_command(RECORDING_CMD_RESUME); |
1556 | last_seconds = 0; | 1567 | if (global_settings.talk_menu) |
1568 | { | ||
1569 | /* no voice possible here, but a beep */ | ||
1570 | audio_beep(HZ/4); /* short beep on resume */ | ||
1571 | } | ||
1557 | } | 1572 | } |
1558 | else | 1573 | else |
1559 | /* if pause button pressed, pause or resume */ | ||
1560 | { | 1574 | { |
1561 | if(audio_stat & AUDIO_STATUS_PAUSE) | 1575 | rec_command(RECORDING_CMD_PAUSE); |
1562 | { | ||
1563 | rec_command(RECORDING_CMD_RESUME); | ||
1564 | if (global_settings.talk_menu) | ||
1565 | { | ||
1566 | /* no voice possible here, but a beep */ | ||
1567 | audio_beep(HZ/4); /* short beep on resume */ | ||
1568 | } | ||
1569 | } | ||
1570 | else | ||
1571 | { | ||
1572 | rec_command(RECORDING_CMD_PAUSE); | ||
1573 | } | ||
1574 | } | 1576 | } |
1575 | } | 1577 | } |
1576 | update_countdown = 0; /* Update immediately */ | 1578 | update_countdown = 0; /* Update immediately */ |