/*****************************************************************************
* Local prototypes
*****************************************************************************/
-#ifdef WIN32
+#ifdef _WIN32
static int Forward(vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void *);
#endif
msg_Dbg(vout, "Opening vout display wrapper");
/* */
- sys->display.title = var_CreateGetNonEmptyString(vout, "video-title");
+ sys->display.title = var_InheritString(vout, "video-title");
/* */
const mtime_t double_click_timeout = 300000;
}
/* */
-#ifdef WIN32
+#ifdef _WIN32
var_Create(vout, "video-wallpaper", VLC_VAR_BOOL|VLC_VAR_DOINHERIT);
var_AddCallback(vout, "video-wallpaper", Forward, NULL);
#endif
{
vout_thread_sys_t *sys = vout->p;
-#ifdef WIN32
+#ifdef _WIN32
var_DelCallback(vout, "video-wallpaper", Forward, NULL);
#endif
sys->decoder_pool = NULL; /* FIXME remove */
if (sys->display.use_dr)
sys->display_pool = vout_display_Pool(sys->display.vd, 3);
else
- //sys->display_pool = picture_pool_Reserve(sys->decoder_pool, DISPLAY_PICTURE_COUNT);
- sys->display_pool = picture_pool_NewFromFormat(&sys->display.vd->source, DISPLAY_PICTURE_COUNT);
+ sys->display_pool = NULL;
}
-static void NoDrClean(vout_thread_t *vout)
-{
- vout_thread_sys_t *sys = vout->p;
- if (!sys->display.use_dr)
- picture_pool_Delete(sys->display_pool);
-}
int vout_InitWrapper(vout_thread_t *vout)
{
vout_thread_sys_t *sys = vout->p;
picture_pool_NewFromFormat(&source,
__MAX(VOUT_MAX_PICTURES,
reserved_picture + decoder_picture - DISPLAY_PICTURE_COUNT));
+ if (!sys->decoder_pool)
+ return VLC_EGENERIC;
if (allow_dr) {
msg_Warn(vout, "Not enough direct buffers, using system memory");
sys->dpb_size = 0;
if (sys->private_pool)
picture_pool_Delete(sys->private_pool);
- if (sys->decoder_pool != sys->display_pool) {
- NoDrClean(vout);
+ if (sys->decoder_pool != sys->display_pool)
picture_pool_Delete(sys->decoder_pool);
- }
}
/*****************************************************************************
vout_thread_sys_t *sys = vout->p;
vout_display_t *vd = sys->display.vd;
- bool reset_display_pool = sys->display.use_dr && vout_AreDisplayPicturesInvalid(vd);
- vout_ManageDisplay(vd, !sys->display.use_dr || reset_display_pool);
+ bool reset_display_pool = vout_AreDisplayPicturesInvalid(vd);
+ reset_display_pool |= vout_ManageDisplay(vd, !sys->display.use_dr || reset_display_pool);
if (reset_display_pool) {
- NoDrClean(vout);
-
sys->display.use_dr = !vout_IsDisplayFiltered(vd);
NoDrInit(vout);
}
}
-#ifdef WIN32
+#ifdef _WIN32
static int Forward(vlc_object_t *object, char const *var,
vlc_value_t oldval, vlc_value_t newval, void *data)
{