diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/menus/playback_menu.c | 9 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 6 | ||||
-rw-r--r-- | apps/playback.c | 5 | ||||
-rw-r--r-- | apps/playlist.c | 2 | ||||
-rw-r--r-- | apps/plugins/battery_bench.c | 10 | ||||
-rw-r--r-- | apps/plugins/jpeg.c | 4 | ||||
-rw-r--r-- | apps/plugins/video.c | 7 | ||||
-rw-r--r-- | apps/settings.c | 4 | ||||
-rw-r--r-- | apps/settings.h | 3 | ||||
-rw-r--r-- | apps/settings_list.c | 6 |
10 files changed, 42 insertions, 14 deletions
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index 1f6c96e421..c1de862cd0 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); | |||
62 | MENUITEM_SETTING(ff_rewind_min_step, &global_settings.ff_rewind_min_step, NULL); | 62 | MENUITEM_SETTING(ff_rewind_min_step, &global_settings.ff_rewind_min_step, NULL); |
63 | MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, Icon_NOICON, | 63 | MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, Icon_NOICON, |
64 | &ff_rewind_min_step, &ff_rewind_accel); | 64 | &ff_rewind_min_step, &ff_rewind_accel); |
65 | #ifndef HAVE_FLASH_STORAGE | ||
65 | #if CONFIG_CODEC == SWCODEC | 66 | #if CONFIG_CODEC == SWCODEC |
66 | int buffermargin_callback(int action,const struct menu_item_ex *this_item) | 67 | int buffermargin_callback(int action,const struct menu_item_ex *this_item) |
67 | { | 68 | { |
@@ -79,6 +80,7 @@ int buffermargin_callback(int action,const struct menu_item_ex *this_item) | |||
79 | #endif | 80 | #endif |
80 | MENUITEM_SETTING(buffer_margin, &global_settings.buffer_margin, | 81 | MENUITEM_SETTING(buffer_margin, &global_settings.buffer_margin, |
81 | buffermargin_callback); | 82 | buffermargin_callback); |
83 | #endif /*HAVE_FLASH_STORAGE */ | ||
82 | MENUITEM_SETTING(fade_on_stop, &global_settings.fade_on_stop, NULL); | 84 | MENUITEM_SETTING(fade_on_stop, &global_settings.fade_on_stop, NULL); |
83 | MENUITEM_SETTING(party_mode, &global_settings.party_mode, NULL); | 85 | MENUITEM_SETTING(party_mode, &global_settings.party_mode, NULL); |
84 | 86 | ||
@@ -172,8 +174,11 @@ MAKE_MENU(unplug_menu, ID2P(LANG_UNPLUG), 0, Icon_NOICON, | |||
172 | MAKE_MENU(playback_menu_item,ID2P(LANG_PLAYBACK),0, | 174 | MAKE_MENU(playback_menu_item,ID2P(LANG_PLAYBACK),0, |
173 | Icon_Playback_menu, | 175 | Icon_Playback_menu, |
174 | &shuffle_item, &repeat_mode, &play_selected, | 176 | &shuffle_item, &repeat_mode, &play_selected, |
175 | &ff_rewind_settings_menu, | 177 | &ff_rewind_settings_menu, |
176 | &buffer_margin, &fade_on_stop, &party_mode, | 178 | #ifndef HAVE_FLASH_STORAGE |
179 | &buffer_margin, | ||
180 | #endif | ||
181 | &fade_on_stop, &party_mode, | ||
177 | 182 | ||
178 | #if CONFIG_CODEC == SWCODEC | 183 | #if CONFIG_CODEC == SWCODEC |
179 | &crossfade_settings_menu, &replaygain_settings_menu, &beep, | 184 | &crossfade_settings_menu, &replaygain_settings_menu, &beep, |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 302a7428aa..2a68f80c79 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, | |||
160 | ); | 160 | ); |
161 | #endif /* SIMULATOR */ | 161 | #endif /* SIMULATOR */ |
162 | /* Disk */ | 162 | /* Disk */ |
163 | #ifndef HAVE_MMC | 163 | #ifndef HAVE_FLASH_STORAGE |
164 | MENUITEM_SETTING(disk_spindown, &global_settings.disk_spindown, NULL); | 164 | MENUITEM_SETTING(disk_spindown, &global_settings.disk_spindown, NULL); |
165 | #endif | ||
165 | #ifdef HAVE_DIRCACHE | 166 | #ifdef HAVE_DIRCACHE |
166 | static int dircache_callback(int action,const struct menu_item_ex *this_item) | 167 | static int dircache_callback(int action,const struct menu_item_ex *this_item) |
167 | { | 168 | { |
@@ -186,8 +187,11 @@ static int dircache_callback(int action,const struct menu_item_ex *this_item) | |||
186 | } | 187 | } |
187 | MENUITEM_SETTING(dircache, &global_settings.dircache, dircache_callback); | 188 | MENUITEM_SETTING(dircache, &global_settings.dircache, dircache_callback); |
188 | #endif | 189 | #endif |
190 | #if defined(HAVE_DIRCACHE) || !defined(HAVE_FLASH_STORAGE) | ||
189 | MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON, | 191 | MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON, |
192 | #ifndef HAVE_FLASH_STORAGE | ||
190 | &disk_spindown, | 193 | &disk_spindown, |
194 | #endif | ||
191 | #ifdef HAVE_DIRCACHE | 195 | #ifdef HAVE_DIRCACHE |
192 | &dircache, | 196 | &dircache, |
193 | #endif | 197 | #endif |
diff --git a/apps/playback.c b/apps/playback.c index 0533ddcf4c..7b9b664e9c 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -792,6 +792,7 @@ int audio_get_file_pos(void) | |||
792 | return 0; | 792 | return 0; |
793 | } | 793 | } |
794 | 794 | ||
795 | #ifndef HAVE_FLASH_STORAGE | ||
795 | void audio_set_buffer_margin(int setting) | 796 | void audio_set_buffer_margin(int setting) |
796 | { | 797 | { |
797 | static const int lookup[] = {5, 15, 30, 60, 120, 180, 300, 600}; | 798 | static const int lookup[] = {5, 15, 30, 60, 120, 180, 300, 600}; |
@@ -799,6 +800,7 @@ void audio_set_buffer_margin(int setting) | |||
799 | logf("buffer margin: %ld", buffer_margin); | 800 | logf("buffer margin: %ld", buffer_margin); |
800 | set_filebuf_watermark(buffer_margin); | 801 | set_filebuf_watermark(buffer_margin); |
801 | } | 802 | } |
803 | #endif | ||
802 | 804 | ||
803 | /* Take nescessary steps to enable or disable the crossfade setting */ | 805 | /* Take nescessary steps to enable or disable the crossfade setting */ |
804 | void audio_set_crossfade(int enable) | 806 | void audio_set_crossfade(int enable) |
@@ -3839,5 +3841,8 @@ void audio_init(void) | |||
3839 | #ifdef HAVE_WM8758 | 3841 | #ifdef HAVE_WM8758 |
3840 | eq_hw_enable(global_settings.eq_hw_enabled); | 3842 | eq_hw_enable(global_settings.eq_hw_enabled); |
3841 | #endif | 3843 | #endif |
3844 | #ifndef HAVE_FLASH_STORAGE | ||
3842 | audio_set_buffer_margin(global_settings.buffer_margin); | 3845 | audio_set_buffer_margin(global_settings.buffer_margin); |
3846 | #endif | ||
3843 | } /* audio_init */ | 3847 | } /* audio_init */ |
3848 | |||
diff --git a/apps/playlist.c b/apps/playlist.c index f0ac29d1ef..39d7cc1e3d 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
@@ -1172,9 +1172,11 @@ static void playlist_thread(void) | |||
1172 | 1172 | ||
1173 | int sleep_time = 5; | 1173 | int sleep_time = 5; |
1174 | 1174 | ||
1175 | #ifndef HAVE_FLASH_STORAGE | ||
1175 | if (global_settings.disk_spindown > 1 && | 1176 | if (global_settings.disk_spindown > 1 && |
1176 | global_settings.disk_spindown <= 5) | 1177 | global_settings.disk_spindown <= 5) |
1177 | sleep_time = global_settings.disk_spindown - 1; | 1178 | sleep_time = global_settings.disk_spindown - 1; |
1179 | #endif | ||
1178 | 1180 | ||
1179 | while (1) | 1181 | while (1) |
1180 | { | 1182 | { |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 3d8eadb639..8c71f0ecce 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -188,15 +188,17 @@ void thread(void) | |||
188 | #if CONFIG_CHARGING || defined(HAVE_USB_POWER) | 188 | #if CONFIG_CHARGING || defined(HAVE_USB_POWER) |
189 | unsigned int last_state = 0; | 189 | unsigned int last_state = 0; |
190 | #endif | 190 | #endif |
191 | long sleep_time; | 191 | long sleep_time = 5 * HZ; |
192 | 192 | ||
193 | struct event ev; | 193 | struct event ev; |
194 | 194 | ||
195 | buffelements = sizeof(bat)/sizeof(struct batt_info); | 195 | buffelements = sizeof(bat)/sizeof(struct batt_info); |
196 | 196 | ||
197 | sleep_time = (rb->global_settings->disk_spindown > 1) ? | 197 | #ifndef HAVE_FLASH_STORAGE |
198 | (rb->global_settings->disk_spindown - 1) * HZ : 5 * HZ; | 198 | if(rb->global_settings->disk_spindown > 1) |
199 | 199 | sleep_time = (rb->global_settings->disk_spindown - 1) * HZ; | |
200 | #endif | ||
201 | |||
200 | do | 202 | do |
201 | { | 203 | { |
202 | if(!in_usb_mode && got_info && | 204 | if(!in_usb_mode && got_info && |
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index 54c8c6cb63..ad56475ebc 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -2541,7 +2541,7 @@ int show_menu(void) /* return 1 to quit */ | |||
2541 | break; | 2541 | break; |
2542 | } | 2542 | } |
2543 | 2543 | ||
2544 | #ifndef SIMULATOR | 2544 | #if !defined(SIMULATOR) && !defined(HAVE_FLASH_STORAGE) |
2545 | /* change ata spindown time based on slideshow time setting */ | 2545 | /* change ata spindown time based on slideshow time setting */ |
2546 | immediate_ata_off = false; | 2546 | immediate_ata_off = false; |
2547 | rb->ata_spindown(rb->global_settings->disk_spindown); | 2547 | rb->ata_spindown(rb->global_settings->disk_spindown); |
@@ -3325,7 +3325,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
3325 | } | 3325 | } |
3326 | #endif | 3326 | #endif |
3327 | 3327 | ||
3328 | #ifndef SIMULATOR | 3328 | #if !defined(SIMULATOR) && !defined(HAVE_FLASH_STORAGE) |
3329 | /* set back ata spindown time in case we changed it */ | 3329 | /* set back ata spindown time in case we changed it */ |
3330 | rb->ata_spindown(rb->global_settings->disk_spindown); | 3330 | rb->ata_spindown(rb->global_settings->disk_spindown); |
3331 | #endif | 3331 | #endif |
diff --git a/apps/plugins/video.c b/apps/plugins/video.c index b56a9d0612..aca960f56e 100644 --- a/apps/plugins/video.c +++ b/apps/plugins/video.c | |||
@@ -650,8 +650,11 @@ int PlayTick(int fd) | |||
650 | * gFileHdr.bps_peak / 8 / HZ; | 650 | * gFileHdr.bps_peak / 8 / HZ; |
651 | } | 651 | } |
652 | 652 | ||
653 | if (!gPlay.bRefilling | 653 | if (!gPlay.bRefilling |
654 | && rb->global_settings->disk_spindown < 20) /* condition for test only */ | 654 | #ifndef HAVE_FLASH_STORAGE |
655 | && rb->global_settings->disk_spindown < 20 /* condition for test only */ | ||
656 | #endif | ||
657 | ) | ||
655 | { | 658 | { |
656 | rb->ata_sleep(); /* no point in leaving the disk run til timeout */ | 659 | rb->ata_sleep(); /* no point in leaving the disk run til timeout */ |
657 | gPlay.bDiskSleep = true; | 660 | gPlay.bDiskSleep = true; |
diff --git a/apps/settings.c b/apps/settings.c index 0cf38266a6..958c410af8 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -658,7 +658,9 @@ void settings_apply(void) | |||
658 | DEBUGF( "settings_apply()\n" ); | 658 | DEBUGF( "settings_apply()\n" ); |
659 | sound_settings_apply(); | 659 | sound_settings_apply(); |
660 | 660 | ||
661 | #ifndef HAVE_FLASH_STORAGE | ||
661 | audio_set_buffer_margin(global_settings.buffer_margin); | 662 | audio_set_buffer_margin(global_settings.buffer_margin); |
663 | #endif | ||
662 | 664 | ||
663 | #ifdef HAVE_LCD_CONTRAST | 665 | #ifdef HAVE_LCD_CONTRAST |
664 | lcd_set_contrast(global_settings.contrast); | 666 | lcd_set_contrast(global_settings.contrast); |
@@ -702,7 +704,9 @@ void settings_apply(void) | |||
702 | #ifdef HAVE_BUTTON_LIGHT | 704 | #ifdef HAVE_BUTTON_LIGHT |
703 | button_backlight_set_timeout(global_settings.button_light_timeout); | 705 | button_backlight_set_timeout(global_settings.button_light_timeout); |
704 | #endif | 706 | #endif |
707 | #ifndef HAVE_FLASH_STORAGE | ||
705 | ata_spindown(global_settings.disk_spindown); | 708 | ata_spindown(global_settings.disk_spindown); |
709 | #endif | ||
706 | #if (CONFIG_CODEC == MAS3507D) && !defined(SIMULATOR) | 710 | #if (CONFIG_CODEC == MAS3507D) && !defined(SIMULATOR) |
707 | dac_line_in(global_settings.line_in); | 711 | dac_line_in(global_settings.line_in); |
708 | #endif | 712 | #endif |
diff --git a/apps/settings.h b/apps/settings.h index f9ee1df7ec..4d7073bf3b 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -446,8 +446,11 @@ struct user_settings | |||
446 | bool play_selected; /* Plays selected file even in shuffle mode */ | 446 | bool play_selected; /* Plays selected file even in shuffle mode */ |
447 | int ff_rewind_min_step; /* FF/Rewind minimum step size */ | 447 | int ff_rewind_min_step; /* FF/Rewind minimum step size */ |
448 | int ff_rewind_accel; /* FF/Rewind acceleration (in seconds per doubling) */ | 448 | int ff_rewind_accel; /* FF/Rewind acceleration (in seconds per doubling) */ |
449 | |||
450 | #ifndef HAVE_FLASH_STORAGE | ||
449 | int disk_spindown; /* time until disk spindown, in seconds (0=off) */ | 451 | int disk_spindown; /* time until disk spindown, in seconds (0=off) */ |
450 | int buffer_margin; /* MP3 buffer watermark margin, in seconds */ | 452 | int buffer_margin; /* MP3 buffer watermark margin, in seconds */ |
453 | #endif | ||
451 | 454 | ||
452 | int peak_meter_release; /* units per read out */ | 455 | int peak_meter_release; /* units per read out */ |
453 | int peak_meter_hold; /* hold time for peak meter in 1/100 s */ | 456 | int peak_meter_hold; /* hold time for peak meter in 1/100 s */ |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 76a3e41b60..74b1610411 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -628,15 +628,15 @@ const struct settings_list settings[] = { | |||
628 | TALK_ID(5, UNIT_SEC), TALK_ID(15, UNIT_SEC), | 628 | TALK_ID(5, UNIT_SEC), TALK_ID(15, UNIT_SEC), |
629 | TALK_ID(30, UNIT_SEC), TALK_ID(1, UNIT_MIN), TALK_ID(2, UNIT_MIN), | 629 | TALK_ID(30, UNIT_SEC), TALK_ID(1, UNIT_MIN), TALK_ID(2, UNIT_MIN), |
630 | TALK_ID(3, UNIT_MIN), TALK_ID(5, UNIT_MIN), TALK_ID(10, UNIT_MIN)), | 630 | TALK_ID(3, UNIT_MIN), TALK_ID(5, UNIT_MIN), TALK_ID(10, UNIT_MIN)), |
631 | #else | 631 | #elif !defined(HAVE_FLASH_STORAGE) |
632 | INT_SETTING(0, buffer_margin, LANG_MP3BUFFER_MARGIN, 0, "antiskip", | 632 | INT_SETTING(0, buffer_margin, LANG_MP3BUFFER_MARGIN, 0, "antiskip", |
633 | UNIT_SEC, 0, 7, 1, NULL, NULL, audio_set_buffer_margin), | 633 | UNIT_SEC, 0, 7, 1, NULL, NULL, audio_set_buffer_margin), |
634 | #endif | 634 | #endif |
635 | /* disk */ | 635 | /* disk */ |
636 | #ifndef HAVE_MMC | 636 | #ifndef HAVE_FLASH_STORAGE |
637 | INT_SETTING(0, disk_spindown, LANG_SPINDOWN, 5, "disk spindown", | 637 | INT_SETTING(0, disk_spindown, LANG_SPINDOWN, 5, "disk spindown", |
638 | UNIT_SEC, 3, 254, 1, NULL, NULL, ata_spindown), | 638 | UNIT_SEC, 3, 254, 1, NULL, NULL, ata_spindown), |
639 | #endif /* HAVE_MMC */ | 639 | #endif /* HAVE_FLASH_STORAGE */ |
640 | /* browser */ | 640 | /* browser */ |
641 | CHOICE_SETTING(0, dirfilter, LANG_FILTER, SHOW_SUPPORTED, "show files", | 641 | CHOICE_SETTING(0, dirfilter, LANG_FILTER, SHOW_SUPPORTED, "show files", |
642 | "all,supported,music,playlists", NULL, 4, ID2P(LANG_FILTER_ALL), | 642 | "all,supported,music,playlists", NULL, 4, ID2P(LANG_FILTER_ALL), |