diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2005-05-08 13:03:57 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2005-05-08 13:03:57 +0000 |
| commit | ba4df32100c9363b501896331d2bfce84333a767 (patch) | |
| tree | eab93b16d62fd8bdbc539738b2c49c616270a467 | |
| parent | 2629071b253838c27f8f034aa7d1bead34ff8046 (diff) | |
| download | rockbox-ba4df32100c9363b501896331d2bfce84333a767.tar.gz rockbox-ba4df32100c9363b501896331d2bfce84333a767.zip | |
Removed more dead code; bugfix for cursor display in player simulator.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6429 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/drivers/lcd-player.c | 13 | ||||
| -rw-r--r-- | firmware/export/lcd.h | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/firmware/drivers/lcd-player.c b/firmware/drivers/lcd-player.c index 1b841b5848..c1657aa915 100644 --- a/firmware/drivers/lcd-player.c +++ b/firmware/drivers/lcd-player.c @@ -96,7 +96,6 @@ static char scroll_ticks = 12; /* # of ticks between updates */ static int scroll_delay = HZ/2; /* delay before starting scroll */ static int jump_scroll_delay = HZ/4; /* delay between jump scroll jumps */ static char scroll_spacing = 3; /* spaces between end and start of text */ -static bool allow_bidirectional_scrolling = true; static int bidir_limit = 50; /* percent */ static int jump_scroll = 0; /* 0=off, 1=once, ..., JUMP_SCROLL_ALWAYS */ @@ -700,12 +699,6 @@ void lcd_stop_scroll(void) lcd_update(); } - -void lcd_allow_bidirectional_scrolling(bool on) -{ - allow_bidirectional_scrolling=on; -} - static const char scroll_tick_table[16] = { /* Hz values: 1, 1.25, 1.55, 2, 2.5, 3.12, 4, 5, 6.25, 8.33, 10, 12.5, 16.7, 20, 25, 33 */ @@ -833,8 +826,14 @@ static void scroll_thread(void) cursor.textpos++; if (cursor.textpos>=cursor.len) cursor.textpos=0; +#ifdef SIMULATOR + lcdx_putc(cursor.x_pos, cursor.y_pos, + cursor.text[cursor.textpos]); + update=true; +#else update|=lcdx_putc(cursor.x_pos, cursor.y_pos, cursor.text[cursor.textpos]); +#endif } } if (update) { diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 98e2a58a53..c5dd4f7399 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h @@ -98,7 +98,6 @@ extern void lcd_jump_scroll (int mode); /* 0=off, 1=once, ..., ALWAYS */ extern void lcd_jump_scroll_delay( int ms ); unsigned char lcd_get_locked_pattern(void); void lcd_unlock_pattern(unsigned char pat); -void lcd_allow_bidirectional_scrolling(bool on); extern void lcd_bidir_scroll(int threshold); void lcd_put_cursor(int x, int y, char cursor_char); void lcd_remove_cursor(void); |