summaryrefslogtreecommitdiffstats
path: root/apps/plugins/mpegplayer/mpegplayer.c
diff options
context:
space:
mode:
authorMichael Hohmuth <sideral@rockbox.org>2011-05-13 22:51:10 +0000
committerMichael Hohmuth <sideral@rockbox.org>2011-05-13 22:51:10 +0000
commit593d520a00a957a4138442a6771595ccb3387b07 (patch)
tree304b4a4411fa416b5366d88cdf5b4fbd68843359 /apps/plugins/mpegplayer/mpegplayer.c
parent4b5f68633f27324e05537d67f7e850be78c66731 (diff)
downloadrockbox-593d520a00a957a4138442a6771595ccb3387b07.tar.gz
rockbox-593d520a00a957a4138442a6771595ccb3387b07.tar.bz2
rockbox-593d520a00a957a4138442a6771595ccb3387b07.zip
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
Diffstat (limited to 'apps/plugins/mpegplayer/mpegplayer.c')
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c18
1 files changed, 9 insertions, 9 deletions
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);
- }
}
}
}