diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 8 | ||||
-rw-r--r-- | apps/settings.c | 3 | ||||
-rw-r--r-- | apps/settings.h | 1 | ||||
-rw-r--r-- | apps/settings_list.c | 3 | ||||
-rw-r--r-- | apps/settings_menu.c | 11 |
5 files changed, 4 insertions, 22 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index a4f937c986..9e85f848af 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -3850,16 +3850,16 @@ | |||
3850 | </phrase> | 3850 | </phrase> |
3851 | <phrase> | 3851 | <phrase> |
3852 | id: LANG_POWEROFF | 3852 | id: LANG_POWEROFF |
3853 | desc: disk poweroff flag | 3853 | desc: DEPRECATED |
3854 | user: | 3854 | user: |
3855 | <source> | 3855 | <source> |
3856 | *: "Disk Poweroff" | 3856 | *: "" |
3857 | </source> | 3857 | </source> |
3858 | <dest> | 3858 | <dest> |
3859 | *: "Disk Poweroff" | 3859 | *: deprecated |
3860 | </dest> | 3860 | </dest> |
3861 | <voice> | 3861 | <voice> |
3862 | *: "Disk Poweroff" | 3862 | *: "" |
3863 | </voice> | 3863 | </voice> |
3864 | </phrase> | 3864 | </phrase> |
3865 | <phrase> | 3865 | <phrase> |
diff --git a/apps/settings.c b/apps/settings.c index 01ede41b3e..c7794e1015 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -489,9 +489,6 @@ void settings_apply(void) | |||
489 | dac_line_in(global_settings.line_in); | 489 | dac_line_in(global_settings.line_in); |
490 | #endif | 490 | #endif |
491 | mpeg_id3_options(global_settings.id3_v1_first); | 491 | mpeg_id3_options(global_settings.id3_v1_first); |
492 | #ifdef HAVE_ATA_POWER_OFF | ||
493 | ata_poweroff(global_settings.disk_poweroff); | ||
494 | #endif | ||
495 | 492 | ||
496 | set_poweroff_timeout(global_settings.poweroff); | 493 | set_poweroff_timeout(global_settings.poweroff); |
497 | 494 | ||
diff --git a/apps/settings.h b/apps/settings.h index eee24f187b..3ff3fe6244 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -281,7 +281,6 @@ struct user_settings | |||
281 | int ff_rewind_min_step; /* FF/Rewind minimum step size */ | 281 | int ff_rewind_min_step; /* FF/Rewind minimum step size */ |
282 | int ff_rewind_accel; /* FF/Rewind acceleration (in seconds per doubling) */ | 282 | int ff_rewind_accel; /* FF/Rewind acceleration (in seconds per doubling) */ |
283 | int disk_spindown; /* time until disk spindown, in seconds (0=off) */ | 283 | int disk_spindown; /* time until disk spindown, in seconds (0=off) */ |
284 | bool disk_poweroff; /* whether to cut disk power after spindown or not */ | ||
285 | int buffer_margin; /* MP3 buffer watermark margin, in seconds */ | 284 | int buffer_margin; /* MP3 buffer watermark margin, in seconds */ |
286 | 285 | ||
287 | int peak_meter_release; /* units per read out */ | 286 | int peak_meter_release; /* units per read out */ |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 313524ba81..bffee257d1 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -268,9 +268,6 @@ const struct settings_list settings[] = { | |||
268 | #endif | 268 | #endif |
269 | /* disk */ | 269 | /* disk */ |
270 | #ifndef HAVE_MMC | 270 | #ifndef HAVE_MMC |
271 | #ifdef HAVE_ATA_POWER_OFF | ||
272 | OFFON_SETTING(0,disk_poweroff,false,"disk poweroff",NULL), | ||
273 | #endif | ||
274 | {F_T_INT,GS(disk_spindown),INT(5),"disk spindown",NULL,UNUSED}, | 271 | {F_T_INT,GS(disk_spindown),INT(5),"disk spindown",NULL,UNUSED}, |
275 | #endif /* HAVE_MMC */ | 272 | #endif /* HAVE_MMC */ |
276 | /* browser */ | 273 | /* browser */ |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 04fd64b1ca..1a19bb18c8 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -1104,14 +1104,6 @@ static bool spindown(void) | |||
1104 | ata_spindown, 1, 3, 254, NULL ); | 1104 | ata_spindown, 1, 3, 254, NULL ); |
1105 | } | 1105 | } |
1106 | 1106 | ||
1107 | #ifdef HAVE_ATA_POWER_OFF | ||
1108 | static bool poweroff(void) | ||
1109 | { | ||
1110 | bool rc = set_bool(str(LANG_POWEROFF), &global_settings.disk_poweroff); | ||
1111 | ata_poweroff(global_settings.disk_poweroff); | ||
1112 | return rc; | ||
1113 | } | ||
1114 | #endif /* HAVE_ATA_POWEROFF */ | ||
1115 | #endif /* !HAVE_MMC */ | 1107 | #endif /* !HAVE_MMC */ |
1116 | 1108 | ||
1117 | #if CONFIG_CODEC == MAS3507D | 1109 | #if CONFIG_CODEC == MAS3507D |
@@ -2116,9 +2108,6 @@ static bool disk_settings_menu(void) | |||
2116 | 2108 | ||
2117 | static const struct menu_item items[] = { | 2109 | static const struct menu_item items[] = { |
2118 | { ID2P(LANG_SPINDOWN), spindown }, | 2110 | { ID2P(LANG_SPINDOWN), spindown }, |
2119 | #ifdef HAVE_ATA_POWER_OFF | ||
2120 | { ID2P(LANG_POWEROFF), poweroff }, | ||
2121 | #endif | ||
2122 | #ifdef HAVE_DIRCACHE | 2111 | #ifdef HAVE_DIRCACHE |
2123 | { ID2P(LANG_DIRCACHE_ENABLE), dircache }, | 2112 | { ID2P(LANG_DIRCACHE_ENABLE), dircache }, |
2124 | #endif | 2113 | #endif |