/*****************************************************************************
* caca.c: Color ASCII Art "vout display" module using libcaca
*****************************************************************************
- * Copyright (C) 2003-2009 the VideoLAN team
+ * Copyright (C) 2003-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Sam Hocevar <sam@zoy.org>
* Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#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()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static picture_t *Get (vout_display_t *);
-static void Prepare(vout_display_t *, picture_t *);
-static void Display(vout_display_t *, picture_t *);
-static int Control(vout_display_t *, int, va_list);
+static picture_pool_t *Pool (vout_display_t *, unsigned);
+static void Prepare(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);
/* */
static void Manage(vout_display_t *);
vout_display_t *vd = (vout_display_t *)object;
vout_display_sys_t *sys;
-#if defined(WIN32) && !defined(UNDER_CE)
+#if !defined(__APPLE__) && !defined(_WIN32)
+# ifndef X_DISPLAY_MISSING
+ if (!vlc_xlib_init(object))
+ return VLC_EGENERIC;
+# endif
+#endif
+
+#if defined(_WIN32)
CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
SMALL_RECT rect;
COORD coord;
goto error;
}
- sys->dp = caca_create_display(sys->cv);
+ const char *driver = NULL;
+#ifdef __APPLE__
+ // Make sure we don't try to open a window.
+ driver = "ncurses";
+#endif
+
+ sys->dp = caca_create_display_with_driver(sys->cv, driver);
if (!sys->dp) {
msg_Err(vd, "cannot initialize libcaca");
goto error;
}
+ vout_display_DeleteWindow(vd, NULL);
if (vd->cfg->display.title)
caca_set_display_title(sys->dp,
fmt.i_bmask = 0x000000ff;
}
- /* */
- sys->pool = picture_pool_NewFromFormat(&fmt, 1);
- if (!sys->pool)
- goto error;
-
/* TODO */
vout_display_info_t info = vd->info;
vd->fmt = fmt;
vd->info = info;
- vd->get = Get;
+ vd->pool = Pool;
vd->prepare = Prepare;
- vd->display = Display;
+ vd->display = PictureDisplay;
vd->control = Control;
- vd->manage = Manage;
+ vd->manage = Manage;
/* Fix initial state */
vout_display_SendEventFullscreen(vd, false);
free(sys);
}
-#if defined(WIN32) && !defined(UNDER_CE)
+#if defined(_WIN32)
FreeConsole();
#endif
return VLC_EGENERIC;
vout_display_t *vd = (vout_display_t *)object;
vout_display_sys_t *sys = vd->sys;
- picture_pool_Delete(sys->pool);
+ if (sys->pool)
+ picture_pool_Delete(sys->pool);
if (sys->dither)
cucul_free_dither(sys->dither);
caca_free_display(sys->dp);
cucul_free_canvas(sys->cv);
-#if defined(WIN32) && !defined(UNDER_CE)
+#if defined(_WIN32)
FreeConsole();
#endif
}
/**
- * Return a direct buffer
+ * Return a pool of direct buffers
*/
-static picture_t *Get(vout_display_t *vd)
+static picture_pool_t *Pool(vout_display_t *vd, unsigned count)
{
vout_display_sys_t *sys = vd->sys;
- return picture_pool_Get(sys->pool);
+ if (!sys->pool)
+ sys->pool = picture_pool_NewFromFormat(&vd->fmt, count);
+ return sys->pool;
}
/**
* Prepare a picture for display */
-static void Prepare(vout_display_t *vd, picture_t *picture)
+static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture)
{
vout_display_sys_t *sys = vd->sys;
place.width, place.height,
sys->dither,
&picture->p->p_pixels[crop_offset]);
+ VLC_UNUSED(subpicture);
}
/**
* Display a picture
*/
-static void Display(vout_display_t *vd, picture_t *picture)
+static void PictureDisplay(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture)
{
Refresh(vd);
picture_Release(picture);
+ VLC_UNUSED(subpicture);
}
/**
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;
}
if (width != vd->cfg->display.width ||
height != vd->cfg->display.height)
- vout_display_SendEventDisplaySize(vd, width, height);
+ vout_display_SendEventDisplaySize(vd, width, height, false);
}
/**
{ CACA_KEY_PAGEUP, KEY_PAGEUP },
{ CACA_KEY_PAGEDOWN,KEY_PAGEDOWN },
- { ' ', KEY_SPACE },
-
/* */
{ -1, -1 }
};
}
case CACA_EVENT_RESIZE:
vout_display_SendEventDisplaySize(vd, caca_get_event_resize_width(&ev),
- caca_get_event_resize_height(&ev));
+ caca_get_event_resize_height(&ev), false);
break;
case CACA_EVENT_MOUSE_MOTION: {
vout_display_place_t place;
vd->source.i_visible_height / place.height;
caca_set_mouse(sys->dp, 1);
- if (x >= vd->source.i_x_offset && x < vd->source.i_x_offset + vd->source.i_visible_width &&
- y >= vd->source.i_y_offset && y < vd->source.i_y_offset + vd->source.i_visible_height) {
- vout_display_SendEventMouseMoved(vd, x, y);
- }
+ vout_display_SendEventMouseMoved(vd, x, y);
break;
}
case CACA_EVENT_MOUSE_PRESS:
projects / vlc / blobdiff