From 593d520a00a957a4138442a6771595ccb3387b07 Mon Sep 17 00:00:00 2001 From: Michael Hohmuth Date: Fri, 13 May 2011 22:51:10 +0000 Subject: mpegplayer: Adapt to new pause_rewind setting and apply it for all kinds of pause, not just pause on headphone unplug. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29878 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/mpegplayer/mpegplayer.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 2a84307857..41f6b2e868 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -1723,6 +1723,15 @@ static int osd_pause(void) osd_backlight_on_video_mode(false); /* Leave brightness alone and restore it when OSD is hidden */ + if (stream_can_seek() && rb->global_settings->pause_rewind) { + stream_seek(-rb->global_settings->pause_rewind*TS_SECOND, + SEEK_CUR); + osd_schedule_refresh(OSD_REFRESH_VIDEO); + /* Update time display now */ + osd_update_time(); + osd_refresh(OSD_REFRESH_TIME); + } + return status; } @@ -1922,15 +1931,6 @@ static void osd_handle_phone_plug(bool inserted) osd_pause(); osd_set_hp_pause_flag(true); - - if (stream_can_seek() && rb->global_settings->unplug_rw) { - stream_seek(-rb->global_settings->unplug_rw*TS_SECOND, - SEEK_CUR); - osd_schedule_refresh(OSD_REFRESH_VIDEO); - /* Update time display now */ - osd_update_time(); - osd_refresh(OSD_REFRESH_TIME); - } } } } -- cgit v1.2.3