summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Levin <al.le@rockbox.org>2011-12-27 22:10:21 +0000
committerAlexander Levin <al.le@rockbox.org>2011-12-27 22:10:21 +0000
commitfd150d05b475546089848e53e32a5bfdcebff4ca (patch)
tree424ae1f0c519a2db3683ed4ba0fc9cdacb26cbcd
parentf77353c71aac3c24c3bf72a03310db009737e661 (diff)
downloadrockbox-fd150d05b475546089848e53e32a5bfdcebff4ca.tar.gz
rockbox-fd150d05b475546089848e53e32a5bfdcebff4ca.zip
Eliminate the duplicated formatter for the 'sleeptimer duration' setting. It's not needed in the setting declaration since the menu for setting it is called via customized code which already has a formetter.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31451 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/settings_list.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 614ac50712..c9003bb8f3 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -572,13 +572,6 @@ static void tsc_set_default(void* setting, void* defaultval)
572 memcpy(setting, defaultval, sizeof(struct touchscreen_parameter)); 572 memcpy(setting, defaultval, sizeof(struct touchscreen_parameter));
573} 573}
574#endif 574#endif
575static const char* sleeptimer_formatter(char* buffer, size_t buffer_size,
576 int value, const char* unit)
577{
578 (void) unit;
579 snprintf(buffer, buffer_size, "%d:%02d", value / 60, value % 60);
580 return buffer;
581}
582#ifdef HAVE_HOTKEY 575#ifdef HAVE_HOTKEY
583static const char* hotkey_formatter(char* buffer, size_t buffer_size, int value, 576static const char* hotkey_formatter(char* buffer, size_t buffer_size, int value,
584 const char* unit) 577 const char* unit)
@@ -1805,7 +1798,7 @@ const struct settings_list settings[] = {
1805 PLAYLIST_CATALOG_DEFAULT_DIR, NULL, NULL), 1798 PLAYLIST_CATALOG_DEFAULT_DIR, NULL, NULL),
1806 INT_SETTING(0, sleeptimer_duration, LANG_SLEEP_TIMER_DURATION, 30, 1799 INT_SETTING(0, sleeptimer_duration, LANG_SLEEP_TIMER_DURATION, 30,
1807 "sleeptimer duration", 1800 "sleeptimer duration",
1808 UNIT_MIN, 5, 300, 5, sleeptimer_formatter, NULL, NULL), 1801 UNIT_MIN, 5, 300, 5, NULL, NULL, NULL),
1809 OFFON_SETTING(0, sleeptimer_on_startup, LANG_SLEEP_TIMER_ON_POWER_UP, false, 1802 OFFON_SETTING(0, sleeptimer_on_startup, LANG_SLEEP_TIMER_ON_POWER_UP, false,
1810 "sleeptimer on startup", NULL), 1803 "sleeptimer on startup", NULL),
1811 OFFON_SETTING(0, keypress_restarts_sleeptimer, LANG_KEYPRESS_RESTARTS_SLEEP_TIMER, false, 1804 OFFON_SETTING(0, keypress_restarts_sleeptimer, LANG_KEYPRESS_RESTARTS_SLEEP_TIMER, false,