diff options
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 98e8dec5a8..a9f627bfa6 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1120,7 +1120,11 @@ const struct settings_list settings[] = { | |||
1120 | SYSTEM_SETTING(NVRAM(4), topruntime, 0), | 1120 | SYSTEM_SETTING(NVRAM(4), topruntime, 0), |
1121 | INT_SETTING(F_BANFROMQS, max_files_in_playlist, | 1121 | INT_SETTING(F_BANFROMQS, max_files_in_playlist, |
1122 | LANG_MAX_FILES_IN_PLAYLIST, | 1122 | LANG_MAX_FILES_IN_PLAYLIST, |
1123 | #if MEMORYSIZE > 1 | 1123 | #if CONFIG_CPU == PP5002 || CONFIG_CPU == PP5020 || CONFIG_CPU == PP5022 |
1124 | /** Slow CPU benefits greatly from building smaller playlists | ||
1125 | On the iPod Mini 2nd gen, creating a playlist of 2000 entries takes around 10 seconds */ | ||
1126 | 2000, | ||
1127 | #elif MEMORYSIZE > 1 | ||
1124 | 10000, | 1128 | 10000, |
1125 | #else | 1129 | #else |
1126 | 400, | 1130 | 400, |
@@ -1319,6 +1323,8 @@ const struct settings_list settings[] = { | |||
1319 | #endif | 1323 | #endif |
1320 | OFFON_SETTING(0, offset_out_of_view, LANG_SCREEN_SCROLL_VIEW, | 1324 | OFFON_SETTING(0, offset_out_of_view, LANG_SCREEN_SCROLL_VIEW, |
1321 | false, "Screen Scrolls Out Of View", NULL), | 1325 | false, "Screen Scrolls Out Of View", NULL), |
1326 | OFFON_SETTING(0, disable_mainmenu_scrolling, LANG_DISABLE_MAINMENU_SCROLLING, | ||
1327 | false, "Disable main menu scrolling", NULL), | ||
1322 | INT_SETTING(F_PADTITLE, scroll_step, LANG_SCROLL_STEP, 6, "scroll step", | 1328 | INT_SETTING(F_PADTITLE, scroll_step, LANG_SCROLL_STEP, 6, "scroll step", |
1323 | UNIT_PIXEL, 1, LCD_WIDTH, 1, NULL, NULL, lcd_scroll_step), | 1329 | UNIT_PIXEL, 1, LCD_WIDTH, 1, NULL, NULL, lcd_scroll_step), |
1324 | INT_SETTING(F_PADTITLE, screen_scroll_step, LANG_SCREEN_SCROLL_STEP, 16, | 1330 | INT_SETTING(F_PADTITLE, screen_scroll_step, LANG_SCREEN_SCROLL_STEP, 16, |
@@ -1415,9 +1421,11 @@ const struct settings_list settings[] = { | |||
1415 | OFFON_SETTING(0,playlist_viewer_indices,LANG_SHOW_INDICES,true, | 1421 | OFFON_SETTING(0,playlist_viewer_indices,LANG_SHOW_INDICES,true, |
1416 | "playlist viewer indices",NULL), | 1422 | "playlist viewer indices",NULL), |
1417 | CHOICE_SETTING(0, playlist_viewer_track_display, LANG_TRACK_DISPLAY, 0, | 1423 | CHOICE_SETTING(0, playlist_viewer_track_display, LANG_TRACK_DISPLAY, 0, |
1418 | "playlist viewer track display","track name,full path", | 1424 | "playlist viewer track display", |
1419 | NULL, 2, ID2P(LANG_DISPLAY_TRACK_NAME_ONLY), | 1425 | "track name,full path,title and album from tags,title from tags", |
1420 | ID2P(LANG_DISPLAY_FULL_PATH)), | 1426 | NULL, 4, ID2P(LANG_DISPLAY_TRACK_NAME_ONLY), |
1427 | ID2P(LANG_DISPLAY_FULL_PATH),ID2P(LANG_DISPLAY_TITLEALBUM_FROMTAGS), | ||
1428 | ID2P(LANG_DISPLAY_TITLE_FROMTAGS)), | ||
1421 | CHOICE_SETTING(0, recursive_dir_insert, LANG_RECURSE_DIRECTORY , RECURSE_ON, | 1429 | CHOICE_SETTING(0, recursive_dir_insert, LANG_RECURSE_DIRECTORY , RECURSE_ON, |
1422 | "recursive directory insert", off_on_ask, NULL , 3 , | 1430 | "recursive directory insert", off_on_ask, NULL , 3 , |
1423 | ID2P(LANG_OFF), ID2P(LANG_ON), ID2P(LANG_ASK)), | 1431 | ID2P(LANG_OFF), ID2P(LANG_ON), ID2P(LANG_ASK)), |
@@ -1852,7 +1860,7 @@ const struct settings_list settings[] = { | |||
1852 | true, "warn when erasing dynamic playlist",NULL), | 1860 | true, "warn when erasing dynamic playlist",NULL), |
1853 | OFFON_SETTING(0, keep_current_track_on_replace_playlist, LANG_KEEP_CURRENT_TRACK_ON_REPLACE, | 1861 | OFFON_SETTING(0, keep_current_track_on_replace_playlist, LANG_KEEP_CURRENT_TRACK_ON_REPLACE, |
1854 | true, "keep current track when replacing playlist",NULL), | 1862 | true, "keep current track when replacing playlist",NULL), |
1855 | OFFON_SETTING(0, show_shuffled_adding_options, LANG_SHOW_SHUFFLED_ADDING_OPTIONS, false, | 1863 | OFFON_SETTING(0, show_shuffled_adding_options, LANG_SHOW_SHUFFLED_ADDING_OPTIONS, true, |
1856 | "show shuffled adding options", NULL), | 1864 | "show shuffled adding options", NULL), |
1857 | CHOICE_SETTING(0, show_queue_options, LANG_SHOW_QUEUE_OPTIONS, 0, | 1865 | CHOICE_SETTING(0, show_queue_options, LANG_SHOW_QUEUE_OPTIONS, 0, |
1858 | "show queue options", "off,on,in submenu", | 1866 | "show queue options", "off,on,in submenu", |