diff options
author | Michael Hohmuth <sideral@rockbox.org> | 2011-05-13 22:51:10 +0000 |
---|---|---|
committer | Michael Hohmuth <sideral@rockbox.org> | 2011-05-13 22:51:10 +0000 |
commit | 593d520a00a957a4138442a6771595ccb3387b07 (patch) | |
tree | 304b4a4411fa416b5366d88cdf5b4fbd68843359 /apps/plugins/mpegplayer/mpegplayer.c | |
parent | 4b5f68633f27324e05537d67f7e850be78c66731 (diff) | |
download | rockbox-593d520a00a957a4138442a6771595ccb3387b07.tar.gz 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.c | 18 |
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) | |||
1723 | osd_backlight_on_video_mode(false); | 1723 | osd_backlight_on_video_mode(false); |
1724 | /* Leave brightness alone and restore it when OSD is hidden */ | 1724 | /* Leave brightness alone and restore it when OSD is hidden */ |
1725 | 1725 | ||
1726 | if (stream_can_seek() && rb->global_settings->pause_rewind) { | ||
1727 | stream_seek(-rb->global_settings->pause_rewind*TS_SECOND, | ||
1728 | SEEK_CUR); | ||
1729 | osd_schedule_refresh(OSD_REFRESH_VIDEO); | ||
1730 | /* Update time display now */ | ||
1731 | osd_update_time(); | ||
1732 | osd_refresh(OSD_REFRESH_TIME); | ||
1733 | } | ||
1734 | |||
1726 | return status; | 1735 | return status; |
1727 | } | 1736 | } |
1728 | 1737 | ||
@@ -1922,15 +1931,6 @@ static void osd_handle_phone_plug(bool inserted) | |||
1922 | osd_pause(); | 1931 | osd_pause(); |
1923 | 1932 | ||
1924 | osd_set_hp_pause_flag(true); | 1933 | osd_set_hp_pause_flag(true); |
1925 | |||
1926 | if (stream_can_seek() && rb->global_settings->unplug_rw) { | ||
1927 | stream_seek(-rb->global_settings->unplug_rw*TS_SECOND, | ||
1928 | SEEK_CUR); | ||
1929 | osd_schedule_refresh(OSD_REFRESH_VIDEO); | ||
1930 | /* Update time display now */ | ||
1931 | osd_update_time(); | ||
1932 | osd_refresh(OSD_REFRESH_TIME); | ||
1933 | } | ||
1934 | } | 1934 | } |
1935 | } | 1935 | } |
1936 | } | 1936 | } |