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

ppmviewer/rockpaint: do not steal the audiobuffer (and stop playback) if the plugin buffer is large enough

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26750 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-06-10 19:46:14 +00:00
parent c75b713bef
commit 6c522624b3
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/plugins/ppmviewer.c
View file

@ -294,11 +294,17 @@ enum plugin_status plugin_start(const void* parameter)
if(!parameter) return PLUGIN_ERROR; if(!parameter) return PLUGIN_ERROR;
size_t buffer_size; size_t buffer_size;
char *audiobuf = rb->plugin_get_audio_buffer(&buffer_size); char *audiobuf = rb->plugin_get_buffer(&buffer_size);
if (buffer_size < PPM_MAXSIZE + LCD_WIDTH * LCD_HEIGHT + 1) if (buffer_size < PPM_MAXSIZE + LCD_WIDTH * LCD_HEIGHT + 1)
{ {
rb->splash(HZ, "Not enough memory"); /* steal from audiobuffer if plugin buffer is too small */
return PLUGIN_ERROR; audiobuf = rb->plugin_get_audio_buffer(&buffer_size);
if (buffer_size < PPM_MAXSIZE + LCD_WIDTH * LCD_HEIGHT + 1)
{
rb->splash(HZ, "Not enough memory");
return PLUGIN_ERROR;
}
} }
/* align on 16 bits */ /* align on 16 bits */

14
apps/plugins/rockpaint.c
View file

@ -3031,12 +3031,18 @@ static int save_bitmap( char *file )
enum plugin_status plugin_start(const void* parameter) enum plugin_status plugin_start(const void* parameter)
{ {
size_t buffer_size; size_t buffer_size;
buffer = (buf*) buffer = (buf*) (((uintptr_t)rb->plugin_get_buffer(&buffer_size) + 3) & ~3);
(((uintptr_t)rb->plugin_get_audio_buffer(&buffer_size) + 3) & ~3);
if (buffer_size < sizeof(*buffer) + 3) if (buffer_size < sizeof(*buffer) + 3)
{ {
rb->splash(HZ, "Not enough memory"); /* steal from audiobuffer if plugin buffer is too small */
return PLUGIN_ERROR; buffer = (buf*)
(((uintptr_t)rb->plugin_get_audio_buffer(&buffer_size) + 3) & ~3);
if (buffer_size < sizeof(*buffer) + 3)
{
rb->splash(HZ, "Not enough memory");
return PLUGIN_ERROR;
}
} }
rb->lcd_set_foreground(COLOR_WHITE); rb->lcd_set_foreground(COLOR_WHITE);