#include <vlc_video_splitter.h>
#include <vlc_vout_display.h>
#include <vlc_vout.h>
+#include <vlc_block.h>
#include <libvlc.h>
vd->info.has_double_click = false;
vd->info.has_hide_mouse = false;
vd->info.has_pictures_invalid = false;
+ vd->info.has_event_thread = false;
vd->cfg = cfg;
vd->pool = NULL;
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;
int fit_window;
+ struct {
+ vlc_thread_t thread;
+ block_fifo_t *fifo;
+ } event;
+
#ifdef ALLOW_DUMMY_VOUT
vlc_mouse_t vout_mouse;
#endif
vlc_mutex_unlock(&osys->lock);
}
+static void *VoutDisplayEventKeyDispatch(void *data)
+{
+ vout_display_owner_sys_t *osys = data;
+
+ for (;;) {
+ block_t *event = block_FifoGet(osys->event.fifo);
+
+ int cancel = vlc_savecancel();
+
+ int key;
+ memcpy(&key, event->p_buffer, sizeof(key));
+ vout_SendEventKey(osys->vout, key);
+ block_Release(event);
+
+ vlc_restorecancel(cancel);
+ }
+}
+
+static void VoutDisplayEventKey(vout_display_t *vd, int key)
+{
+ vout_display_owner_sys_t *osys = vd->owner.sys;
+
+ if (!osys->event.fifo) {
+ osys->event.fifo = block_FifoNew();
+ if (!osys->event.fifo)
+ return;
+ if (vlc_clone(&osys->event.thread, VoutDisplayEventKeyDispatch,
+ osys, VLC_THREAD_PRIORITY_LOW)) {
+ block_FifoRelease(osys->event.fifo);
+ osys->event.fifo = NULL;
+ return;
+ }
+ }
+ block_t *event = block_Alloc(sizeof(key));
+ if (event) {
+ memcpy(event->p_buffer, &key, sizeof(key));
+ block_FifoPut(osys->event.fifo, event);
+ }
+}
+
static void VoutDisplayEvent(vout_display_t *vd, int event, va_list args)
{
vout_display_owner_sys_t *osys = vd->owner.sys;
case VOUT_DISPLAY_EVENT_KEY: {
const int key = (int)va_arg(args, int);
msg_Dbg(vd, "VoutDisplayEvent 'key' 0x%2.2x", key);
- vout_SendEventKey(osys->vout, key);
+ if (vd->info.has_event_thread)
+ vout_SendEventKey(osys->vout, key);
+ else
+ VoutDisplayEventKey(vd, key);
break;
}
case VOUT_DISPLAY_EVENT_MOUSE_STATE:
{
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);
}
osys->zoom.den = cfg->zoom.den;
osys->wm_state = state->wm_state;
osys->fit_window = 0;
+ osys->event.fifo = NULL;
osys->source = *source_org;
if (osys->is_wrapper)
SplitterClose(vd);
vout_display_Delete(vd);
+ if (osys->event.fifo) {
+ vlc_cancel(osys->event.thread);
+ vlc_join(osys->event.thread, NULL);
+ block_FifoRelease(osys->event.fifo);
+ }
vlc_mutex_destroy(&osys->lock);
free(osys);
}