Commit c194d6d7 authored by Steve Lhomme's avatar Steve Lhomme Committed by Thomas Guillem

vout: opengl: handle VOUT_DISPLAY_CHANGE_VIEWPOINT

Signed-off-by: Thomas Guillem's avatarThomas Guillem <thomas@gllm.fr>
parent c5ae5a73
......@@ -405,6 +405,10 @@ static int Control (vout_display_t *vd, int query, va_list ap)
return VLC_SUCCESS;
}
case VOUT_DISPLAY_CHANGE_VIEWPOINT:
return vout_display_opengl_SetViewpoint(sys->vgl,
&va_arg (ap, const vout_display_cfg_t* )->viewpoint);
case VOUT_DISPLAY_RESET_PICTURES:
vlc_assert_unreachable ();
default:
......
......@@ -250,6 +250,9 @@ static int Control (vout_display_t *vd, int query, va_list ap)
vlc_gl_ReleaseCurrent (sys->gl);
return VLC_SUCCESS;
}
case VOUT_DISPLAY_CHANGE_VIEWPOINT:
return vout_display_opengl_SetViewpoint (sys->vgl,
&va_arg (ap, const vout_display_cfg_t* )->viewpoint);
default:
msg_Err (vd, "Unknown request %d", query);
}
......
......@@ -426,6 +426,10 @@ static int Control(vout_display_t *vd, int query, va_list ap)
return VLC_SUCCESS;
}
case VOUT_DISPLAY_CHANGE_VIEWPOINT:
return vout_display_opengl_SetViewpoint(sys->vgl,
&va_arg (ap, const vout_display_cfg_t* )->viewpoint);
case VOUT_DISPLAY_RESET_PICTURES:
vlc_assert_unreachable ();
default:
......
......@@ -435,7 +435,11 @@ static int Control (vout_display_t *vd, int query, va_list ap)
[NSCursor setHiddenUntilMouseMoves: YES];
return VLC_SUCCESS;
}
case VOUT_DISPLAY_CHANGE_VIEWPOINT:
return vout_display_opengl_SetViewpoint (sys->vgl,
&va_arg (ap, const vout_display_cfg_t* )->viewpoint);
case VOUT_DISPLAY_RESET_PICTURES:
vlc_assert_unreachable ();
default:
......
......@@ -147,6 +147,17 @@ static void DestroyGPUAffinityDC(vout_display_t *vd) {
fncDeleteDCNV(vd->sys->affinityHDC);
}
static int Control(vout_display_t *vd, int query, va_list args)
{
vout_display_sys_t *sys = vd->sys;
if (query == VOUT_DISPLAY_CHANGE_VIEWPOINT)
return vout_display_opengl_SetViewpoint(sys->vgl,
&va_arg (args, const vout_display_cfg_t* )->viewpoint);
return CommonControl(vd, query, args);
}
/**
* It creates an OpenGL vout display.
*/
......@@ -228,7 +239,7 @@ static int Open(vlc_object_t *object)
vd->pool = Pool;
vd->prepare = Prepare;
vd->display = Display;
vd->control = CommonControl;
vd->control = Control;
vd->manage = Manage;
return VLC_SUCCESS;
......
......@@ -248,6 +248,10 @@ static int Control (vout_display_t *vd, int query, va_list ap)
xcb_flush (sys->conn);
return VLC_SUCCESS;
case VOUT_DISPLAY_CHANGE_VIEWPOINT:
return vout_display_opengl_SetViewpoint (sys->vgl,
&va_arg (ap, const vout_display_cfg_t* )->viewpoint);
case VOUT_DISPLAY_RESET_PICTURES:
vlc_assert_unreachable ();
default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment