diff options
Diffstat (limited to 'apps/plugins/jpeg.c')
-rw-r--r-- | apps/plugins/jpeg.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index f04d704b2e..55eade1228 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | #include "plugin.h" | 27 | #include "plugin.h" |
28 | #include "playback_control.h" | 28 | #include "playback_control.h" |
29 | #include "oldmenuapi.h" | ||
29 | 30 | ||
30 | #ifdef HAVE_LCD_BITMAP | 31 | #ifdef HAVE_LCD_BITMAP |
31 | #include "gray.h" | 32 | #include "gray.h" |
@@ -2415,10 +2416,10 @@ static void display_options(void) | |||
2415 | { "Dithering", set_option_dithering }, | 2416 | { "Dithering", set_option_dithering }, |
2416 | }; | 2417 | }; |
2417 | 2418 | ||
2418 | int m = rb->menu_init(items, ARRAYLEN(items), | 2419 | int m = menu_init(rb, items, ARRAYLEN(items), |
2419 | NULL, NULL, NULL, NULL); | 2420 | NULL, NULL, NULL, NULL); |
2420 | rb->menu_run(m); | 2421 | menu_run(m); |
2421 | rb->menu_exit(m); | 2422 | menu_exit(m); |
2422 | } | 2423 | } |
2423 | #endif /* HAVE_LCD_COLOR */ | 2424 | #endif /* HAVE_LCD_COLOR */ |
2424 | 2425 | ||
@@ -2490,14 +2491,14 @@ int show_menu(void) /* return 1 to quit */ | |||
2490 | { "20 seconds", -1 }, | 2491 | { "20 seconds", -1 }, |
2491 | }; | 2492 | }; |
2492 | 2493 | ||
2493 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), | 2494 | m = menu_init(rb, items, sizeof(items) / sizeof(*items), |
2494 | NULL, NULL, NULL, NULL); | 2495 | NULL, NULL, NULL, NULL); |
2495 | result=rb->menu_show(m); | 2496 | result=menu_show(m); |
2496 | 2497 | ||
2497 | switch (result) | 2498 | switch (result) |
2498 | { | 2499 | { |
2499 | case MIID_QUIT: | 2500 | case MIID_QUIT: |
2500 | rb->menu_exit(m); | 2501 | menu_exit(m); |
2501 | return 1; | 2502 | return 1; |
2502 | break; | 2503 | break; |
2503 | case MIID_TOGGLE_SS_MODE: | 2504 | case MIID_TOGGLE_SS_MODE: |
@@ -2561,7 +2562,7 @@ int show_menu(void) /* return 1 to quit */ | |||
2561 | rb->lcd_set_background(LCD_BLACK); | 2562 | rb->lcd_set_background(LCD_BLACK); |
2562 | #endif | 2563 | #endif |
2563 | rb->lcd_clear_display(); | 2564 | rb->lcd_clear_display(); |
2564 | rb->menu_exit(m); | 2565 | menu_exit(m); |
2565 | return 0; | 2566 | return 0; |
2566 | } | 2567 | } |
2567 | /* interactively scroll around the image */ | 2568 | /* interactively scroll around the image */ |