diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2007-12-29 22:12:10 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2007-12-29 22:12:10 +0000 |
commit | 3b1f61a1ff4297e9972b08797495c08dd0c22109 (patch) | |
tree | 7a155ab1c425b9a6aa09b3d333040151492c5bce /apps/plugins/mpegplayer | |
parent | b08409ee40947605382e30f51b2db901210bed1e (diff) | |
download | rockbox-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')
-rw-r--r-- | apps/plugins/mpegplayer/stream_mgr.c | 6 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/video_out_rockbox.c | 3 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/video_thread.c | 7 |
3 files changed, 6 insertions, 10 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 | } |
diff --git a/apps/plugins/mpegplayer/video_out_rockbox.c b/apps/plugins/mpegplayer/video_out_rockbox.c index d5e927e9f1..ff0d39eba6 100644 --- a/apps/plugins/mpegplayer/video_out_rockbox.c +++ b/apps/plugins/mpegplayer/video_out_rockbox.c | |||
@@ -398,7 +398,4 @@ bool vo_is_visible(void) | |||
398 | void vo_cleanup(void) | 398 | void vo_cleanup(void) |
399 | { | 399 | { |
400 | vo.visible = false; | 400 | vo.visible = false; |
401 | #ifndef HAVE_LCD_COLOR | ||
402 | gray_release(); | ||
403 | #endif | ||
404 | } | 401 | } |
diff --git a/apps/plugins/mpegplayer/video_thread.c b/apps/plugins/mpegplayer/video_thread.c index e69089d734..aeaf942058 100644 --- a/apps/plugins/mpegplayer/video_thread.c +++ b/apps/plugins/mpegplayer/video_thread.c | |||
@@ -1030,11 +1030,4 @@ void video_thread_exit(void) | |||
1030 | IF_COP(invalidate_icache()); | 1030 | IF_COP(invalidate_icache()); |
1031 | video_str.thread = NULL; | 1031 | video_str.thread = NULL; |
1032 | } | 1032 | } |
1033 | else | ||
1034 | { | ||
1035 | /* Some things were done before thread creation */ | ||
1036 | #ifndef HAVE_LCD_COLOR | ||
1037 | gray_release(); | ||
1038 | #endif | ||
1039 | } | ||
1040 | } | 1033 | } |