[vlc-commits] bluray: avoid passing invalid resume timestamps
Petri Hintukainen
git at videolan.org
Wed May 18 09:29:49 CEST 2016
vlc | branch: master | Petri Hintukainen <phintuka at gmail.com> | Tue May 17 13:53:03 2016 +0300| [1112a73d4534250dc7b6b9e74ed089b505afd0f7] | committer: Petri Hintukainen
bluray: avoid passing invalid resume timestamps
Timestamp should be PTS of currently showing video frame.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1112a73d4534250dc7b6b9e74ed089b505afd0f7
---
modules/access/bluray.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index aeb0d65..95ca783 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -1249,15 +1249,14 @@ static int onMouseEvent(vlc_object_t *p_vout, const char *psz_var, vlc_value_t o
{
demux_t *p_demux = (demux_t*)p_data;
demux_sys_t *p_sys = p_demux->p_sys;
- mtime_t now = mdate();
VLC_UNUSED(old);
VLC_UNUSED(p_vout);
if (psz_var[6] == 'm') //Mouse moved
- bd_mouse_select(p_sys->bluray, now, val.coords.x, val.coords.y);
+ bd_mouse_select(p_sys->bluray, -1, val.coords.x, val.coords.y);
else if (psz_var[6] == 'c') {
- bd_mouse_select(p_sys->bluray, now, val.coords.x, val.coords.y);
- bd_user_input(p_sys->bluray, now, BD_VK_MOUSE_ACTIVATE);
+ bd_mouse_select(p_sys->bluray, -1, val.coords.x, val.coords.y);
+ bd_user_input(p_sys->bluray, -1, BD_VK_MOUSE_ACTIVATE);
} else {
vlc_assert_unreachable();
}
@@ -1266,8 +1265,7 @@ static int onMouseEvent(vlc_object_t *p_vout, const char *psz_var, vlc_value_t o
static int sendKeyEvent(demux_sys_t *p_sys, unsigned int key)
{
- mtime_t now = mdate();
- if (bd_user_input(p_sys->bluray, now, key) < 0)
+ if (bd_user_input(p_sys->bluray, -1, key) < 0)
return VLC_EGENERIC;
return VLC_SUCCESS;
More information about the vlc-commits
mailing list