diff options
Diffstat (limited to 'apps/plugins/viewer.c')
-rw-r--r-- | apps/plugins/viewer.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index fd460e50e0..7e03c559f4 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -418,7 +418,6 @@ static unsigned char *screen_top_ptr; | |||
418 | static unsigned char *next_screen_ptr; | 418 | static unsigned char *next_screen_ptr; |
419 | static unsigned char *next_screen_to_draw_ptr; | 419 | static unsigned char *next_screen_to_draw_ptr; |
420 | static unsigned char *next_line_ptr; | 420 | static unsigned char *next_line_ptr; |
421 | static const struct plugin_api* rb; | ||
422 | #ifdef HAVE_LCD_BITMAP | 421 | #ifdef HAVE_LCD_BITMAP |
423 | static struct font *pf; | 422 | static struct font *pf; |
424 | #endif | 423 | #endif |
@@ -1451,7 +1450,7 @@ static bool viewer_options_menu(void) | |||
1451 | {"Scroll Mode", scroll_mode_setting}, | 1450 | {"Scroll Mode", scroll_mode_setting}, |
1452 | {"Auto-Scroll Speed", autoscroll_speed_setting }, | 1451 | {"Auto-Scroll Speed", autoscroll_speed_setting }, |
1453 | }; | 1452 | }; |
1454 | m = menu_init(rb, items, sizeof(items) / sizeof(*items), | 1453 | m = menu_init(items, sizeof(items) / sizeof(*items), |
1455 | NULL, NULL, NULL, NULL); | 1454 | NULL, NULL, NULL, NULL); |
1456 | 1455 | ||
1457 | result = menu_run(m); | 1456 | result = menu_run(m); |
@@ -1475,7 +1474,7 @@ static void viewer_menu(void) | |||
1475 | {"Return", NULL }, | 1474 | {"Return", NULL }, |
1476 | }; | 1475 | }; |
1477 | 1476 | ||
1478 | m = menu_init(rb, items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL); | 1477 | m = menu_init(items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL); |
1479 | result=menu_show(m); | 1478 | result=menu_show(m); |
1480 | switch (result) | 1479 | switch (result) |
1481 | { | 1480 | { |
@@ -1488,7 +1487,7 @@ static void viewer_menu(void) | |||
1488 | done = viewer_options_menu(); | 1487 | done = viewer_options_menu(); |
1489 | break; | 1488 | break; |
1490 | case 2: /* playback control */ | 1489 | case 2: /* playback control */ |
1491 | playback_control(rb, NULL); | 1490 | playback_control(NULL); |
1492 | break; | 1491 | break; |
1493 | case 3: /* return */ | 1492 | case 3: /* return */ |
1494 | break; | 1493 | break; |
@@ -1497,14 +1496,13 @@ static void viewer_menu(void) | |||
1497 | viewer_draw(col); | 1496 | viewer_draw(col); |
1498 | } | 1497 | } |
1499 | 1498 | ||
1500 | enum plugin_status plugin_start(const struct plugin_api* api, const void* file) | 1499 | enum plugin_status plugin_start(const void* file) |
1501 | { | 1500 | { |
1502 | int button, i, ok; | 1501 | int button, i, ok; |
1503 | int lastbutton = BUTTON_NONE; | 1502 | int lastbutton = BUTTON_NONE; |
1504 | bool autoscroll = false; | 1503 | bool autoscroll = false; |
1505 | long old_tick; | 1504 | long old_tick; |
1506 | 1505 | ||
1507 | rb = api; | ||
1508 | old_tick = *rb->current_tick; | 1506 | old_tick = *rb->current_tick; |
1509 | 1507 | ||
1510 | /* get the plugin buffer */ | 1508 | /* get the plugin buffer */ |