videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

hotkeys: factor out vout ES events

This commit is contained in:
Rémi Denis-Courmont 2022-05-01 22:11:02 +03:00 committed by Hugo Beauzée-Luyssen
parent 9c395de77c
commit 85ff09aa49
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/control/hotkeys.c
View File

@ -1179,6 +1179,32 @@ ViewpointMovedCallback(vlc_object_t *obj, char const *var,
return VLC_SUCCESS;
}
static void
player_on_vout_started(vlc_player_t *player, vout_thread_t *vout, void *data)
{
intf_thread_t *intf = data;
var_AddCallback(vout, "mouse-button-down", MouseButtonCallback, intf);
var_AddCallback(vout, "mouse-moved", MouseMovedCallback, intf->p_sys);
if (var_GetBool(vout, "viewpoint-changeable"))
var_AddCallback(vout, "viewpoint-moved",
ViewpointMovedCallback, player);
}
static void
player_on_vout_stopped(vlc_player_t *player, vout_thread_t *vout, void *data)
{
intf_thread_t *intf = data;
if (var_GetBool(vout, "viewpoint-changeable"))
var_DelCallback(vout, "viewpoint-moved",
ViewpointMovedCallback, player);
var_DelCallback(vout, "mouse-moved", MouseMovedCallback, intf->p_sys);
var_DelCallback(vout, "mouse-button-down", MouseButtonCallback, intf);
}
static void
player_on_vout_changed(vlc_player_t *player,
enum vlc_player_vout_action action, vout_thread_t *vout,
@ -1186,27 +1212,17 @@ player_on_vout_changed(vlc_player_t *player,
void *data)
{
VLC_UNUSED(order);
intf_thread_t *intf = data;
if (vlc_es_id_GetCat(es_id) != VIDEO_ES)
return;
bool vrnav = var_GetBool(vout, "viewpoint-changeable");
switch (action)
{
case VLC_PLAYER_VOUT_STARTED:
var_AddCallback(vout, "mouse-button-down", MouseButtonCallback, intf);
var_AddCallback(vout, "mouse-moved", MouseMovedCallback, intf->p_sys);
if (vrnav)
var_AddCallback(vout, "viewpoint-moved",
ViewpointMovedCallback, player);
player_on_vout_started(player, vout, data);
break;
case VLC_PLAYER_VOUT_STOPPED:
var_DelCallback(vout, "mouse-button-down", MouseButtonCallback, intf);
var_DelCallback(vout, "mouse-moved", MouseMovedCallback, intf->p_sys);
if (vrnav)
var_DelCallback(vout, "viewpoint-moved",
ViewpointMovedCallback, player);
player_on_vout_stopped(player, vout, data);
break;
default:
vlc_assert_unreachable();