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/plugins | |
| parent | 23b7e957708ff7272ed10cbeae24cf9fd7d7ad65 (diff) | |
| download | rockbox-46573019a53dca411f754d40d0f21c1e4eafaedf.zip rockbox-46573019a53dca411f754d40d0f21c1e4eafaedf.tar.gz rockbox-46573019a53dca411f754d40d0f21c1e4eafaedf.tar.bz2 rockbox-46573019a53dca411f754d40d0f21c1e4eafaedf.tar.xz | |
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/plugins')
| -rw-r--r-- | apps/plugins/jpeg.c | 4 | ||||
| -rw-r--r-- | apps/plugins/mpegplayer/stream_mgr.h | 2 | ||||
| -rw-r--r-- | apps/plugins/video.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index b43dee5..397fab7 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c @@ -2633,7 +2633,7 @@ int show_menu(void) /* return 1 to quit */ break; } -#if !defined(SIMULATOR) && !defined(HAVE_FLASH_STORAGE) +#if !defined(SIMULATOR) && defined(HAVE_DISK_STORAGE) /* change ata spindown time based on slideshow time setting */ immediate_ata_off = false; rb->ata_spindown(rb->global_settings->disk_spindown); @@ -3412,7 +3412,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame ARRAYLEN(jpeg_config), JPEG_SETTINGS_VERSION); } -#if !defined(SIMULATOR) && !defined(HAVE_FLASH_STORAGE) +#if !defined(SIMULATOR) && defined(HAVE_DISK_STORAGE) /* set back ata spindown time in case we changed it */ rb->ata_spindown(rb->global_settings->disk_spindown); #endif diff --git a/apps/plugins/mpegplayer/stream_mgr.h b/apps/plugins/mpegplayer/stream_mgr.h index 71a3fd5..c94fa84 100644 --- a/apps/plugins/mpegplayer/stream_mgr.h +++ b/apps/plugins/mpegplayer/stream_mgr.h @@ -152,7 +152,7 @@ static inline bool stream_can_seek(void) /* Keep the disk spinning (for seeking and browsing) */ static inline void stream_keep_disk_active(void) { -#ifndef HAVE_FLASH_STORAGE +#ifdef HAVE_DISK_STORAGE rb->ata_spin(); #endif } diff --git a/apps/plugins/video.c b/apps/plugins/video.c index fbd05bd..6a380b8 100644 --- a/apps/plugins/video.c +++ b/apps/plugins/video.c @@ -656,7 +656,7 @@ int PlayTick(int fd) } if (!gPlay.bRefilling -#ifndef HAVE_FLASH_STORAGE +#ifdef HAVE_DISK_STORAGE && rb->global_settings->disk_spindown < 20 /* condition for test only */ #endif ) |