diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2008-10-07 19:37:33 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2008-10-07 19:37:33 +0000 |
commit | 46573019a53dca411f754d40d0f21c1e4eafaedf (patch) | |
tree | fa2f3baf19b8bc7ed25b709c7dda76272e85a57c /apps/settings_list.c | |
parent | 23b7e957708ff7272ed10cbeae24cf9fd7d7ad65 (diff) | |
download | rockbox-46573019a53dca411f754d40d0f21c1e4eafaedf.tar.gz rockbox-46573019a53dca411f754d40d0f21c1e4eafaedf.zip |
add HAVE_DISK_STORAGE, and use that instead of HAVE_FLASH_STORAGE when checking for an actual disk (i.e. related to spindown, skipping,...)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18735 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index e70f587b5a..8994ca45b7 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -695,22 +695,22 @@ const struct settings_list settings[] = { | |||
695 | "seek acceleration", "very fast,fast,normal,slow,very slow", NULL, 5, | 695 | "seek acceleration", "very fast,fast,normal,slow,very slow", NULL, 5, |
696 | ID2P(LANG_VERY_FAST), ID2P(LANG_FAST), ID2P(LANG_NORMAL), | 696 | ID2P(LANG_VERY_FAST), ID2P(LANG_FAST), ID2P(LANG_NORMAL), |
697 | ID2P(LANG_SLOW) , ID2P(LANG_VERY_SLOW)), | 697 | ID2P(LANG_SLOW) , ID2P(LANG_VERY_SLOW)), |
698 | #if (CONFIG_CODEC == SWCODEC) && !defined(HAVE_FLASH_STORAGE) | 698 | #if (CONFIG_CODEC == SWCODEC) && defined(HAVE_DISK_STORAGE) |
699 | STRINGCHOICE_SETTING(0, buffer_margin, LANG_MP3BUFFER_MARGIN, 0,"antiskip", | 699 | STRINGCHOICE_SETTING(0, buffer_margin, LANG_MP3BUFFER_MARGIN, 0,"antiskip", |
700 | "5s,15s,30s,1min,2min,3min,5min,10min", NULL, 8, | 700 | "5s,15s,30s,1min,2min,3min,5min,10min", NULL, 8, |
701 | TALK_ID(5, UNIT_SEC), TALK_ID(15, UNIT_SEC), | 701 | TALK_ID(5, UNIT_SEC), TALK_ID(15, UNIT_SEC), |
702 | TALK_ID(30, UNIT_SEC), TALK_ID(1, UNIT_MIN), | 702 | TALK_ID(30, UNIT_SEC), TALK_ID(1, UNIT_MIN), |
703 | TALK_ID(2, UNIT_MIN), TALK_ID(3, UNIT_MIN), | 703 | TALK_ID(2, UNIT_MIN), TALK_ID(3, UNIT_MIN), |
704 | TALK_ID(5, UNIT_MIN), TALK_ID(10, UNIT_MIN)), | 704 | TALK_ID(5, UNIT_MIN), TALK_ID(10, UNIT_MIN)), |
705 | #elif !defined(HAVE_FLASH_STORAGE) | 705 | #elif defined(HAVE_DISK_STORAGE) |
706 | INT_SETTING(0, buffer_margin, LANG_MP3BUFFER_MARGIN, 0, "antiskip", | 706 | INT_SETTING(0, buffer_margin, LANG_MP3BUFFER_MARGIN, 0, "antiskip", |
707 | UNIT_SEC, 0, 7, 1, NULL, NULL, audio_set_buffer_margin), | 707 | UNIT_SEC, 0, 7, 1, NULL, NULL, audio_set_buffer_margin), |
708 | #endif | 708 | #endif |
709 | /* disk */ | 709 | /* disk */ |
710 | #ifndef HAVE_FLASH_STORAGE | 710 | #ifdef HAVE_DISK_STORAGE |
711 | INT_SETTING(0, disk_spindown, LANG_SPINDOWN, 5, "disk spindown", | 711 | INT_SETTING(0, disk_spindown, LANG_SPINDOWN, 5, "disk spindown", |
712 | UNIT_SEC, 3, 254, 1, NULL, NULL, ata_spindown), | 712 | UNIT_SEC, 3, 254, 1, NULL, NULL, ata_spindown), |
713 | #endif /* HAVE_FLASH_STORAGE */ | 713 | #endif /* HAVE_DISK_STORAGE */ |
714 | /* browser */ | 714 | /* browser */ |
715 | CHOICE_SETTING(0, dirfilter, LANG_FILTER, SHOW_SUPPORTED, "show files", | 715 | CHOICE_SETTING(0, dirfilter, LANG_FILTER, SHOW_SUPPORTED, "show files", |
716 | "all,supported,music,playlists", NULL, 4, ID2P(LANG_ALL), | 716 | "all,supported,music,playlists", NULL, 4, ID2P(LANG_ALL), |