#include <vlc_vout_display.h>
#include <vlc_vout.h>
#include <vlc_block.h>
+#include <vlc_modules.h>
#include <libvlc.h>
place->x = cfg->display.width - place->width;
break;
default:
- place->x = (cfg->display.width - place->width) / 2;
+ place->x = ((int)cfg->display.width - (int)place->width) / 2;
break;
}
place->y = cfg->display.height - place->height;
break;
default:
- place->y = (cfg->display.height - place->height) / 2;
+ place->y = ((int)cfg->display.height - (int)place->height) / 2;
break;
}
}
} sar_initial;
/* */
- int width_saved;
- int height_saved;
+ unsigned width_saved;
+ unsigned height_saved;
struct {
unsigned num;
case VOUT_DISPLAY_EVENT_MOUSE_MOVED: {
const int x = (int)va_arg(args, int);
const int y = (int)va_arg(args, int);
- if (x != osys->mouse.state.i_x || y != osys->mouse.state.i_y) {
- //msg_Dbg(vd, "VoutDisplayEvent 'mouse' @%d,%d", x, y);
- m.i_x = x;
- m.i_y = y;
- m.b_double_click = false;
- } else {
- is_ignored = true;
- }
+ //msg_Dbg(vd, "VoutDisplayEvent 'mouse' @%d,%d", x, y);
+
+ m.i_x = x;
+ m.i_y = y;
+ m.b_double_click = false;
break;
}
case VOUT_DISPLAY_EVENT_MOUSE_PRESSED:
{
vout_display_owner_sys_t *osys = vd->owner.sys;
+#ifdef ALLOW_DUMMY_VOUT
+ if (!osys->vout->p) {
+ vout_window_cfg_t cfg_override = *cfg;
+
+ if (!var_InheritBool(osys->vout, "embedded-video"))
+ cfg_override.is_standalone = true;
+
+ return vout_window_New(VLC_OBJECT(osys->vout), NULL, &cfg_override);
+ }
+#endif
return vout_NewDisplayWindow(osys->vout, vd, cfg);
}
static void VoutDisplayDelWindow(vout_display_t *vd, vout_window_t *window)
{
vout_display_owner_sys_t *osys = vd->owner.sys;
+#ifdef ALLOW_DUMMY_VOUT
+ if (!osys->vout->p) {
+ if( window)
+ vout_window_Delete(window);
+ return;
+ }
+#endif
vout_DeleteDisplayWindow(osys->vout, vd, window);
}
if (hide_mouse) {
if (!vd->info.has_hide_mouse) {
- msg_Dbg(vd, "auto hidding mouse");
+ msg_Dbg(vd, "auto hiding mouse");
vout_display_Control(vd, VOUT_DISPLAY_HIDE_MOUSE);
}
vout_SendEventMouseHidden(osys->vout);
#include "vout_internal.h"
void vout_SendDisplayEventMouse(vout_thread_t *vout, const vlc_mouse_t *m)
{
- vlc_mouse_t tmp;
+ vlc_mouse_t tmp1, tmp2;
/* The check on p_spu is needed as long as ALLOW_DUMMY_VOUT is defined */
if (vout->p->p_spu && spu_ProcessMouse( vout->p->p_spu, m, &vout->p->display.vd->source))
return;
- vlc_mutex_lock( &vout->p->vfilter_lock );
- if (vout->p->vfilter_chain) {
- if (!filter_chain_MouseFilter(vout->p->vfilter_chain, &tmp, m))
- m = &tmp;
+ vlc_mutex_lock( &vout->p->filter.lock );
+ if (vout->p->filter.chain_static && vout->p->filter.chain_interactive) {
+ if (!filter_chain_MouseFilter(vout->p->filter.chain_interactive, &tmp1, m))
+ m = &tmp1;
+ if (!filter_chain_MouseFilter(vout->p->filter.chain_static, &tmp2, m))
+ m = &tmp2;
}
- vlc_mutex_unlock( &vout->p->vfilter_lock );
+ vlc_mutex_unlock( &vout->p->filter.lock );
if (vlc_mouse_HasMoved(&vout->p->mouse, m)) {
vout_SendEventMouseMoved(vout, m->i_x, m->i_y);
if (!vout->p) {
p.mouse = *fallback;
- vlc_mutex_init(&p.vfilter_lock);
- p.vfilter_chain = NULL;
+ vlc_mutex_init(&p.filter.lock);
+ p.filter.chain_static = NULL;
+ p.filter.chain_interactive = NULL;
p.p_spu = NULL;
vout->p = &p;
}
vout_SendDisplayEventMouse(vout, m);
if (vout->p == &p) {
- vlc_mutex_destroy(&p.vfilter_lock);
+ vlc_mutex_destroy(&p.filter.lock);
*fallback = p.mouse;
vout->p = NULL;
}