/*****************************************************************************
* Module descriptor
*****************************************************************************/
-static int Open (vlc_object_t *, const char *module);
+static int Open (vlc_object_t *);
static void Close(vlc_object_t *);
-#define DECLARE_OPEN(name) \
- static int Open##name(vlc_object_t *object) { return Open(object, #name); }
-
-DECLARE_OPEN(aalib);
-DECLARE_OPEN(caca);
-DECLARE_OPEN(sdl);
-DECLARE_OPEN(xcb_x11);
-DECLARE_OPEN(xcb_xv);
-DECLARE_OPEN(xcb_glx);
-DECLARE_OPEN(dummy);
-DECLARE_OPEN(fb);
-DECLARE_OPEN(directfb);
-DECLARE_OPEN(yuv);
-DECLARE_OPEN(snapshot);
-DECLARE_OPEN(vmem);
-DECLARE_OPEN(direct3d_xp);
-DECLARE_OPEN(direct3d_vista);
-DECLARE_OPEN(glwin32);
-
-#undef DECLARE_OPEN
-
-#define DECLARE_MODULE_EXT(name, module, priority) \
- set_description( "Video display "#module" wrapper" ) \
- set_shortname( "Video display "#module" wrapper" ) \
- set_capability( "video output", priority ) \
- set_callbacks( Open##module, Close ) \
- add_shortcut( #name )
-
-#define DECLARE_MODULE(name, priority) \
- DECLARE_MODULE_EXT(name, name, priority)
-
vlc_module_begin()
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_VOUT )
- DECLARE_MODULE(aalib, 10)
-
- add_submodule()
- DECLARE_MODULE(caca, 12)
-
- add_submodule()
- DECLARE_MODULE(sdl, 60)
-
- add_submodule()
- DECLARE_MODULE(xcb_x11, 75)
-
- add_submodule()
- DECLARE_MODULE(xcb_xv, 155)
-
- add_submodule()
- DECLARE_MODULE(xcb_glx, 20)
-
- add_submodule()
- DECLARE_MODULE(dummy, 1)
-
- add_submodule()
- DECLARE_MODULE(fb, 30)
-
- add_submodule()
- DECLARE_MODULE(directfb, 60)
-
- add_submodule()
- DECLARE_MODULE(yuv, 0)
-
- add_submodule()
- DECLARE_MODULE(snapshot, 0)
-
- add_submodule()
- DECLARE_MODULE(vmem, 0)
-
- add_submodule()
- DECLARE_MODULE_EXT(direct3d, direct3d_vista, 150)
-
- add_submodule()
- DECLARE_MODULE_EXT(direct3d, direct3d_xp, 70)
-
- add_submodule()
- DECLARE_MODULE(glwin32, 20)
+ set_description( "Transitional video display wrapper" )
+ set_shortname( "Video display wrapper" )
+ set_capability( "video output", 210 )
+ set_callbacks( Open, Close )
vlc_module_end()
-#undef DECLARE_MODULE
-
/*****************************************************************************
*
*****************************************************************************/
struct vout_sys_t {
- const char *name;
char *title;
vout_display_t *vd;
bool use_dr;
static void VoutGetDisplayCfg(vout_thread_t *,
vout_display_cfg_t *, const char *title);
-
+#ifdef WIN32
static int Forward(vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void *);
-
+#endif
/*****************************************************************************
*
*****************************************************************************/
-static int Open(vlc_object_t *object, const char *module)
+static int Open(vlc_object_t *object)
{
vout_thread_t *vout = (vout_thread_t *)object;
vout_sys_t *sys;
- msg_Warn(vout, "Opening vout display wrapper");
+ msg_Dbg(vout, "Opening vout display wrapper");
/* */
sys = malloc(sizeof(*sys));
if (!sys)
return VLC_ENOMEM;
- sys->name = module;
sys->title = var_CreateGetNonEmptyString(vout, "video-title");
/* */
const mtime_t double_click_timeout = 300000;
const mtime_t hide_timeout = var_CreateGetInteger(vout, "mouse-hide-timeout") * 1000;
- sys->vd = vout_NewDisplay(vout, &source, &state, module,
+ sys->vd = vout_NewDisplay(vout, &source, &state, "$vout",
double_click_timeout, hide_timeout);
if (!sys->vd) {
free(sys->title);
}
/* */
- if (!strcmp(sys->name, "direct3d_xp") || !strcmp(sys->name, "direct3d_vista")) {
- var_Create(vout, "direct3d-desktop", VLC_VAR_BOOL|VLC_VAR_DOINHERIT);
- var_AddCallback(vout, "direct3d-desktop", Forward, NULL);
- }
+#ifdef WIN32
+ var_Create(vout, "direct3d-desktop", VLC_VAR_BOOL|VLC_VAR_DOINHERIT);
+ var_AddCallback(vout, "direct3d-desktop", Forward, NULL);
+ var_Create(vout, "video-wallpaper", VLC_VAR_BOOL|VLC_VAR_DOINHERIT);
+ var_AddCallback(vout, "video-wallpaper", Forward, NULL);
+#endif
/* */
vout->pf_init = Init;
vout_thread_t *vout = (vout_thread_t *)object;
vout_sys_t *sys = vout->p_sys;
- /* */
- if (!strcmp(sys->name, "direct3d_xp") || !strcmp(sys->name, "direct3d_vista")) {
- var_DelCallback(vout, "direct3d-desktop", Forward, NULL);
- }
-
+#ifdef WIN32
+ var_DelCallback(vout, "direct3d-desktop", Forward, NULL);
+ var_DelCallback(vout, "video-wallpaper", Forward, NULL);
+#endif
vout_DeleteDisplay(sys->vd, NULL);
free(sys->title);
free(sys );
vout->fmt_out.i_x_offset = 0;
vout->fmt_out.i_y_offset = 0;
- /* TODO */
-#if 0
- if (p_vout->fmt_render.i_visible_width != source.i_visible_width ||
- p_vout->fmt_render.i_visible_height != source.i_visible_height ||
- p_vout->fmt_render.i_x_offset != source.i_x_offset ||
- p_vout->fmt_render.i_y_offset != source.i_y_offset )
- {
- p_vout->i_changes |= VOUT_CROP_CHANGE;
- }
-#endif
+ if (vout->fmt_in.i_visible_width != source.i_visible_width ||
+ vout->fmt_in.i_visible_height != source.i_visible_height ||
+ vout->fmt_in.i_x_offset != source.i_x_offset ||
+ vout->fmt_in.i_y_offset != source.i_y_offset )
+ vout->i_changes |= VOUT_CROP_CHANGE;
+
if (vout->b_on_top)
- vout_SetDisplayOnTop(vd, true);
+ vout_SetWindowState(vd, VOUT_WINDOW_STATE_ABOVE);
/* XXX For non dr case, the current vout implementation force us to
* create at most 1 direct picture (otherwise the buffers will be kept
vout->i_changes &= ~VOUT_SCALE_CHANGE;
}
if (vout->i_changes & VOUT_ON_TOP_CHANGE) {
- vout_SetDisplayOnTop(vd, vout->b_on_top);
+ vout_SetWindowState(vd, vout->b_on_top
+ ? VOUT_WINDOW_STATE_ABOVE
+ : VOUT_WINDOW_STATE_NORMAL);
vout->i_changes &= ~VOUT_ON_TOP_CHANGE;
}
vout_display_Display(vd, direct);
- if (!sys->use_dr)
+ if (sys->use_dr) {
+ for (int i = 0; i < picture->i_planes; i++) {
+ picture->p[i].p_pixels = direct->p[i].p_pixels;
+ picture->p[i].i_pitch = direct->p[i].i_pitch;
+ picture->p[i].i_lines = direct->p[i].i_lines;
+ }
+ } else {
picture->p_sys->direct = NULL;
+ }
}
static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, const char *title)
cfg->align.horizontal = VOUT_DISPLAY_ALIGN_BOTTOM;
}
+#ifdef WIN32
static int Forward(vlc_object_t *object, char const *var,
vlc_value_t oldval, vlc_value_t newval, void *data)
{
VLC_UNUSED(data);
return var_Set(vout->p_sys->vd, var, newval);
}
-
+#endif
projects / vlc / blobdiff