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/menus | |
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/menus')
-rw-r--r-- | apps/menus/playback_menu.c | 6 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index eb1597948b..5d1421b966 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c | |||
@@ -67,7 +67,7 @@ MENUITEM_SETTING(ff_rewind_accel, &global_settings.ff_rewind_accel, NULL); | |||
67 | MENUITEM_SETTING(ff_rewind_min_step, &global_settings.ff_rewind_min_step, NULL); | 67 | MENUITEM_SETTING(ff_rewind_min_step, &global_settings.ff_rewind_min_step, NULL); |
68 | MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, Icon_NOICON, | 68 | MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, Icon_NOICON, |
69 | &ff_rewind_min_step, &ff_rewind_accel); | 69 | &ff_rewind_min_step, &ff_rewind_accel); |
70 | #ifndef HAVE_FLASH_STORAGE | 70 | #ifdef HAVE_DISK_STORAGE |
71 | #if CONFIG_CODEC == SWCODEC | 71 | #if CONFIG_CODEC == SWCODEC |
72 | static int buffermargin_callback(int action,const struct menu_item_ex *this_item) | 72 | static int buffermargin_callback(int action,const struct menu_item_ex *this_item) |
73 | { | 73 | { |
@@ -85,7 +85,7 @@ static int buffermargin_callback(int action,const struct menu_item_ex *this_item | |||
85 | #endif | 85 | #endif |
86 | MENUITEM_SETTING(buffer_margin, &global_settings.buffer_margin, | 86 | MENUITEM_SETTING(buffer_margin, &global_settings.buffer_margin, |
87 | buffermargin_callback); | 87 | buffermargin_callback); |
88 | #endif /*HAVE_FLASH_STORAGE */ | 88 | #endif /*HAVE_DISK_STORAGE */ |
89 | MENUITEM_SETTING(fade_on_stop, &global_settings.fade_on_stop, NULL); | 89 | MENUITEM_SETTING(fade_on_stop, &global_settings.fade_on_stop, NULL); |
90 | MENUITEM_SETTING(party_mode, &global_settings.party_mode, NULL); | 90 | MENUITEM_SETTING(party_mode, &global_settings.party_mode, NULL); |
91 | 91 | ||
@@ -181,7 +181,7 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0, | |||
181 | Icon_Playback_menu, | 181 | Icon_Playback_menu, |
182 | &shuffle_item, &repeat_mode, &play_selected, | 182 | &shuffle_item, &repeat_mode, &play_selected, |
183 | &ff_rewind_settings_menu, | 183 | &ff_rewind_settings_menu, |
184 | #ifndef HAVE_FLASH_STORAGE | 184 | #ifdef HAVE_DISK_STORAGE |
185 | &buffer_margin, | 185 | &buffer_margin, |
186 | #endif | 186 | #endif |
187 | &fade_on_stop, &party_mode, | 187 | &fade_on_stop, &party_mode, |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index d5ddc168a0..48ab316a87 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -173,7 +173,7 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, | |||
173 | #endif | 173 | #endif |
174 | ); | 174 | ); |
175 | /* Disk */ | 175 | /* Disk */ |
176 | #ifndef HAVE_FLASH_STORAGE | 176 | #ifdef HAVE_DISK_STORAGE |
177 | MENUITEM_SETTING(disk_spindown, &global_settings.disk_spindown, NULL); | 177 | MENUITEM_SETTING(disk_spindown, &global_settings.disk_spindown, NULL); |
178 | #endif | 178 | #endif |
179 | #ifdef HAVE_DIRCACHE | 179 | #ifdef HAVE_DIRCACHE |
@@ -200,9 +200,9 @@ static int dircache_callback(int action,const struct menu_item_ex *this_item) | |||
200 | } | 200 | } |
201 | MENUITEM_SETTING(dircache, &global_settings.dircache, dircache_callback); | 201 | MENUITEM_SETTING(dircache, &global_settings.dircache, dircache_callback); |
202 | #endif | 202 | #endif |
203 | #if defined(HAVE_DIRCACHE) || !defined(HAVE_FLASH_STORAGE) | 203 | #if defined(HAVE_DIRCACHE) || defined(HAVE_DISK_STORAGE) |
204 | MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON, | 204 | MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON, |
205 | #ifndef HAVE_FLASH_STORAGE | 205 | #ifdef HAVE_DISK_STORAGE |
206 | &disk_spindown, | 206 | &disk_spindown, |
207 | #endif | 207 | #endif |
208 | #ifdef HAVE_DIRCACHE | 208 | #ifdef HAVE_DIRCACHE |
@@ -374,7 +374,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
374 | #if (BATTERY_CAPACITY_INC > 0) || (BATTERY_TYPES_COUNT > 1) | 374 | #if (BATTERY_CAPACITY_INC > 0) || (BATTERY_TYPES_COUNT > 1) |
375 | &battery_menu, | 375 | &battery_menu, |
376 | #endif | 376 | #endif |
377 | #if defined(HAVE_DIRCACHE) || !defined(HAVE_FLASH_STORAGE) | 377 | #if defined(HAVE_DIRCACHE) || defined(HAVE_DISK_STORAGE) |
378 | &disk_menu, | 378 | &disk_menu, |
379 | #endif | 379 | #endif |
380 | #if CONFIG_RTC | 380 | #if CONFIG_RTC |