diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/features.txt | 4 | ||||
-rw-r--r-- | apps/menus/playback_menu.c | 6 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 8 | ||||
-rw-r--r-- | apps/playback.c | 6 | ||||
-rw-r--r-- | apps/playlist.c | 2 | ||||
-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 | ||||
-rw-r--r-- | apps/settings.c | 4 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/settings_list.c | 8 | ||||
-rw-r--r-- | apps/tagtree.c | 2 |
12 files changed, 27 insertions, 23 deletions
diff --git a/apps/features.txt b/apps/features.txt index 2aa6035388..84edad1a61 100644 --- a/apps/features.txt +++ b/apps/features.txt | |||
@@ -36,6 +36,10 @@ dircache | |||
36 | flash_storage | 36 | flash_storage |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #if defined(HAVE_DISK_STORAGE) | ||
40 | disk_storage | ||
41 | #endif | ||
42 | |||
39 | #if defined(HAVE_HEADPHONE_DETECTION) | 43 | #if defined(HAVE_HEADPHONE_DETECTION) |
40 | headphone_detection | 44 | headphone_detection |
41 | #endif | 45 | #endif |
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 |
diff --git a/apps/playback.c b/apps/playback.c index ee1993a2da..925092a3dd 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -783,7 +783,7 @@ int audio_get_file_pos(void) | |||
783 | return 0; | 783 | return 0; |
784 | } | 784 | } |
785 | 785 | ||
786 | #ifndef HAVE_FLASH_STORAGE | 786 | #ifdef HAVE_DISK_STORAGE |
787 | void audio_set_buffer_margin(int setting) | 787 | void audio_set_buffer_margin(int setting) |
788 | { | 788 | { |
789 | static const int lookup[] = {5, 15, 30, 60, 120, 180, 300, 600}; | 789 | static const int lookup[] = {5, 15, 30, 60, 120, 180, 300, 600}; |
@@ -2187,7 +2187,7 @@ static void audio_play_start(size_t offset) | |||
2187 | /* Officially playing */ | 2187 | /* Officially playing */ |
2188 | queue_reply(&audio_queue, 1); | 2188 | queue_reply(&audio_queue, 1); |
2189 | 2189 | ||
2190 | #ifndef HAVE_FLASH_STORAGE | 2190 | #ifdef HAVE_DISK_STORAGE |
2191 | set_filebuf_watermark(buffer_margin, 0); | 2191 | set_filebuf_watermark(buffer_margin, 0); |
2192 | #endif | 2192 | #endif |
2193 | 2193 | ||
@@ -2584,7 +2584,7 @@ void audio_init(void) | |||
2584 | audio_is_initialized = true; | 2584 | audio_is_initialized = true; |
2585 | 2585 | ||
2586 | sound_settings_apply(); | 2586 | sound_settings_apply(); |
2587 | #ifndef HAVE_FLASH_STORAGE | 2587 | #ifdef HAVE_DISK_STORAGE |
2588 | audio_set_buffer_margin(global_settings.buffer_margin); | 2588 | audio_set_buffer_margin(global_settings.buffer_margin); |
2589 | #endif | 2589 | #endif |
2590 | 2590 | ||
diff --git a/apps/playlist.c b/apps/playlist.c index 8dd444889a..018a39ae41 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
@@ -1245,7 +1245,7 @@ static void playlist_thread(void) | |||
1245 | 1245 | ||
1246 | int sleep_time = 5; | 1246 | int sleep_time = 5; |
1247 | 1247 | ||
1248 | #ifndef HAVE_FLASH_STORAGE | 1248 | #ifdef HAVE_DISK_STORAGE |
1249 | if (global_settings.disk_spindown > 1 && | 1249 | if (global_settings.disk_spindown > 1 && |
1250 | global_settings.disk_spindown <= 5) | 1250 | global_settings.disk_spindown <= 5) |
1251 | sleep_time = global_settings.disk_spindown - 1; | 1251 | sleep_time = global_settings.disk_spindown - 1; |
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index b43dee5d74..397fab7bd6 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -2633,7 +2633,7 @@ int show_menu(void) /* return 1 to quit */ | |||
2633 | break; | 2633 | break; |
2634 | } | 2634 | } |
2635 | 2635 | ||
2636 | #if !defined(SIMULATOR) && !defined(HAVE_FLASH_STORAGE) | 2636 | #if !defined(SIMULATOR) && defined(HAVE_DISK_STORAGE) |
2637 | /* change ata spindown time based on slideshow time setting */ | 2637 | /* change ata spindown time based on slideshow time setting */ |
2638 | immediate_ata_off = false; | 2638 | immediate_ata_off = false; |
2639 | rb->ata_spindown(rb->global_settings->disk_spindown); | 2639 | 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 | |||
3412 | ARRAYLEN(jpeg_config), JPEG_SETTINGS_VERSION); | 3412 | ARRAYLEN(jpeg_config), JPEG_SETTINGS_VERSION); |
3413 | } | 3413 | } |
3414 | 3414 | ||
3415 | #if !defined(SIMULATOR) && !defined(HAVE_FLASH_STORAGE) | 3415 | #if !defined(SIMULATOR) && defined(HAVE_DISK_STORAGE) |
3416 | /* set back ata spindown time in case we changed it */ | 3416 | /* set back ata spindown time in case we changed it */ |
3417 | rb->ata_spindown(rb->global_settings->disk_spindown); | 3417 | rb->ata_spindown(rb->global_settings->disk_spindown); |
3418 | #endif | 3418 | #endif |
diff --git a/apps/plugins/mpegplayer/stream_mgr.h b/apps/plugins/mpegplayer/stream_mgr.h index 71a3fd51c6..c94fa84089 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) | |||
152 | /* Keep the disk spinning (for seeking and browsing) */ | 152 | /* Keep the disk spinning (for seeking and browsing) */ |
153 | static inline void stream_keep_disk_active(void) | 153 | static inline void stream_keep_disk_active(void) |
154 | { | 154 | { |
155 | #ifndef HAVE_FLASH_STORAGE | 155 | #ifdef HAVE_DISK_STORAGE |
156 | rb->ata_spin(); | 156 | rb->ata_spin(); |
157 | #endif | 157 | #endif |
158 | } | 158 | } |
diff --git a/apps/plugins/video.c b/apps/plugins/video.c index fbd05bd006..6a380b8e3c 100644 --- a/apps/plugins/video.c +++ b/apps/plugins/video.c | |||
@@ -656,7 +656,7 @@ int PlayTick(int fd) | |||
656 | } | 656 | } |
657 | 657 | ||
658 | if (!gPlay.bRefilling | 658 | if (!gPlay.bRefilling |
659 | #ifndef HAVE_FLASH_STORAGE | 659 | #ifdef HAVE_DISK_STORAGE |
660 | && rb->global_settings->disk_spindown < 20 /* condition for test only */ | 660 | && rb->global_settings->disk_spindown < 20 /* condition for test only */ |
661 | #endif | 661 | #endif |
662 | ) | 662 | ) |
diff --git a/apps/settings.c b/apps/settings.c index f598876818..709e05e086 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -721,7 +721,7 @@ void settings_apply(bool read_disk) | |||
721 | 721 | ||
722 | sound_settings_apply(); | 722 | sound_settings_apply(); |
723 | 723 | ||
724 | #ifndef HAVE_FLASH_STORAGE | 724 | #ifdef HAVE_DISK_STORAGE |
725 | audio_set_buffer_margin(global_settings.buffer_margin); | 725 | audio_set_buffer_margin(global_settings.buffer_margin); |
726 | #endif | 726 | #endif |
727 | 727 | ||
@@ -767,7 +767,7 @@ void settings_apply(bool read_disk) | |||
767 | #ifdef HAVE_BUTTON_LIGHT | 767 | #ifdef HAVE_BUTTON_LIGHT |
768 | buttonlight_set_timeout(global_settings.buttonlight_timeout); | 768 | buttonlight_set_timeout(global_settings.buttonlight_timeout); |
769 | #endif | 769 | #endif |
770 | #ifndef HAVE_FLASH_STORAGE | 770 | #ifdef HAVE_DISK_STORAGE |
771 | ata_spindown(global_settings.disk_spindown); | 771 | ata_spindown(global_settings.disk_spindown); |
772 | #endif | 772 | #endif |
773 | #if (CONFIG_CODEC == MAS3507D) && !defined(SIMULATOR) | 773 | #if (CONFIG_CODEC == MAS3507D) && !defined(SIMULATOR) |
diff --git a/apps/settings.h b/apps/settings.h index 902956e471..f1fd7cc2c4 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -449,7 +449,7 @@ struct user_settings | |||
449 | int ff_rewind_min_step; /* FF/Rewind minimum step size */ | 449 | int ff_rewind_min_step; /* FF/Rewind minimum step size */ |
450 | int ff_rewind_accel; /* FF/Rewind acceleration (in seconds per doubling) */ | 450 | int ff_rewind_accel; /* FF/Rewind acceleration (in seconds per doubling) */ |
451 | 451 | ||
452 | #ifndef HAVE_FLASH_STORAGE | 452 | #ifdef HAVE_DISK_STORAGE |
453 | int disk_spindown; /* time until disk spindown, in seconds (0=off) */ | 453 | int disk_spindown; /* time until disk spindown, in seconds (0=off) */ |
454 | int buffer_margin; /* MP3 buffer watermark margin, in seconds */ | 454 | int buffer_margin; /* MP3 buffer watermark margin, in seconds */ |
455 | #endif | 455 | #endif |
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), |
diff --git a/apps/tagtree.c b/apps/tagtree.c index 5415610501..92bf18bc26 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c | |||
@@ -1056,7 +1056,7 @@ static int retrieve_entries(struct tree_context *c, struct tagcache_search *tcs, | |||
1056 | /* Show search progress straight away if the disk needs to spin up, | 1056 | /* Show search progress straight away if the disk needs to spin up, |
1057 | otherwise show it after the normal 1/2 second delay */ | 1057 | otherwise show it after the normal 1/2 second delay */ |
1058 | show_search_progress( | 1058 | show_search_progress( |
1059 | #if !defined(HAVE_FLASH_STORAGE) | 1059 | #ifdef HAVE_DISK_STORAGE |
1060 | ata_disk_is_active() | 1060 | ata_disk_is_active() |
1061 | #else | 1061 | #else |
1062 | true | 1062 | true |