diff options
Diffstat (limited to 'apps/settings.h')
-rw-r--r-- | apps/settings.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/apps/settings.h b/apps/settings.h index 3d3939695c..405a31d052 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -286,9 +286,7 @@ struct system_status | |||
286 | signed char last_screen; | 286 | signed char last_screen; |
287 | int viewer_icon_count; | 287 | int viewer_icon_count; |
288 | int last_volume_change; /* tick the last volume change happened. skins use this */ | 288 | int last_volume_change; /* tick the last volume change happened. skins use this */ |
289 | #ifdef HAVE_LCD_BITMAP | ||
290 | int font_id[NB_SCREENS]; /* font id of the settings font for each screen */ | 289 | int font_id[NB_SCREENS]; /* font id of the settings font for each screen */ |
291 | #endif | ||
292 | 290 | ||
293 | }; | 291 | }; |
294 | 292 | ||
@@ -494,9 +492,7 @@ struct user_settings | |||
494 | int peak_meter_max; /* range maximum */ | 492 | int peak_meter_max; /* range maximum */ |
495 | 493 | ||
496 | unsigned char wps_file[MAX_FILENAME+1]; /* last wps */ | 494 | unsigned char wps_file[MAX_FILENAME+1]; /* last wps */ |
497 | #ifdef HAVE_LCD_BITMAP | ||
498 | unsigned char sbs_file[MAX_FILENAME+1]; /* last statusbar skin */ | 495 | unsigned char sbs_file[MAX_FILENAME+1]; /* last statusbar skin */ |
499 | #endif | ||
500 | #ifdef HAVE_REMOTE_LCD | 496 | #ifdef HAVE_REMOTE_LCD |
501 | unsigned char rwps_file[MAX_FILENAME+1]; /* last remote-wps */ | 497 | unsigned char rwps_file[MAX_FILENAME+1]; /* last remote-wps */ |
502 | unsigned char rsbs_file[MAX_FILENAME+1]; /* last remote statusbar skin */ | 498 | unsigned char rsbs_file[MAX_FILENAME+1]; /* last remote statusbar skin */ |
@@ -514,7 +510,6 @@ struct user_settings | |||
514 | int remote_statusbar; | 510 | int remote_statusbar; |
515 | #endif | 511 | #endif |
516 | 512 | ||
517 | #ifdef HAVE_LCD_BITMAP | ||
518 | int scrollbar; /* SCROLLBAR_* enum values */ | 513 | int scrollbar; /* SCROLLBAR_* enum values */ |
519 | int scrollbar_width; | 514 | int scrollbar_width; |
520 | 515 | ||
@@ -525,7 +520,6 @@ struct user_settings | |||
525 | int list_separator_height; /* -1=auto (== 1 currently), 0=disabled, X=height in pixels */ | 520 | int list_separator_height; /* -1=auto (== 1 currently), 0=disabled, X=height in pixels */ |
526 | int list_separator_color; | 521 | int list_separator_color; |
527 | #endif | 522 | #endif |
528 | #endif | ||
529 | /* goto current song when exiting WPS */ | 523 | /* goto current song when exiting WPS */ |
530 | bool browse_current; /* 1=goto current song, | 524 | bool browse_current; /* 1=goto current song, |
531 | 0=goto previous location */ | 525 | 0=goto previous location */ |
@@ -621,7 +615,6 @@ struct user_settings | |||
621 | int contrast; /* lcd contrast */ | 615 | int contrast; /* lcd contrast */ |
622 | #endif | 616 | #endif |
623 | 617 | ||
624 | #ifdef HAVE_LCD_BITMAP | ||
625 | #ifdef HAVE_LCD_INVERT | 618 | #ifdef HAVE_LCD_INVERT |
626 | bool invert; /* invert display */ | 619 | bool invert; /* invert display */ |
627 | #endif | 620 | #endif |
@@ -640,7 +633,6 @@ struct user_settings | |||
640 | unsigned char remote_font_file[MAX_FILENAME+1]; /* last font */ | 633 | unsigned char remote_font_file[MAX_FILENAME+1]; /* last font */ |
641 | #endif | 634 | #endif |
642 | unsigned char kbd_file[MAX_FILENAME+1]; /* last keyboard */ | 635 | unsigned char kbd_file[MAX_FILENAME+1]; /* last keyboard */ |
643 | #endif /* HAVE_LCD_BITMAP */ | ||
644 | int backlight_timeout; /* backlight off timeout: -1=never, | 636 | int backlight_timeout; /* backlight off timeout: -1=never, |
645 | 0=always, or time in seconds */ | 637 | 0=always, or time in seconds */ |
646 | bool caption_backlight; /* turn on backlight at end and start of track */ | 638 | bool caption_backlight; /* turn on backlight at end and start of track */ |
@@ -748,12 +740,10 @@ struct user_settings | |||
748 | bool usb_skip_first_drive; | 740 | bool usb_skip_first_drive; |
749 | #endif | 741 | #endif |
750 | 742 | ||
751 | #ifdef HAVE_LCD_BITMAP | ||
752 | unsigned char ui_vp_config[64]; /* viewport string for the lists */ | 743 | unsigned char ui_vp_config[64]; /* viewport string for the lists */ |
753 | #ifdef HAVE_REMOTE_LCD | 744 | #ifdef HAVE_REMOTE_LCD |
754 | unsigned char remote_ui_vp_config[64]; /* viewport string for the remote lists */ | 745 | unsigned char remote_ui_vp_config[64]; /* viewport string for the remote lists */ |
755 | #endif | 746 | #endif |
756 | #endif | ||
757 | 747 | ||
758 | struct compressor_settings compressor_settings; | 748 | struct compressor_settings compressor_settings; |
759 | 749 | ||