diff options
Diffstat (limited to 'apps/menus/display_menu.c')
-rw-r--r-- | apps/menus/display_menu.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index b7a44a3bb7..b4a3d3eb63 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -30,9 +30,7 @@ | |||
30 | #include "menu.h" | 30 | #include "menu.h" |
31 | #include "tree.h" | 31 | #include "tree.h" |
32 | #include "list.h" | 32 | #include "list.h" |
33 | #ifdef HAVE_LCD_BITMAP | ||
34 | #include "peakmeter.h" | 33 | #include "peakmeter.h" |
35 | #endif | ||
36 | #include "talk.h" | 34 | #include "talk.h" |
37 | #include "lcd.h" | 35 | #include "lcd.h" |
38 | #ifdef HAVE_REMOTE_LCD | 36 | #ifdef HAVE_REMOTE_LCD |
@@ -187,16 +185,12 @@ MENUITEM_SETTING(brightness_item, &global_settings.brightness, NULL); | |||
187 | #ifdef HAVE_LCD_CONTRAST | 185 | #ifdef HAVE_LCD_CONTRAST |
188 | MENUITEM_SETTING(contrast, &global_settings.contrast, NULL); | 186 | MENUITEM_SETTING(contrast, &global_settings.contrast, NULL); |
189 | #endif | 187 | #endif |
190 | #ifdef HAVE_LCD_BITMAP | ||
191 | #ifdef HAVE_LCD_INVERT | 188 | #ifdef HAVE_LCD_INVERT |
192 | MENUITEM_SETTING(invert, &global_settings.invert, NULL); | 189 | MENUITEM_SETTING(invert, &global_settings.invert, NULL); |
193 | #endif | 190 | #endif |
194 | #ifdef HAVE_LCD_FLIP | 191 | #ifdef HAVE_LCD_FLIP |
195 | MENUITEM_SETTING(flip_display, &global_settings.flip_display, flipdisplay_callback); | 192 | MENUITEM_SETTING(flip_display, &global_settings.flip_display, flipdisplay_callback); |
196 | #endif | 193 | #endif |
197 | #endif /* HAVE_LCD_BITMAP */ | ||
198 | |||
199 | |||
200 | 194 | ||
201 | /* now the actual menu */ | 195 | /* now the actual menu */ |
202 | MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), | 196 | MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), |
@@ -226,14 +220,12 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), | |||
226 | #ifdef HAVE_LCD_CONTRAST | 220 | #ifdef HAVE_LCD_CONTRAST |
227 | ,&contrast | 221 | ,&contrast |
228 | #endif | 222 | #endif |
229 | #ifdef HAVE_LCD_BITMAP | ||
230 | # ifdef HAVE_LCD_INVERT | 223 | # ifdef HAVE_LCD_INVERT |
231 | ,&invert | 224 | ,&invert |
232 | # endif | 225 | # endif |
233 | # ifdef HAVE_LCD_FLIP | 226 | # ifdef HAVE_LCD_FLIP |
234 | ,&flip_display | 227 | ,&flip_display |
235 | # endif | 228 | # endif |
236 | #endif /* HAVE_LCD_BITMAP */ | ||
237 | ); | 229 | ); |
238 | /* LCD MENU */ | 230 | /* LCD MENU */ |
239 | /***********************************/ | 231 | /***********************************/ |
@@ -318,10 +310,8 @@ MAKE_MENU(lcd_remote_settings, ID2P(LANG_LCD_REMOTE_MENU), | |||
318 | MENUITEM_SETTING_W_TEXT(scroll_speed, &global_settings.scroll_speed, | 310 | MENUITEM_SETTING_W_TEXT(scroll_speed, &global_settings.scroll_speed, |
319 | ID2P(LANG_SCROLL), NULL); | 311 | ID2P(LANG_SCROLL), NULL); |
320 | MENUITEM_SETTING(scroll_delay, &global_settings.scroll_delay, NULL); | 312 | MENUITEM_SETTING(scroll_delay, &global_settings.scroll_delay, NULL); |
321 | #ifdef HAVE_LCD_BITMAP | ||
322 | MENUITEM_SETTING_W_TEXT(scroll_step, &global_settings.scroll_step, | 313 | MENUITEM_SETTING_W_TEXT(scroll_step, &global_settings.scroll_step, |
323 | ID2P(LANG_SCROLL_STEP_EXAMPLE), NULL); | 314 | ID2P(LANG_SCROLL_STEP_EXAMPLE), NULL); |
324 | #endif | ||
325 | MENUITEM_SETTING(bidir_limit, &global_settings.bidir_limit, NULL); | 315 | MENUITEM_SETTING(bidir_limit, &global_settings.bidir_limit, NULL); |
326 | #ifdef HAVE_REMOTE_LCD | 316 | #ifdef HAVE_REMOTE_LCD |
327 | MENUITEM_SETTING_W_TEXT(remote_scroll_speed, &global_settings.remote_scroll_speed, | 317 | MENUITEM_SETTING_W_TEXT(remote_scroll_speed, &global_settings.remote_scroll_speed, |
@@ -342,7 +332,6 @@ MENUITEM_SETTING(list_accel_start_delay, | |||
342 | &global_settings.list_accel_start_delay, NULL); | 332 | &global_settings.list_accel_start_delay, NULL); |
343 | MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); | 333 | MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); |
344 | #endif /* HAVE_WHEEL_ACCELERATION */ | 334 | #endif /* HAVE_WHEEL_ACCELERATION */ |
345 | #ifdef HAVE_LCD_BITMAP | ||
346 | static int screenscroll_callback(int action, | 335 | static int screenscroll_callback(int action, |
347 | const struct menu_item_ex *this_item, | 336 | const struct menu_item_ex *this_item, |
348 | struct gui_synclist *this_list) | 337 | struct gui_synclist *this_list) |
@@ -360,21 +349,16 @@ static int screenscroll_callback(int action, | |||
360 | MENUITEM_SETTING(offset_out_of_view, &global_settings.offset_out_of_view, | 349 | MENUITEM_SETTING(offset_out_of_view, &global_settings.offset_out_of_view, |
361 | screenscroll_callback); | 350 | screenscroll_callback); |
362 | MENUITEM_SETTING(screen_scroll_step, &global_settings.screen_scroll_step, NULL); | 351 | MENUITEM_SETTING(screen_scroll_step, &global_settings.screen_scroll_step, NULL); |
363 | #endif | ||
364 | MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL); | 352 | MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL); |
365 | 353 | ||
366 | MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, | 354 | MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, |
367 | &scroll_speed, &scroll_delay, | 355 | &scroll_speed, &scroll_delay, |
368 | #ifdef HAVE_LCD_BITMAP | ||
369 | &scroll_step, | 356 | &scroll_step, |
370 | #endif | ||
371 | &bidir_limit, | 357 | &bidir_limit, |
372 | #ifdef HAVE_REMOTE_LCD | 358 | #ifdef HAVE_REMOTE_LCD |
373 | &remote_scroll_sets, | 359 | &remote_scroll_sets, |
374 | #endif | 360 | #endif |
375 | #ifdef HAVE_LCD_BITMAP | ||
376 | &offset_out_of_view, &screen_scroll_step, | 361 | &offset_out_of_view, &screen_scroll_step, |
377 | #endif | ||
378 | &scroll_paginated, | 362 | &scroll_paginated, |
379 | #ifndef HAVE_WHEEL_ACCELERATION | 363 | #ifndef HAVE_WHEEL_ACCELERATION |
380 | &list_accel_start_delay, &list_accel_wait | 364 | &list_accel_start_delay, &list_accel_wait |
@@ -386,7 +370,6 @@ MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, | |||
386 | /***********************************/ | 370 | /***********************************/ |
387 | /* PEAK METER MENU */ | 371 | /* PEAK METER MENU */ |
388 | 372 | ||
389 | #ifdef HAVE_LCD_BITMAP | ||
390 | static int peakmeter_callback(int action, | 373 | static int peakmeter_callback(int action, |
391 | const struct menu_item_ex *this_item, | 374 | const struct menu_item_ex *this_item, |
392 | struct gui_synclist *this_list) | 375 | struct gui_synclist *this_list) |
@@ -570,7 +553,6 @@ MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, | |||
570 | &histogram, | 553 | &histogram, |
571 | #endif | 554 | #endif |
572 | &peak_meter_scale_item, &peak_meter_min_item, &peak_meter_max_item); | 555 | &peak_meter_scale_item, &peak_meter_min_item, &peak_meter_max_item); |
573 | #endif /* HAVE_LCD_BITMAP */ | ||
574 | /* PEAK METER MENU */ | 556 | /* PEAK METER MENU */ |
575 | /***********************************/ | 557 | /***********************************/ |
576 | 558 | ||
@@ -645,9 +627,7 @@ MAKE_MENU(display_menu, ID2P(LANG_DISPLAY), | |||
645 | &lcd_remote_settings, | 627 | &lcd_remote_settings, |
646 | #endif | 628 | #endif |
647 | &scroll_settings_menu, | 629 | &scroll_settings_menu, |
648 | #ifdef HAVE_LCD_BITMAP | ||
649 | &peak_meter_menu, | 630 | &peak_meter_menu, |
650 | #endif | ||
651 | &codepage_setting, | 631 | &codepage_setting, |
652 | #ifdef HAVE_TOUCHSCREEN | 632 | #ifdef HAVE_TOUCHSCREEN |
653 | &touchscreen_menu, | 633 | &touchscreen_menu, |