diff options
-rw-r--r-- | apps/plugin.c | 4 | ||||
-rw-r--r-- | apps/plugin.h | 8 | ||||
-rw-r--r-- | apps/plugins/text_viewer/tv_display.c | 5 |
3 files changed, 2 insertions, 15 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index a102c327d3..9c76aa3bac 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -719,10 +719,6 @@ static const struct plugin_api rockbox_api = { | |||
719 | 719 | ||
720 | rbversion, | 720 | rbversion, |
721 | 721 | ||
722 | #ifdef HAVE_LCD_BITMAP | ||
723 | sb_skin_get_info_vp, | ||
724 | #endif | ||
725 | |||
726 | /* new stuff at the end, sort into place next time | 722 | /* new stuff at the end, sort into place next time |
727 | the API gets incompatible */ | 723 | the API gets incompatible */ |
728 | }; | 724 | }; |
diff --git a/apps/plugin.h b/apps/plugin.h index d5a01684bd..b7cbf7e112 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -145,12 +145,12 @@ void* plugin_get_buffer(size_t *buffer_size); | |||
145 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ | 145 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ |
146 | 146 | ||
147 | /* increase this every time the api struct changes */ | 147 | /* increase this every time the api struct changes */ |
148 | #define PLUGIN_API_VERSION 189 | 148 | #define PLUGIN_API_VERSION 190 |
149 | 149 | ||
150 | /* update this to latest version if a change to the api struct breaks | 150 | /* update this to latest version if a change to the api struct breaks |
151 | backwards compatibility (and please take the opportunity to sort in any | 151 | backwards compatibility (and please take the opportunity to sort in any |
152 | new function which are "waiting" at the end of the function table) */ | 152 | new function which are "waiting" at the end of the function table) */ |
153 | #define PLUGIN_MIN_API_VERSION 189 | 153 | #define PLUGIN_MIN_API_VERSION 190 |
154 | 154 | ||
155 | /* plugin return codes */ | 155 | /* plugin return codes */ |
156 | enum plugin_status { | 156 | enum plugin_status { |
@@ -886,10 +886,6 @@ struct plugin_api { | |||
886 | 886 | ||
887 | const char *rbversion; | 887 | const char *rbversion; |
888 | 888 | ||
889 | #ifdef HAVE_LCD_BITMAP | ||
890 | struct viewport *(*sb_skin_get_info_vp)(enum screen_type screen); | ||
891 | #endif | ||
892 | |||
893 | /* new stuff at the end, sort into place next time | 889 | /* new stuff at the end, sort into place next time |
894 | the API gets incompatible */ | 890 | the API gets incompatible */ |
895 | }; | 891 | }; |
diff --git a/apps/plugins/text_viewer/tv_display.c b/apps/plugins/text_viewer/tv_display.c index 11f14034b5..4de62855f9 100644 --- a/apps/plugins/text_viewer/tv_display.c +++ b/apps/plugins/text_viewer/tv_display.c | |||
@@ -322,11 +322,6 @@ static void tv_change_viewport(void) | |||
322 | else | 322 | else |
323 | is_initialized_vp = true; | 323 | is_initialized_vp = true; |
324 | 324 | ||
325 | if (show_statusbar) | ||
326 | rb->memcpy(&vp_info, rb->sb_skin_get_info_vp(SCREEN_MAIN), sizeof(struct viewport)); | ||
327 | else | ||
328 | rb->viewport_set_defaults(&vp_info, SCREEN_MAIN); | ||
329 | |||
330 | rb->viewportmanager_theme_enable(SCREEN_MAIN, show_statusbar, &vp_info); | 325 | rb->viewportmanager_theme_enable(SCREEN_MAIN, show_statusbar, &vp_info); |
331 | vp_info.flags &= ~VP_FLAG_ALIGNMENT_MASK; | 326 | vp_info.flags &= ~VP_FLAG_ALIGNMENT_MASK; |
332 | display->set_viewport(&vp_info); | 327 | display->set_viewport(&vp_info); |