summaryrefslogtreecommitdiff
path: root/apps/plugins/mpegplayer/stream_mgr.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-12-29 22:12:10 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-12-29 22:12:10 +0000
commit3b1f61a1ff4297e9972b08797495c08dd0c22109 (patch)
tree7a155ab1c425b9a6aa09b3d333040151492c5bce /apps/plugins/mpegplayer/stream_mgr.c
parentb08409ee40947605382e30f51b2db901210bed1e (diff)
downloadrockbox-3b1f61a1ff4297e9972b08797495c08dd0c22109.tar.gz
rockbox-3b1f61a1ff4297e9972b08797495c08dd0c22109.zip
mpegplayer loose ends: Move gray_release to the exit routine where it should be. All gray handling is on CPU except frame rendering.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15979 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer/stream_mgr.c')
-rw-r--r--apps/plugins/mpegplayer/stream_mgr.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/plugins/mpegplayer/stream_mgr.c b/apps/plugins/mpegplayer/stream_mgr.c
index 00b96173b6..06f269ca31 100644
--- a/apps/plugins/mpegplayer/stream_mgr.c
+++ b/apps/plugins/mpegplayer/stream_mgr.c
@@ -1024,6 +1024,7 @@ int stream_init(void)
1024 if (grayscales < 33 || (ssize_t)memsize <= 0) 1024 if (grayscales < 33 || (ssize_t)memsize <= 0)
1025 { 1025 {
1026 rb->splash(HZ, "graylib init failed!"); 1026 rb->splash(HZ, "graylib init failed!");
1027 stream_mgr.graymem = NULL;
1027 return STREAM_ERROR; 1028 return STREAM_ERROR;
1028 } 1029 }
1029#endif /* !HAVE_LCD_COLOR */ 1030#endif /* !HAVE_LCD_COLOR */
@@ -1093,4 +1094,9 @@ void stream_exit(void)
1093 rb->thread_wait(stream_mgr.thread); 1094 rb->thread_wait(stream_mgr.thread);
1094 stream_mgr.thread = NULL; 1095 stream_mgr.thread = NULL;
1095 } 1096 }
1097
1098#ifndef HAVE_LCD_COLOR
1099 if (stream_mgr.graymem != NULL)
1100 gray_release();
1101#endif
1096} 1102}