From efea99c2c9e8ea1f5a96a1cb86aa30ef05b6b828 Mon Sep 17 00:00:00 2001 From: eugeni Date: Sat, 28 Oct 2006 15:07:18 +0000 Subject: Libass interface reworked: - ass_instance_t renamed to ass_renderer_t - ass_library_t introduced - use of mplayer-specific global variables limited to ass_mp.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_ass.c | 6 +++--- libmpcodecs/vf_vo.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c index 922f268b0a..480cec108a 100644 --- a/libmpcodecs/vf_ass.c +++ b/libmpcodecs/vf_ass.c @@ -60,7 +60,7 @@ static struct vf_priv_s { // 0 = insert always int auto_insert; - ass_instance_t* ass_priv; + ass_renderer_t* ass_priv; unsigned char* planes[3]; unsigned char* dirty_rows; @@ -349,7 +349,7 @@ static int control(vf_instance_t *vf, int request, void *data) { switch (request) { case VFCTRL_INIT_EOSD: - vf->priv->ass_priv = ass_init(); + vf->priv->ass_priv = ass_renderer_init((ass_library_t*)data); return vf->priv->ass_priv ? CONTROL_TRUE : CONTROL_FALSE; case VFCTRL_DRAW_EOSD: if (vf->priv->ass_priv) return CONTROL_TRUE; @@ -361,7 +361,7 @@ static int control(vf_instance_t *vf, int request, void *data) static void uninit(struct vf_instance_s* vf) { if (vf->priv->ass_priv) - ass_done(vf->priv->ass_priv); + ass_renderer_done(vf->priv->ass_priv); if (vf->priv->planes[1]) free(vf->priv->planes[1]); if (vf->priv->planes[2]) diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c index 56b6f02d45..b8e35543cc 100644 --- a/libmpcodecs/vf_vo.c +++ b/libmpcodecs/vf_vo.c @@ -29,7 +29,7 @@ typedef struct vf_vo_data_s { struct vf_priv_s { vf_vo_data_t* vf_vo_data; #ifdef USE_ASS - ass_instance_t* ass_priv; + ass_renderer_t* ass_priv; #endif }; #define video_out (vf->priv->vf_vo_data->vo) @@ -107,7 +107,7 @@ static int control(struct vf_instance_s* vf, int request, void* data) #ifdef USE_ASS case VFCTRL_INIT_EOSD: { - vf->priv->ass_priv = ass_init(); + vf->priv->ass_priv = ass_renderer_init((ass_library_t*)data); if (!vf->priv->ass_priv) return CONTROL_FALSE; return CONTROL_TRUE; } @@ -185,7 +185,7 @@ static void uninit(struct vf_instance_s* vf) if (vf->priv) { #ifdef USE_ASS if (vf->priv->ass_priv) - ass_done(vf->priv->ass_priv); + ass_renderer_done(vf->priv->ass_priv); #endif free(vf->priv); } -- cgit v1.2.3