Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed the scroll_delay.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3062 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Kjell Ericson 2003-01-10 12:23:36 +00:00
parent f2feb0a5d0
commit dc88e23700
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
firmware/drivers/lcd-player.c
View file

@ -69,16 +69,15 @@ struct scrollinfo {
int startx; int startx;
int starty; int starty;
int space; int space;
long scroll_start_tick;
}; };
static void scroll_thread(void); static void scroll_thread(void);
static char scroll_stack[DEFAULT_STACK_SIZE]; static char scroll_stack[DEFAULT_STACK_SIZE];
static char scroll_name[] = "scroll"; static char scroll_name[] = "scroll";
static char scroll_speed = 8; /* updates per second */ static char scroll_speed = 8; /* updates per second */
static char scroll_delay = HZ/2; /* delay before starting scroll */ static int scroll_delay = HZ/2; /* delay before starting scroll */
static char scroll_spacing = 3; /* spaces between end and start of text */ static char scroll_spacing = 3; /* spaces between end and start of text */
static long scroll_start_tick;
static struct scrollinfo scroll[SCROLLABLE_LINES]; static struct scrollinfo scroll[SCROLLABLE_LINES];
@ -447,7 +446,6 @@ void lcd_puts_scroll(int x, int y, unsigned char* string )
struct scrollinfo* s; struct scrollinfo* s;
DEBUGF("lcd_puts_scroll(%d, %d, %s)\n", x, y, string); DEBUGF("lcd_puts_scroll(%d, %d, %s)\n", x, y, string);
scroll_start_tick = current_tick + scroll_delay;
s = &scroll[y]; s = &scroll[y];
@ -458,6 +456,7 @@ void lcd_puts_scroll(int x, int y, unsigned char* string )
if ( s->textlen > s->space ) { if ( s->textlen > s->space ) {
s->mode = SCROLL_MODE_RUN; s->mode = SCROLL_MODE_RUN;
s->scroll_start_tick = current_tick + scroll_delay;
s->offset=s->space; s->offset=s->space;
s->startx=x; s->startx=x;
s->starty=y; s->starty=y;
@ -468,7 +467,8 @@ void lcd_puts_scroll(int x, int y, unsigned char* string )
s->space > (int)sizeof s->line ? s->space > (int)sizeof s->line ?
(int)sizeof s->line : s->space ); (int)sizeof s->line : s->space );
s->line[sizeof s->line - 1] = 0; s->line[sizeof s->line - 1] = 0;
} } else
s->mode = SCROLL_MODE_OFF;
} }
void lcd_stop_scroll(void) void lcd_stop_scroll(void)
@ -532,8 +532,6 @@ void lcd_scroll_resume(void)
struct scrollinfo* s; struct scrollinfo* s;
int index; int index;
scroll_start_tick = current_tick + scroll_delay;
for ( index = 0; index < SCROLLABLE_LINES; index++ ) { for ( index = 0; index < SCROLLABLE_LINES; index++ ) {
s = &scroll[index]; s = &scroll[index];
if ( s->mode == SCROLL_MODE_PAUSE ) { if ( s->mode == SCROLL_MODE_PAUSE ) {
@ -546,8 +544,6 @@ void lcd_scroll_resume_line(int line)
{ {
struct scrollinfo* s; struct scrollinfo* s;
scroll_start_tick = current_tick + scroll_delay;
s = &scroll[line]; s = &scroll[line];
if (s->mode == SCROLL_MODE_PAUSE ) { if (s->mode == SCROLL_MODE_PAUSE ) {
s->mode = SCROLL_MODE_RUN; s->mode = SCROLL_MODE_RUN;
@ -562,6 +558,7 @@ void lcd_scroll_speed(int speed)
void lcd_scroll_delay(int ms) void lcd_scroll_delay(int ms)
{ {
scroll_delay = ms / (HZ / 10); scroll_delay = ms / (HZ / 10);
DEBUGF("scroll_delay=%d (ms=%d, HZ=%d)\n", scroll_delay, ms, HZ);
} }
static void scroll_thread(void) static void scroll_thread(void)
{ {
@ -575,18 +572,14 @@ static void scroll_thread(void)
scroll[index].mode = SCROLL_MODE_OFF; scroll[index].mode = SCROLL_MODE_OFF;
} }
scroll_start_tick = current_tick;
while ( 1 ) { while ( 1 ) {
update = false; update = false;
/* wait 0.5s before starting scroll */ for ( index = 0; index < SCROLLABLE_LINES; index++ ) {
if ( TIME_AFTER(current_tick, scroll_start_tick) ) { s = &scroll[index];
if ( s->mode == SCROLL_MODE_RUN ) {
for ( index = 0; index < SCROLLABLE_LINES; index++ ) { if ( TIME_AFTER(current_tick, s->scroll_start_tick) ) {
s = &scroll[index];
if ( s->mode == SCROLL_MODE_RUN ) {
update = true; update = true;
for ( i = 0; i < s->space - 1; i++ ) for ( i = 0; i < s->space - 1; i++ )