diff options
Diffstat (limited to 'apps/plugins/jpeg.c')
-rw-r--r-- | apps/plugins/jpeg.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index 7d8fab7456..c601712b11 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -33,10 +33,12 @@ | |||
33 | #if CONFIG_KEYPAD == RECORDER_PAD | 33 | #if CONFIG_KEYPAD == RECORDER_PAD |
34 | #define JPEG_ZOOM_IN BUTTON_PLAY | 34 | #define JPEG_ZOOM_IN BUTTON_PLAY |
35 | #define JPEG_ZOOM_OUT BUTTON_ON | 35 | #define JPEG_ZOOM_OUT BUTTON_ON |
36 | |||
36 | #elif CONFIG_KEYPAD == ONDIO_PAD | 37 | #elif CONFIG_KEYPAD == ONDIO_PAD |
37 | #define JPEG_ZOOM_PRE BUTTON_MENU | 38 | #define JPEG_ZOOM_PRE BUTTON_MENU |
38 | #define JPEG_ZOOM_IN (BUTTON_MENU | BUTTON_REL) | 39 | #define JPEG_ZOOM_IN (BUTTON_MENU | BUTTON_REL) |
39 | #define JPEG_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT) | 40 | #define JPEG_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT) |
41 | |||
40 | #endif | 42 | #endif |
41 | 43 | ||
42 | /******************************* Globals ***********************************/ | 44 | /******************************* Globals ***********************************/ |
@@ -1527,10 +1529,6 @@ int scroll_bmp(struct t_disp* pdisp) | |||
1527 | 1529 | ||
1528 | button = rb->button_get(true); | 1530 | button = rb->button_get(true); |
1529 | 1531 | ||
1530 | if (rb->default_event_handler_ex(button, cleanup, NULL) | ||
1531 | == SYS_USB_CONNECTED) | ||
1532 | return PLUGIN_USB_CONNECTED; | ||
1533 | |||
1534 | switch(button) | 1532 | switch(button) |
1535 | { | 1533 | { |
1536 | case BUTTON_LEFT: | 1534 | case BUTTON_LEFT: |
@@ -1617,6 +1615,13 @@ int scroll_bmp(struct t_disp* pdisp) | |||
1617 | 1615 | ||
1618 | case BUTTON_OFF: | 1616 | case BUTTON_OFF: |
1619 | return PLUGIN_OK; | 1617 | return PLUGIN_OK; |
1618 | |||
1619 | default: | ||
1620 | if (rb->default_event_handler_ex(button, cleanup, NULL) | ||
1621 | == SYS_USB_CONNECTED) | ||
1622 | return PLUGIN_USB_CONNECTED; | ||
1623 | break; | ||
1624 | |||
1620 | } /* switch */ | 1625 | } /* switch */ |
1621 | 1626 | ||
1622 | if (button != BUTTON_NONE) | 1627 | if (button != BUTTON_NONE) |