diff options
author | Peter D'Hoye <peter.dhoye@gmail.com> | 2007-10-15 19:29:33 +0000 |
---|---|---|
committer | Peter D'Hoye <peter.dhoye@gmail.com> | 2007-10-15 19:29:33 +0000 |
commit | 8714b75d2b4b4067370f1ea9520e0c48e7bfa63e (patch) | |
tree | c7fa85a48c4898716dad2fe101d73d55967f1414 /apps/plugins/mpegplayer/mpegplayer.c | |
parent | 3a5509a8d7829d731dd2c20a44588b8c15b2a540 (diff) | |
download | rockbox-8714b75d2b4b4067370f1ea9520e0c48e7bfa63e.tar.gz rockbox-8714b75d2b4b4067370f1ea9520e0c48e7bfa63e.zip |
Delay boosting and backlight on until after the menu selection is done. Fixes FS #7964. There remains an issue with the movie being loaded before the menu is shown.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15123 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer/mpegplayer.c')
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index ee0dfcf494..ea10411f3f 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -2299,18 +2299,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
2299 | rb->lcd_clear_display(); | 2299 | rb->lcd_clear_display(); |
2300 | rb->lcd_update(); | 2300 | rb->lcd_update(); |
2301 | 2301 | ||
2302 | /* Turn off backlight timeout */ | ||
2303 | backlight_force_on(rb); /* backlight control in lib/helper.c */ | ||
2304 | rb->talk_disable_menus(); | ||
2305 | |||
2306 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | ||
2307 | rb->cpu_boost(true); | ||
2308 | #endif | ||
2309 | |||
2310 | /* From this point on we've altered settings, colors, cpu_boost, etc. and | ||
2311 | cannot just return PLUGIN_ERROR - instead drop though to cleanup code | ||
2312 | */ | ||
2313 | |||
2314 | init_settings((char*)parameter); | 2302 | init_settings((char*)parameter); |
2315 | 2303 | ||
2316 | /* Initialise libmad */ | 2304 | /* Initialise libmad */ |
@@ -2332,6 +2320,18 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
2332 | start_time = 0; | 2320 | start_time = 0; |
2333 | else if ( start_time > (end_pts_time-start_pts_time) ) | 2321 | else if ( start_time > (end_pts_time-start_pts_time) ) |
2334 | start_time = (end_pts_time-start_pts_time); | 2322 | start_time = (end_pts_time-start_pts_time); |
2323 | |||
2324 | /* Turn off backlight timeout */ | ||
2325 | backlight_force_on(rb); /* backlight control in lib/helper.c */ | ||
2326 | rb->talk_disable_menus(); | ||
2327 | |||
2328 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | ||
2329 | rb->cpu_boost(true); | ||
2330 | #endif | ||
2331 | |||
2332 | /* From this point on we've altered settings, colors, cpu_boost, etc. and | ||
2333 | cannot just return PLUGIN_ERROR - instead drop though to cleanup code | ||
2334 | */ | ||
2335 | 2335 | ||
2336 | rb->splash(0, "Loading..."); | 2336 | rb->splash(0, "Loading..."); |
2337 | 2337 | ||