summaryrefslogtreecommitdiffstats
path: root/apps/screen_access.c
diff options
context:
space:
mode:
authorKevin Ferrare <kevin@rockbox.org>2005-11-01 23:56:03 +0000
committerKevin Ferrare <kevin@rockbox.org>2005-11-01 23:56:03 +0000
commit4158ba1ff13d623ee32b91efedd4d1d2212543e4 (patch)
treecccb8c9a6080876bfed126604e1057e627368b1a /apps/screen_access.c
parent0b19487898b779b60de8f07ff1a52ef515b8d072 (diff)
downloadrockbox-4158ba1ff13d623ee32b91efedd4d1d2212543e4.tar.gz
rockbox-4158ba1ff13d623ee32b91efedd4d1d2212543e4.tar.bz2
rockbox-4158ba1ff13d623ee32b91efedd4d1d2212543e4.zip
Changed back the copyright's name in onplay.c (silly UTF-8, sorry Björn ! ), changed the internal multi-screen API a little bit, in a cleaner way
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7716 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/screen_access.c')
-rw-r--r--apps/screen_access.c34
1 files changed, 1 insertions, 33 deletions
diff --git a/apps/screen_access.c b/apps/screen_access.c
index 064464d59c..343aeddec8 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -144,32 +144,7 @@ void screen_init(struct screen * screen, enum screen_type screen_type)
#ifdef HAS_BUTTONBAR
screen->has_buttonbar=false;
#endif
- screen_update_nblines(screen);
-}
-
-/*
- * Returns the number of text lines that can be drawn on the given screen
- * with it's current font
- */
-void screen_update_nblines(struct screen * screen)
-{
-#ifdef HAVE_LCD_BITMAP
- int height=screen->height;
- if(global_settings.statusbar)
- height -= STATUSBAR_HEIGHT;
-#ifdef HAS_BUTTONBAR
- if(global_settings.buttonbar && screen->has_buttonbar)
- height -= BUTTONBAR_HEIGHT;
-#endif
- screen->getstringsize("A", &screen->char_width, &screen->char_height);
- screen->nb_lines = height / screen->char_height;
-#else
- screen->char_width=1;
- screen->char_height=1;
- /* default on char based player supported by rb */
- screen->nb_lines = MAX_LINES_ON_SCREEN;
-#endif
-
+ gui_textarea_update_nblines(screen);
}
void screen_access_init(void)
@@ -179,10 +154,3 @@ void screen_access_init(void)
screen_init(&screens[1], SCREEN_REMOTE);
#endif
}
-
-void screen_access_update_nb_lines(void)
-{
- int i;
- for(i=0;i<NB_SCREENS;++i)
- screen_update_nblines(&screens[i]);
-}