#include <vlc_plugin.h>
#include <vlc_vout_display.h>
#include <vlc_picture_pool.h>
+#if !defined(WIN32) && !defined(__APPLE__)
+# ifdef X_DISPLAY_MISSING
+# error Xlib required due to XInitThreads
+# endif
+# include <vlc_xlib.h>
+#endif
#include <caca.h>
set_category(CAT_VIDEO)
set_subcategory(SUBCAT_VIDEO_VOUT)
set_description(N_("Color ASCII art video output"))
- set_capability("vout display", 12)
+ set_capability("vout display", 15)
set_callbacks(Open, Close)
vlc_module_end()
*****************************************************************************/
static picture_pool_t *Pool (vout_display_t *, unsigned);
static void Prepare(vout_display_t *, picture_t *, subpicture_t *);
-static void Display(vout_display_t *, picture_t *, subpicture_t *);
+static void PictureDisplay(vout_display_t *, picture_t *, subpicture_t *);
static int Control(vout_display_t *, int, va_list);
/* */
vout_display_t *vd = (vout_display_t *)object;
vout_display_sys_t *sys;
+#if !defined(__APPLE__) && !defined(WIN32)
+# ifndef X_DISPLAY_MISSING
+ if (!vlc_xlib_init(object))
+ return VLC_EGENERIC;
+# endif
+#endif
+
#if defined(WIN32) && !defined(UNDER_CE)
CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
SMALL_RECT rect;
vd->pool = Pool;
vd->prepare = Prepare;
- vd->display = Display;
+ vd->display = PictureDisplay;
vd->control = Control;
vd->manage = Manage;
/**
* Display a picture
*/
-static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture)
+static void PictureDisplay(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture)
{
Refresh(vd);
picture_Release(picture);
caca_refresh_display(sys->dp);
/* Not quite good but not sure how to resize it */
- if (cfg->display.width != caca_get_display_width(sys->dp) ||
- cfg->display.height != caca_get_display_height(sys->dp))
+ if ((int)cfg->display.width != caca_get_display_width(sys->dp) ||
+ (int)cfg->display.height != caca_get_display_height(sys->dp))
return VLC_EGENERIC;
return VLC_SUCCESS;
}