len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-28 08:16:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mpegplayer loose ends: Move gray_release to the exit routine where it should be. All gray handling is on CPU except frame rendering.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15979 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2007-12-29 22:12:10 +00:00
parent b08409ee40
commit 3b1f61a1ff
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/plugins/mpegplayer/stream_mgr.c
View file

@ -1024,6 +1024,7 @@ int stream_init(void)
if (grayscales < 33 || (ssize_t)memsize <= 0) if (grayscales < 33 || (ssize_t)memsize <= 0)
{ {
rb->splash(HZ, "graylib init failed!"); rb->splash(HZ, "graylib init failed!");
stream_mgr.graymem = NULL;
return STREAM_ERROR; return STREAM_ERROR;
} }
#endif /* !HAVE_LCD_COLOR */ #endif /* !HAVE_LCD_COLOR */
@ -1093,4 +1094,9 @@ void stream_exit(void)
rb->thread_wait(stream_mgr.thread); rb->thread_wait(stream_mgr.thread);
stream_mgr.thread = NULL; stream_mgr.thread = NULL;
} }
#ifndef HAVE_LCD_COLOR
if (stream_mgr.graymem != NULL)
gray_release();
#endif
} }

3
apps/plugins/mpegplayer/video_out_rockbox.c
View file

@ -398,7 +398,4 @@ bool vo_is_visible(void)
void vo_cleanup(void) void vo_cleanup(void)
{ {
vo.visible = false; vo.visible = false;
#ifndef HAVE_LCD_COLOR
gray_release();
#endif
} }

7
apps/plugins/mpegplayer/video_thread.c
View file

@ -1030,11 +1030,4 @@ void video_thread_exit(void)
IF_COP(invalidate_icache()); IF_COP(invalidate_icache());
video_str.thread = NULL; video_str.thread = NULL;
} }
else
{
/* Some things were done before thread creation */
#ifndef HAVE_LCD_COLOR
gray_release();
#endif
}
} }