summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeruaki Kawashima <teru@rockbox.org>2010-07-12 13:38:40 +0000
committerTeruaki Kawashima <teru@rockbox.org>2010-07-12 13:38:40 +0000
commita874f77e1852867ab460ee89e28e0a14573d2318 (patch)
treef9c3df461ca1728c7730c594367a4efe22868885
parent64af2b3a16c1fc9968b50223b79321ca04cc53e4 (diff)
downloadrockbox-a874f77e1852867ab460ee89e28e0a14573d2318.zip
rockbox-a874f77e1852867ab460ee89e28e0a14573d2318.tar.gz
rockbox-a874f77e1852867ab460ee89e28e0a14573d2318.tar.bz2
rockbox-a874f77e1852867ab460ee89e28e0a14573d2318.tar.xz
text_viewer: remove unneeded code.
viewportmanager_theme_enable() sets values to passed viewport by viewport_set_defaults(), so no need to call sb_skin_get_info_vp() or viewport_set_defaults(). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27399 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugin.c4
-rw-r--r--apps/plugin.h8
-rw-r--r--apps/plugins/text_viewer/tv_display.c5
3 files changed, 2 insertions, 15 deletions
diff --git a/apps/plugin.c b/apps/plugin.c
index a102c32..9c76aa3 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -719,10 +719,6 @@ static const struct plugin_api rockbox_api = {
rbversion,
-#ifdef HAVE_LCD_BITMAP
- sb_skin_get_info_vp,
-#endif
-
/* new stuff at the end, sort into place next time
the API gets incompatible */
};
diff --git a/apps/plugin.h b/apps/plugin.h
index d5a0168..b7cbf7e 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -145,12 +145,12 @@ void* plugin_get_buffer(size_t *buffer_size);
#define PLUGIN_MAGIC 0x526F634B /* RocK */
/* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 189
+#define PLUGIN_API_VERSION 190
/* update this to latest version if a change to the api struct breaks
backwards compatibility (and please take the opportunity to sort in any
new function which are "waiting" at the end of the function table) */
-#define PLUGIN_MIN_API_VERSION 189
+#define PLUGIN_MIN_API_VERSION 190
/* plugin return codes */
enum plugin_status {
@@ -886,10 +886,6 @@ struct plugin_api {
const char *rbversion;
-#ifdef HAVE_LCD_BITMAP
- struct viewport *(*sb_skin_get_info_vp)(enum screen_type screen);
-#endif
-
/* new stuff at the end, sort into place next time
the API gets incompatible */
};
diff --git a/apps/plugins/text_viewer/tv_display.c b/apps/plugins/text_viewer/tv_display.c
index 11f1403..4de6285 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)
else
is_initialized_vp = true;
- if (show_statusbar)
- rb->memcpy(&vp_info, rb->sb_skin_get_info_vp(SCREEN_MAIN), sizeof(struct viewport));
- else
- rb->viewport_set_defaults(&vp_info, SCREEN_MAIN);
-
rb->viewportmanager_theme_enable(SCREEN_MAIN, show_statusbar, &vp_info);
vp_info.flags &= ~VP_FLAG_ALIGNMENT_MASK;
display->set_viewport(&vp_info);