From 055303ad7d3b7fd4de58009d1b54be60f535c480 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 22 Jun 2005 20:40:35 +0000 Subject: [PATCH] rip out all the LCD junk from the codec API git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6821 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs.c | 53 ---------------------------------- apps/codecs.h | 60 --------------------------------------- apps/codecs/lib/xxx2wav.c | 3 +- 3 files changed, 2 insertions(+), 114 deletions(-) diff --git a/apps/codecs.c b/apps/codecs.c index 05f835e193..e0d785bda7 100644 --- a/apps/codecs.c +++ b/apps/codecs.c @@ -24,7 +24,6 @@ #include #include "debug.h" #include "button.h" -#include "lcd.h" #include "dir.h" #include "file.h" #include "kernel.h" @@ -51,12 +50,6 @@ #include "pcm_playback.h" #endif -#ifdef HAVE_LCD_BITMAP -#include "peakmeter.h" -#include "widgets.h" -#include "bmp.h" -#endif - #ifdef SIMULATOR #if CONFIG_HWCODEC == MASNONE static unsigned char codecbuf[CODEC_BUFFER_SIZE]; @@ -96,49 +89,6 @@ const struct codec_api ci = { NULL, NULL, - /* lcd */ - lcd_clear_display, - lcd_puts, - lcd_puts_scroll, - lcd_stop_scroll, - lcd_set_contrast, -#ifdef HAVE_LCD_CHARCELLS - lcd_define_pattern, - lcd_get_locked_pattern, - lcd_unlock_pattern, - lcd_putc, - lcd_put_cursor, - lcd_remove_cursor, - PREFIX(lcd_icon), -#else - lcd_putsxy, - lcd_puts_style, - lcd_puts_scroll_style, - lcd_bitmap, - lcd_drawline, - lcd_clearline, - lcd_drawpixel, - lcd_clearpixel, - lcd_setfont, - font_get, - lcd_clearrect, - lcd_fillrect, - lcd_drawrect, - lcd_invertrect, - lcd_getstringsize, - lcd_update, - lcd_update_rect, - scrollbar, - checkbox, - &lcd_framebuffer[0][0], - lcd_blit, -#ifndef SIMULATOR - lcd_roll, -#endif -#endif - backlight_on, - backlight_off, - backlight_set_timeout, splash, /* file */ @@ -282,9 +232,6 @@ const struct codec_api ci = { peak_meter_set_use_dbfs, peak_meter_get_use_dbfs, #endif -#ifdef HAVE_LCD_BITMAP - read_bmp_file, -#endif /* new stuff at the end, sort into place next time the API gets incompatible */ diff --git a/apps/codecs.h b/apps/codecs.h index ac5265c57c..59de3ecde7 100644 --- a/apps/codecs.h +++ b/apps/codecs.h @@ -39,7 +39,6 @@ #include "button.h" #include "font.h" #include "system.h" -#include "lcd.h" #include "id3.h" #include "mpeg.h" #include "audio.h" @@ -50,15 +49,8 @@ #include "settings.h" #include "thread.h" #include "playlist.h" -#ifdef HAVE_LCD_BITMAP -#include "widgets.h" -#endif #include "sound.h" -#ifdef HAVE_REMOTE_LCD -#include "lcd-remote.h" -#endif - #ifdef CODEC #if defined(DEBUG) || defined(SIMULATOR) @@ -177,54 +169,6 @@ struct codec_api { /* Configure different codec buffer parameters. */ void (*configure)(int setting, void *value); - - /* lcd */ - void (*lcd_clear_display)(void); - void (*lcd_puts)(int x, int y, const unsigned char *string); - void (*lcd_puts_scroll)(int x, int y, const unsigned char* string); - void (*lcd_stop_scroll)(void); - void (*lcd_set_contrast)(int x); -#ifdef HAVE_LCD_CHARCELLS - void (*lcd_define_pattern)(int which,const char *pattern); - unsigned char (*lcd_get_locked_pattern)(void); - void (*lcd_unlock_pattern)(unsigned char pat); - void (*lcd_putc)(int x, int y, unsigned short ch); - void (*lcd_put_cursor)(int x, int y, char cursor_char); - void (*lcd_remove_cursor)(void); - void (*PREFIX(lcd_icon))(int icon, bool enable); -#else - void (*lcd_putsxy)(int x, int y, const unsigned char *string); - void (*lcd_puts_style)(int x, int y, const unsigned char *str, int style); - void (*lcd_puts_scroll_style)(int x, int y, const unsigned char* string, - int style); - void (*lcd_bitmap)(const unsigned char *src, int x, int y, - int nx, int ny, bool clear); - void (*lcd_drawline)(int x1, int y1, int x2, int y2); - void (*lcd_clearline)(int x1, int y1, int x2, int y2); - void (*lcd_drawpixel)(int x, int y); - void (*lcd_clearpixel)(int x, int y); - void (*lcd_setfont)(int font); - struct font* (*font_get)(int font); - void (*lcd_clearrect)(int x, int y, int nx, int ny); - void (*lcd_fillrect)(int x, int y, int nx, int ny); - void (*lcd_drawrect)(int x, int y, int nx, int ny); - void (*lcd_invertrect)(int x, int y, int nx, int ny); - int (*lcd_getstringsize)(const unsigned char *str, int *w, int *h); - void (*lcd_update)(void); - void (*lcd_update_rect)(int x, int y, int width, int height); - void (*scrollbar)(int x, int y, int width, int height, int items, - int min_shown, int max_shown, int orientation); - void (*checkbox)(int x, int y, int width, int height, bool checked); - unsigned char* lcd_framebuffer; - void (*lcd_blit) (const unsigned char* p_data, int x, int y, int width, - int height, int stride); -#ifndef SIMULATOR - void (*lcd_roll)(int pixels); -#endif -#endif - void (*backlight_on)(void); - void (*backlight_off)(void); - void (*backlight_set_timeout)(int index); void (*splash)(int ticks, bool center, const char *fmt, ...); /* file */ @@ -377,10 +321,6 @@ struct codec_api { void (*peak_meter_set_use_dbfs)(int use); int (*peak_meter_get_use_dbfs)(void); #endif -#ifdef HAVE_LCD_BITMAP - int (*read_bmp_file)(char* filename, int *get_width, int *get_height, - char *bitmap, int maxsize); -#endif /* new stuff at the end, sort into place next time the API gets incompatible */ diff --git a/apps/codecs/lib/xxx2wav.c b/apps/codecs/lib/xxx2wav.c index 1bc1837f39..1323e07475 100644 --- a/apps/codecs/lib/xxx2wav.c +++ b/apps/codecs/lib/xxx2wav.c @@ -112,6 +112,8 @@ void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, con local_rb->qsort(base,nmemb,size,compar); } +#if 0 + void display_status(file_info_struct* file_info) { char s[32]; unsigned long ticks_taken; @@ -149,7 +151,6 @@ void display_status(file_info_struct* file_info) { } } -#if 0 static unsigned char wav_header[44]={'R','I','F','F', // 0 - ChunkID 0,0,0,0, // 4 - ChunkSize (filesize-8) 'W','A','V','E', // 8 - Format