#include <vlc_plugin.h>
#include <vlc_vout_display.h>
#include <vlc_picture_pool.h>
-#include "keythread.h"
#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_pool_t *Pool (vout_display_t *, unsigned);
-static void Prepare(vout_display_t *, picture_t *);
-static void Display(vout_display_t *, picture_t *);
+static void Prepare(vout_display_t *, picture_t *, subpicture_t *);
+static void Display(vout_display_t *, picture_t *, subpicture_t *);
static int Control(vout_display_t *, int, va_list);
/* */
cucul_dither_t *dither;
picture_pool_t *pool;
- key_thread_t *keys;
};
/**
vout_display_SendEventFullscreen(vd, false);
Refresh(vd);
- sys->keys = vlc_CreateKeyThread(vd);
return VLC_SUCCESS;
error:
vout_display_t *vd = (vout_display_t *)object;
vout_display_sys_t *sys = vd->sys;
- vlc_DestroyKeyThread(sys->keys);
if (sys->pool)
picture_pool_Delete(sys->pool);
if (sys->dither)
/**
* 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 Display(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;
}
const int vlc = keys[i].vlc;
if (vlc >= 0)
- vlc_EmitKey(sys->keys, vlc);
+ vout_display_SendEventKey(vd, vlc);
return;
}
}