/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_vout.h>
#include <vlc_filter.h>
static int CreateFilter ( vlc_object_t * );
static void DestroyFilter( vlc_object_t * );
static subpicture_t *Filter( filter_t *, mtime_t );
+
static int OSDMenuUpdateEvent( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int OSDMenuVisibleEvent( vlc_object_t *, char const *,
static int OSDMenuCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
+static int MouseEvent( vlc_object_t *, char const *,
+ vlc_value_t , vlc_value_t , void * );
+
#define OSD_CFG "osdmenu-"
#if defined( WIN32 ) || defined( UNDER_CE )
add_integer_with_range( OSD_CFG "update", OSD_UPDATE_DEFAULT,
OSD_UPDATE_MIN, OSD_UPDATE_MAX, NULL, OSD_UPDATE_TEXT,
OSD_UPDATE_LONGTEXT, VLC_TRUE );
-
add_integer_with_range( OSD_CFG "alpha", 255, 0, 255, NULL,
OSD_ALPHA_TEXT, OSD_ALPHA_LONGTEXT, VLC_TRUE );
set_description( _("On Screen Display menu") );
set_shortname( _("OSD menu") );
add_shortcut( "osdmenu" );
-/*
+
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_SUBPIC );
-*/
+
set_callbacks( CreateFilter, DestroyFilter );
vlc_module_end();
int i_alpha; /* alpha transparency value */
char *psz_file; /* OSD Menu configuration file */
+ char *psz_path; /* Path to OSD Menu pictures */
osd_menu_t *p_menu; /* pointer to OSD Menu object */
+
+ /* menu interaction */
+ vout_thread_t *p_vout;
+ vlc_bool_t b_clicked;
+ uint32_t i_mouse_x;
+ uint32_t i_mouse_y;
};
/*****************************************************************************
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = NULL;
- vlc_value_t val;
p_filter->p_sys = p_sys = (filter_sys_t *) malloc( sizeof(filter_sys_t) );
if( !p_filter->p_sys )
memset( p_sys, 0, sizeof(filter_sys_t) );
/* Populating struct */
- p_filter->p_sys->p_menu = NULL;
- p_filter->p_sys->psz_file = NULL;
-
- p_filter->p_sys->psz_file = config_GetPsz( p_filter, OSD_CFG "file" );
- if( (p_filter->p_sys->psz_file == NULL) ||
- (*p_filter->p_sys->psz_file == '\0') )
+ p_sys->psz_path = var_CreateGetString( p_this, OSD_CFG "file-path" );
+ p_sys->psz_file = var_CreateGetString( p_this, OSD_CFG "file" );
+ if( (p_sys->psz_file == NULL) ||
+ (*p_sys->psz_file == '\0') )
{
msg_Err( p_filter, "unable to get filename" );
goto error;
p_sys->i_alpha = var_CreateGetIntegerCommand( p_this, OSD_CFG "alpha" );
/* in micro seconds - divide by 2 to match user expectations */
- var_Create( p_this, OSD_CFG "timeout",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
- var_Get( p_this, OSD_CFG "timeout", &val );
- p_sys->i_timeout = (mtime_t)(val.i_int * 1000000) >> 2;
- var_Create( p_this, OSD_CFG "update",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
- var_Get( p_this, OSD_CFG "update", &val );
- p_sys->i_update = (mtime_t)(val.i_int * 1000); /* in micro seconds */
+ p_sys->i_timeout = var_CreateGetIntegerCommand( p_this, OSD_CFG "timeout" );
+ p_sys->i_timeout = (mtime_t)(p_sys->i_timeout * 1000000) >> 2;
+ p_sys->i_update = var_CreateGetIntegerCommand( p_this, OSD_CFG "update" );
+ p_sys->i_update = (mtime_t)(p_sys->i_update * 1000); /* in micro seconds */
var_AddCallback( p_filter, OSD_CFG "position", OSDMenuCallback, p_sys );
var_AddCallback( p_filter, OSD_CFG "timeout", OSDMenuCallback, p_sys );
if( p_sys->p_menu == NULL )
goto error;
+ p_sys->p_menu->i_position = p_sys->i_position;
+
/* Check if menu position was overridden */
p_sys->b_absolute = VLC_TRUE;
if( (p_sys->i_x < 0) || (p_sys->i_y < 0) )
/* Keep track of OSD Events */
p_sys->b_update = VLC_FALSE;
p_sys->b_visible = VLC_FALSE;
+ p_sys->b_clicked = VLC_FALSE;
/* Listen to osd menu core updates/visible settings. */
var_AddCallback( p_sys->p_menu, "osd-menu-update",
/* Attach subpicture filter callback */
p_filter->pf_sub_filter = Filter;
+ p_sys->p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( p_sys->p_vout )
+ {
+ var_AddCallback( p_sys->p_vout, "mouse-x",
+ MouseEvent, p_sys );
+ var_AddCallback( p_sys->p_vout, "mouse-y",
+ MouseEvent, p_sys );
+ var_AddCallback( p_sys->p_vout, "mouse-clicked",
+ MouseEvent, p_sys );
+ }
+
es_format_Init( &p_filter->fmt_out, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) );
p_filter->fmt_out.i_priority = 0;
- msg_Dbg( p_filter, "successfully loaded osdmenu filter" );
return VLC_SUCCESS;
error:
msg_Err( p_filter, "osdmenu filter discarded" );
- if( p_filter->p_sys->p_menu )
- {
- osd_MenuDelete( p_this, p_filter->p_sys->p_menu );
- p_filter->p_sys->p_menu = NULL;
- }
- if( p_filter->p_sys->psz_file ) free( p_filter->p_sys->psz_file );
- if( p_filter->p_sys ) free( p_filter->p_sys );
+
+ osd_MenuDelete( p_this, p_sys->p_menu );
+ p_sys->p_menu = NULL;
+ free( p_sys->psz_file );
+ free( p_sys );
return VLC_EGENERIC;
}
var_DelCallback( p_sys->p_menu, "osd-menu-visible",
OSDMenuVisibleEvent, p_filter );
+ if( p_sys->p_vout )
+ {
+ var_DelCallback( p_sys->p_vout, "mouse-x",
+ MouseEvent, p_sys );
+ var_DelCallback( p_sys->p_vout, "mouse-y",
+ MouseEvent, p_sys );
+ var_DelCallback( p_sys->p_vout, "mouse-clicked",
+ MouseEvent, p_sys );
+
+ vlc_object_release( p_sys->p_vout );
+ p_sys->p_vout = NULL;
+ }
+
+ var_Destroy( p_this, OSD_CFG "file-path" );
var_Destroy( p_this, OSD_CFG "file" );
var_Destroy( p_this, OSD_CFG "x" );
var_Destroy( p_this, OSD_CFG "y" );
osd_MenuDelete( p_filter, p_sys->p_menu );
- if( p_sys->psz_file) free( p_sys->psz_file );
- if( p_sys ) free( p_sys );
-
- msg_Dbg( p_filter, "osdmenu filter destroyed" );
+ free( p_sys->psz_file );
+ free( p_sys );
}
/*****************************************************************************
static int OSDMenuVisibleEvent( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(oldval);
+ VLC_UNUSED(newval);
filter_t *p_filter = (filter_t *) p_data;
p_filter->p_sys->b_visible = VLC_TRUE;
static int OSDMenuUpdateEvent( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(oldval);
+ VLC_UNUSED(newval);
filter_t *p_filter = (filter_t *) p_data;
filter_sys_t *p_sys = p_filter->p_sys;
/*****************************************************************************
* create_text_region : compose a text region SPU
*****************************************************************************/
-static subpicture_region_t *create_text_region( filter_t *p_filter, subpicture_t *p_spu,
+static subpicture_region_t *create_text_region( filter_t *p_filter, subpicture_t *p_spu,
int i_width, int i_height, const char *psz_text )
{
subpicture_region_t *p_region;
return p_spu;
}
+ if( p_sys->p_vout && p_sys->b_clicked )
+ {
+ p_sys->b_clicked = VLC_FALSE;
+ osd_MenuActivate( p_filter );
+ }
/* Create new spu regions
*/
p_region = create_picture_region( p_filter, p_spu,
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
{
+ VLC_UNUSED(p_this); VLC_UNUSED(oldval);
filter_sys_t *p_sys = (filter_sys_t *) p_data;
if( !p_sys )
p_sys->b_update = p_sys->b_visible ? VLC_TRUE : VLC_FALSE;
return VLC_SUCCESS;
}
+
+/*****************************************************************************
+ * MouseEvent: callback for mouse events
+ *****************************************************************************/
+static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ VLC_UNUSED(oldval); VLC_UNUSED(newval);
+ filter_sys_t *p_sys = (filter_sys_t *)p_data;
+ vout_thread_t *p_vout = (vout_thread_t*)p_sys->p_vout;
+ int i_x, i_y;
+ int i_v;
+
+#define MOUSE_DOWN 1
+#define MOUSE_CLICKED 2
+#define MOUSE_MOVE_X 4
+#define MOUSE_MOVE_Y 8
+#define MOUSE_MOVE 12
+ uint8_t mouse= 0;
+
+ int v_h = p_vout->output.i_height;
+ int v_w = p_vout->output.i_width;
+
+ if( psz_var[6] == 'x' ) mouse |= MOUSE_MOVE_X;
+ if( psz_var[6] == 'y' ) mouse |= MOUSE_MOVE_Y;
+ if( psz_var[6] == 'c' ) mouse |= MOUSE_CLICKED;
+
+ i_v = var_GetInteger( p_sys->p_vout, "mouse-button-down" );
+ if( i_v & 0x1 ) mouse |= MOUSE_DOWN;
+ i_y = var_GetInteger( p_sys->p_vout, "mouse-y" );
+ i_x = var_GetInteger( p_sys->p_vout, "mouse-x" );
+
+ if( i_y < 0 || i_x < 0 || i_y >= v_h || i_x >= v_w )
+ return VLC_SUCCESS;
+
+ if( mouse & MOUSE_CLICKED )
+ {
+ int i_scale_width, i_scale_height;
+ osd_button_t *p_button = NULL;
+
+ i_scale_width = p_vout->fmt_out.i_visible_width * 1000 /
+ p_vout->fmt_in.i_visible_width;
+ i_scale_height = p_vout->fmt_out.i_visible_height * 1000 /
+ p_vout->fmt_in.i_visible_height;
+
+ p_button = osd_ButtonFind( p_this, i_x, i_y, v_h, v_w,
+ i_scale_width, i_scale_height );
+ if( p_button )
+ {
+ osd_ButtonSelect( p_this, p_button );
+ p_sys->b_update = p_sys->b_visible ? VLC_TRUE : VLC_FALSE;
+ p_sys->b_clicked = VLC_TRUE;
+ msg_Dbg( p_this, "mouse clicked %s (%d,%d)\n", p_button->psz_name, i_x, i_y );
+ }
+ }
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff