summaryrefslogtreecommitdiff
path: root/apps/settings_list.c
diff options
context:
space:
mode:
authorMichael Hohmuth <sideral@rockbox.org>2011-05-13 22:28:47 +0000
committerMichael Hohmuth <sideral@rockbox.org>2011-05-13 22:28:47 +0000
commit5aec3c2400fdd47c7b2098f1a1c5506a6aa3156c (patch)
tree875e48e0cf80f749a79d138b8787d84568171f70 /apps/settings_list.c
parent0a070c54202d946b37946343ea2f083fee82871a (diff)
downloadrockbox-5aec3c2400fdd47c7b2098f1a1c5506a6aa3156c.tar.gz
rockbox-5aec3c2400fdd47c7b2098f1a1c5506a6aa3156c.zip
FS#11931 part 2: Allow a short rewind when playback is paused. Patch
by John Morris. This patch adds an option to rewind the current track by a few seconds when it is paused, irrespective of what has caused the pause. This is useful for audiobooks and podcasts to allow the listener to recall where the track was left off. The patch subsumes the existing rewind-on-headphone-unplug feature and extends it to all invocations of pause: play/pause button (or touch area), headphone removal, and power-supply unplug in car-adapter mode. It also subsumes FS#9448 (rewind on fade). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29876 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r--apps/settings_list.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 5b9a84036f..f282b8afc0 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1537,13 +1537,13 @@ const struct settings_list settings[] = {
1537 "pause on headphone unplug", "off,pause,pause and resume", 1537 "pause on headphone unplug", "off,pause,pause and resume",
1538 NULL, 3, ID2P(LANG_OFF), ID2P(LANG_PAUSE), 1538 NULL, 3, ID2P(LANG_OFF), ID2P(LANG_PAUSE),
1539 ID2P(LANG_HEADPHONE_UNPLUG_RESUME)), 1539 ID2P(LANG_HEADPHONE_UNPLUG_RESUME)),
1540 INT_SETTING(0, unplug_rw, LANG_HEADPHONE_UNPLUG_RW, 0,
1541 "rewind duration on pause", UNIT_SEC, 0, 15, 1, NULL, NULL,
1542 NULL),
1543 OFFON_SETTING(0, unplug_autoresume, 1540 OFFON_SETTING(0, unplug_autoresume,
1544 LANG_HEADPHONE_UNPLUG_DISABLE_AUTORESUME, false, 1541 LANG_HEADPHONE_UNPLUG_DISABLE_AUTORESUME, false,
1545 "disable autoresume if phones not present",NULL), 1542 "disable autoresume if phones not present",NULL),
1546#endif 1543#endif
1544 INT_SETTING(0, pause_rewind, LANG_PAUSE_REWIND, 0,
1545 "rewind duration on pause", UNIT_SEC, 0, 15, 1, NULL, NULL,
1546 NULL),
1547#if CONFIG_TUNER 1547#if CONFIG_TUNER
1548 CHOICE_SETTING(0, fm_region, LANG_FM_REGION, 0, 1548 CHOICE_SETTING(0, fm_region, LANG_FM_REGION, 0,
1549 "fm_region", "eu,us,jp,kr,it,wo", set_radio_region, 6, 1549 "fm_region", "eu,us,jp,kr,it,wo", set_radio_region, 6,