devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Make slideshow mode more slideshow: keep showing previous picture until next one is ready, just show a small progressbar to indicate loading

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11276 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Peter D'Hoye 2006-10-20 16:49:45 +00:00
parent e994774bde
commit 167a9364a0
1 changed files with 59 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

32
apps/plugins/jpeg.c
View file

@ -2340,10 +2340,20 @@ int scroll_bmp(struct t_disp* pdisp)
void cb_progess(int current, int total) void cb_progess(int current, int total)
{ {
rb->yield(); /* be nice to the other threads */ rb->yield(); /* be nice to the other threads */
if(slideshow_enabled)
{
/* in slideshow mode, keep gui interference to a minimum */
rb->scrollbar(0, LCD_HEIGHT-4, LCD_WIDTH, 4, total, 0,
current, HORIZONTAL);
rb->lcd_update_rect(0, LCD_HEIGHT-4, LCD_WIDTH, 4);
}
else
{
rb->scrollbar(0, LCD_HEIGHT-8, LCD_WIDTH, 8, total, 0, rb->scrollbar(0, LCD_HEIGHT-8, LCD_WIDTH, 8, total, 0,
current, HORIZONTAL); current, HORIZONTAL);
rb->lcd_update_rect(0, LCD_HEIGHT-8, LCD_WIDTH, 8); rb->lcd_update_rect(0, LCD_HEIGHT-8, LCD_WIDTH, 8);
} }
}
int jpegmem(struct jpeg *p_jpg, int ds) int jpegmem(struct jpeg *p_jpg, int ds)
{ {
@ -2449,10 +2459,13 @@ struct t_disp* get_image(struct jpeg* p_jpg, int ds)
buf += size; buf += size;
buf_size -= size; buf_size -= size;
if(!slideshow_enabled)
{
rb->snprintf(print, sizeof(print), "decoding %d*%d", rb->snprintf(print, sizeof(print), "decoding %d*%d",
p_jpg->x_size/ds, p_jpg->y_size/ds); p_jpg->x_size/ds, p_jpg->y_size/ds);
rb->lcd_puts(0, 3, print); rb->lcd_puts(0, 3, print);
rb->lcd_update(); rb->lcd_update();
}
/* update image properties */ /* update image properties */
p_disp->width = p_jpg->x_size / ds; p_disp->width = p_jpg->x_size / ds;
@ -2475,10 +2488,14 @@ struct t_disp* get_image(struct jpeg* p_jpg, int ds)
return NULL; return NULL;
} }
time = *rb->current_tick - time; time = *rb->current_tick - time;
if(!slideshow_enabled)
{
rb->snprintf(print, sizeof(print), " %d.%02d sec ", time/HZ, time%HZ); rb->snprintf(print, sizeof(print), " %d.%02d sec ", time/HZ, time%HZ);
rb->lcd_getstringsize(print, &w, &h); /* centered in progress bar */ rb->lcd_getstringsize(print, &w, &h); /* centered in progress bar */
rb->lcd_putsxy((LCD_WIDTH - w)/2, LCD_HEIGHT - h, print); rb->lcd_putsxy((LCD_WIDTH - w)/2, LCD_HEIGHT - h, print);
rb->lcd_update(); rb->lcd_update();
}
return p_disp; return p_disp;
} }
@ -2611,6 +2628,8 @@ int load_and_show(char* filename)
} }
} }
if(!slideshow_enabled)
{
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
rb->lcd_set_foreground(LCD_WHITE); rb->lcd_set_foreground(LCD_WHITE);
rb->lcd_set_background(LCD_BLACK); rb->lcd_set_background(LCD_BLACK);
@ -2624,14 +2643,17 @@ int load_and_show(char* filename)
rb->snprintf(print, sizeof(print), "loading %d bytes", filesize); rb->snprintf(print, sizeof(print), "loading %d bytes", filesize);
rb->lcd_puts(0, 1, print); rb->lcd_puts(0, 1, print);
rb->lcd_update(); rb->lcd_update();
}
rb->read(fd, buf_jpeg, filesize); rb->read(fd, buf_jpeg, filesize);
rb->close(fd); rb->close(fd);
if(!slideshow_enabled)
{
rb->snprintf(print, sizeof(print), "decoding markers"); rb->snprintf(print, sizeof(print), "decoding markers");
rb->lcd_puts(0, 2, print); rb->lcd_puts(0, 2, print);
rb->lcd_update(); rb->lcd_update();
}
rb->memset(&jpg, 0, sizeof(jpg)); /* clear info struct */ rb->memset(&jpg, 0, sizeof(jpg)); /* clear info struct */
@ -2649,10 +2671,12 @@ int load_and_show(char* filename)
default_huff_tbl(&jpg); /* use default */ default_huff_tbl(&jpg); /* use default */
build_lut(&jpg); /* derive Huffman and other lookup-tables */ build_lut(&jpg); /* derive Huffman and other lookup-tables */
if(!slideshow_enabled)
{
rb->snprintf(print, sizeof(print), "image %dx%d", jpg.x_size, jpg.y_size); rb->snprintf(print, sizeof(print), "image %dx%d", jpg.x_size, jpg.y_size);
rb->lcd_puts(0, 2, print); rb->lcd_puts(0, 2, print);
rb->lcd_update(); rb->lcd_update();
}
ds_max = max_downscale(&jpg); /* check display constraint */ ds_max = max_downscale(&jpg); /* check display constraint */
ds_min = min_downscale(&jpg, buf_size); /* check memory constraint */ ds_min = min_downscale(&jpg, buf_size); /* check memory constraint */
if (ds_min == 0) if (ds_min == 0)
@ -2674,11 +2698,13 @@ int load_and_show(char* filename)
set_view(p_disp, cx, cy); set_view(p_disp, cx, cy);
if(!slideshow_enabled)
{
rb->snprintf(print, sizeof(print), "showing %dx%d", rb->snprintf(print, sizeof(print), "showing %dx%d",
p_disp->width, p_disp->height); p_disp->width, p_disp->height);
rb->lcd_puts(0, 3, print); rb->lcd_puts(0, 3, print);
rb->lcd_update(); rb->lcd_update();
}
MYLCD(clear_display)(); MYLCD(clear_display)();
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
yuv_bitmap_part( yuv_bitmap_part(