diff options
| author | Nils Wallménius <nils@rockbox.org> | 2007-08-01 08:50:44 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2007-08-01 08:50:44 +0000 |
| commit | 0bfa3e76ce8f2c5465ff568b7f4dcf7b5fbb462f (patch) | |
| tree | d84ec59c3b9fc00ce46329c01a66b8da46b0e204 /apps/menus | |
| parent | 3b3fd4997ee32cf5b0bc7cf07b3ac9a73cbcb388 (diff) | |
| download | rockbox-0bfa3e76ce8f2c5465ff568b7f4dcf7b5fbb462f.zip rockbox-0bfa3e76ce8f2c5465ff568b7f4dcf7b5fbb462f.tar.gz rockbox-0bfa3e76ce8f2c5465ff568b7f4dcf7b5fbb462f.tar.bz2 rockbox-0bfa3e76ce8f2c5465ff568b7f4dcf7b5fbb462f.tar.xz | |
Disable 'Disk spindown' and 'Anti skip buffer' settings and some related stuff for flash storage targets as they make no sense
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14110 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus')
| -rw-r--r-- | apps/menus/playback_menu.c | 9 | ||||
| -rw-r--r-- | apps/menus/settings_menu.c | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index 1f6c96e..c1de862 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c @@ -62,6 +62,7 @@ MENUITEM_SETTING(ff_rewind_accel, &global_settings.ff_rewind_accel, NULL); MENUITEM_SETTING(ff_rewind_min_step, &global_settings.ff_rewind_min_step, NULL); MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, Icon_NOICON, &ff_rewind_min_step, &ff_rewind_accel); +#ifndef HAVE_FLASH_STORAGE #if CONFIG_CODEC == SWCODEC int buffermargin_callback(int action,const struct menu_item_ex *this_item) { @@ -79,6 +80,7 @@ int buffermargin_callback(int action,const struct menu_item_ex *this_item) #endif MENUITEM_SETTING(buffer_margin, &global_settings.buffer_margin, buffermargin_callback); +#endif /*HAVE_FLASH_STORAGE */ MENUITEM_SETTING(fade_on_stop, &global_settings.fade_on_stop, NULL); MENUITEM_SETTING(party_mode, &global_settings.party_mode, NULL); @@ -172,8 +174,11 @@ MAKE_MENU(unplug_menu, ID2P(LANG_UNPLUG), 0, Icon_NOICON, MAKE_MENU(playback_menu_item,ID2P(LANG_PLAYBACK),0, Icon_Playback_menu, &shuffle_item, &repeat_mode, &play_selected, - &ff_rewind_settings_menu, - &buffer_margin, &fade_on_stop, &party_mode, + &ff_rewind_settings_menu, +#ifndef HAVE_FLASH_STORAGE + &buffer_margin, +#endif + &fade_on_stop, &party_mode, #if CONFIG_CODEC == SWCODEC &crossfade_settings_menu, &replaygain_settings_menu, &beep, diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 302a742..2a68f80 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -160,8 +160,9 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, ); #endif /* SIMULATOR */ /* Disk */ -#ifndef HAVE_MMC +#ifndef HAVE_FLASH_STORAGE MENUITEM_SETTING(disk_spindown, &global_settings.disk_spindown, NULL); +#endif #ifdef HAVE_DIRCACHE static int dircache_callback(int action,const struct menu_item_ex *this_item) { @@ -186,8 +187,11 @@ static int dircache_callback(int action,const struct menu_item_ex *this_item) } MENUITEM_SETTING(dircache, &global_settings.dircache, dircache_callback); #endif +#if defined(HAVE_DIRCACHE) || !defined(HAVE_FLASH_STORAGE) MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON, +#ifndef HAVE_FLASH_STORAGE &disk_spindown, +#endif #ifdef HAVE_DIRCACHE &dircache, #endif |