Mercurial > mplayer.hg
comparison libmpcodecs/vf_vo.c @ 31792:55dacfca4a43
Rename libass types to match upstream libass >= 0.9.7
author | greg |
---|---|
date | Fri, 30 Jul 2010 18:14:35 +0000 |
parents | 2b6a652aefbe |
children | 6e0b5a97e00f |
comparison
equal
deleted
inserted
replaced
31791:d6549cdf9c95 | 31792:55dacfca4a43 |
---|---|
37 | 37 |
38 struct vf_priv_s { | 38 struct vf_priv_s { |
39 double pts; | 39 double pts; |
40 const vo_functions_t *vo; | 40 const vo_functions_t *vo; |
41 #ifdef CONFIG_ASS | 41 #ifdef CONFIG_ASS |
42 ass_renderer_t* ass_priv; | 42 ASS_Renderer* ass_priv; |
43 int prev_visibility; | 43 int prev_visibility; |
44 #endif | 44 #endif |
45 }; | 45 }; |
46 #define video_out (vf->priv->vo) | 46 #define video_out (vf->priv->vo) |
47 | 47 |
128 return (video_out->control(VOCTRL_GET_EQUALIZER, eq->item, &eq->value) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE; | 128 return (video_out->control(VOCTRL_GET_EQUALIZER, eq->item, &eq->value) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE; |
129 } | 129 } |
130 #ifdef CONFIG_ASS | 130 #ifdef CONFIG_ASS |
131 case VFCTRL_INIT_EOSD: | 131 case VFCTRL_INIT_EOSD: |
132 { | 132 { |
133 vf->priv->ass_priv = ass_renderer_init((ass_library_t*)data); | 133 vf->priv->ass_priv = ass_renderer_init((ASS_Library*)data); |
134 if (!vf->priv->ass_priv) return CONTROL_FALSE; | 134 if (!vf->priv->ass_priv) return CONTROL_FALSE; |
135 ass_configure_fonts(vf->priv->ass_priv); | 135 ass_configure_fonts(vf->priv->ass_priv); |
136 vf->priv->prev_visibility = 0; | 136 vf->priv->prev_visibility = 0; |
137 return CONTROL_TRUE; | 137 return CONTROL_TRUE; |
138 } | 138 } |
139 case VFCTRL_DRAW_EOSD: | 139 case VFCTRL_DRAW_EOSD: |
140 { | 140 { |
141 mp_eosd_images_t images = {NULL, 2}; | 141 EOSD_ImageList images = {NULL, 2}; |
142 double pts = vf->priv->pts; | 142 double pts = vf->priv->pts; |
143 if (!vo_config_count || !vf->priv->ass_priv) return CONTROL_FALSE; | 143 if (!vo_config_count || !vf->priv->ass_priv) return CONTROL_FALSE; |
144 if (sub_visibility && vf->priv->ass_priv && ass_track && (pts != MP_NOPTS_VALUE)) { | 144 if (sub_visibility && vf->priv->ass_priv && ass_track && (pts != MP_NOPTS_VALUE)) { |
145 mp_eosd_res_t res; | 145 mp_eosd_res_t res; |
146 memset(&res, 0, sizeof(res)); | 146 memset(&res, 0, sizeof(res)); |