X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fvideo_filter%2Fosdmenu.c;h=751dbf04c3c56b9d620e2ac1efcc685bced2c91e;hb=bf765b5428dd3f3c41cfc41dbaefce443410226d;hp=e287f392cd6de721b3b2abfc2d6f2370bdfc9427;hpb=9d5e75a7a5643a2144dc561fc246a7a3ca7e5fb0;p=vlc diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c index e287f392cd..751dbf04c3 100644 --- a/modules/video_filter/osdmenu.c +++ b/modules/video_filter/osdmenu.c @@ -113,6 +113,16 @@ static int MouseEvent( vlc_object_t *, char const *, #define OSD_UPDATE_MAX 1000 vlc_module_begin () + set_capability( "sub filter", 100 ) + set_description( N_("On Screen Display menu") ) + set_shortname( N_("OSD menu") ) + add_shortcut( "osdmenu" ) + + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_SUBPIC ) + + set_callbacks( CreateFilter, DestroyFilter ) + add_integer( OSD_CFG "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, false ) add_integer( OSD_CFG "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false ) add_integer( OSD_CFG "position", 8, NULL, POS_TEXT, POS_LONGTEXT, @@ -130,15 +140,6 @@ vlc_module_begin () add_integer_with_range( OSD_CFG "alpha", 255, 0, 255, NULL, OSD_ALPHA_TEXT, OSD_ALPHA_LONGTEXT, true ) - set_capability( "sub filter", 100 ) - set_description( N_("On Screen Display menu") ) - set_shortname( N_("OSD menu") ) - add_shortcut( "osdmenu" ) - - set_category( CAT_VIDEO ) - set_subcategory( SUBCAT_VIDEO_SUBPIC ) - - set_callbacks( CreateFilter, DestroyFilter ) vlc_module_end () /***************************************************************************** @@ -252,7 +253,7 @@ static int CreateFilter ( vlc_object_t *p_this ) /* Attach subpicture filter callback */ p_filter->pf_sub_filter = Filter; - p_sys->p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_ANYWHERE ); + p_sys->p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_PARENT ); if( p_sys->p_vout ) { var_AddCallback( p_sys->p_vout, "mouse-x",