From fc865cb5a85d2c465159b64e459fbf4e02a8e987 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Thu, 12 Oct 2006 20:45:31 +0000 Subject: Revert change to screen_access.c (adding the native-bitmap drawing function) that caused warnings on the H3x0. We now draw the USB logo using the normal lcd_bitmap() and lcd_remote_bitmap() functions instead of the screens API, which doesn't handle the differing bitmaps types well. Remove apps/gui/logo.[ch] as they are now longer used. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11208 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/logo.c | 63 --------------------------------------------------------- apps/gui/logo.h | 43 --------------------------------------- 2 files changed, 106 deletions(-) delete mode 100644 apps/gui/logo.c delete mode 100644 apps/gui/logo.h (limited to 'apps/gui') diff --git a/apps/gui/logo.c b/apps/gui/logo.c deleted file mode 100644 index f1a4786137..0000000000 --- a/apps/gui/logo.c +++ /dev/null @@ -1,63 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include "logo.h" - -#ifdef HAVE_LCD_BITMAP - -#include -#if NB_SCREENS==2 -#include -#endif - -struct logo usb_logos[]= -{ - [SCREEN_MAIN]={usblogo, BMPWIDTH_usblogo, BMPHEIGHT_usblogo}, -#if NB_SCREENS==2 - [SCREEN_REMOTE]={remote_usblogo, BMPWIDTH_remote_usblogo, BMPHEIGHT_remote_usblogo} -#endif - -}; -#else -struct logo usb_logos[]= -{ - [SCREEN_MAIN]={"[USB Mode]"} -}; -#endif - -void gui_logo_draw(struct logo * logo, struct screen * display) -{ - display->clear_display(); - -#ifdef HAVE_LCD_BITMAP - /* Center bitmap on screen */ - display->bitmap(logo->bitmap, - display->width/2-logo->width/2, - display->height/2-logo->height/2, - logo->width, - logo->height); - display->update(); -#else - display->double_height(false); - display->puts_scroll(0, 0, logo->text); -#ifdef SIMULATOR - display->update(); -#endif /* SIMULATOR */ -#endif /* HAVE_LCD_BITMAP */ -} diff --git a/apps/gui/logo.h b/apps/gui/logo.h deleted file mode 100644 index 6bd6e20b19..0000000000 --- a/apps/gui/logo.h +++ /dev/null @@ -1,43 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2005 by Kevin Ferrare - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#ifndef _GUI_LOGO_H_ -#define _GUI_LOGO_H_ -#include "screen_access.h" - -struct logo{ -#ifdef HAVE_LCD_BITMAP - const fb_data* bitmap; - int width; - int height; -#else - const char * text; -#endif -}; - -extern struct logo usb_logos[]; - -/* - * Draws the given logo at the center of the given screen - * - logo : the logo - * - display : the screen to draw on - */ -void gui_logo_draw(struct logo * logo, struct screen * display); - -#endif /* _GUI_LOGO_H_ */ -- cgit v1.2.3