diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-20 18:47:18 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-26 20:39:04 +0200 |
| commit | a248c2c7a137517061e6271f22b84d43bcd7191d (patch) | |
| tree | 27cb0970881007be820e8dfb74c504cf257afb20 /libmpcodecs | |
| parent | 966340b31a7bc53e922118da1cd4783d6a06483d (diff) | |
| download | mpv-a248c2c7a137517061e6271f22b84d43bcd7191d.tar.bz2 mpv-a248c2c7a137517061e6271f22b84d43bcd7191d.tar.xz | |
cleanup: rename ass_* functions to mp_ass_*
The various ass_* functions were created when libass was part of the
MPlayer tree and the distinction between MPlayer-specific and other
functions was less clear. Now that libass is a clearly separate
library, using the same ass_* namespace for player functions is ugly.
Rename the functions to use mp_ass_ prefix instead.
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_ass.c | 14 | ||||
| -rw-r--r-- | libmpcodecs/vf_vo.c | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c index d695fd206d..39e5d8f3c5 100644 --- a/libmpcodecs/vf_ass.c +++ b/libmpcodecs/vf_ass.c @@ -94,10 +94,10 @@ static int config(struct vf_instance *vf, vf->priv->line_limits = malloc((vf->priv->outh + 1) / 2 * sizeof(*vf->priv->line_limits)); if (vf->priv->renderer_realaspect) { - ass_configure(vf->priv->renderer_realaspect, - vf->priv->outw, vf->priv->outh, 0); - ass_configure(vf->priv->renderer_vsfilter, - vf->priv->outw, vf->priv->outh, 0); + mp_ass_configure(vf->priv->renderer_realaspect, + vf->priv->outw, vf->priv->outh, 0); + mp_ass_configure(vf->priv->renderer_vsfilter, + vf->priv->outw, vf->priv->outh, 0); ass_set_aspect_ratio(vf->priv->renderer_realaspect, (double)width / height * d_height / d_width, 1); ass_set_aspect_ratio(vf->priv->renderer_vsfilter, 1, 1); @@ -361,7 +361,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) vf->priv->renderer_vsfilter : vf->priv->renderer_realaspect; if (sub_visibility && renderer && vf->priv->osd->ass_track && (pts != MP_NOPTS_VALUE)) - images = ass_mp_render_frame(renderer, + images = mp_ass_render_frame(renderer, vf->priv->osd->ass_track, (pts + sub_delay) * 1000 + .5, NULL); @@ -398,8 +398,8 @@ static int control(vf_instance_t *vf, int request, void *data) ass_renderer_done(vf->priv->renderer_realaspect); return CONTROL_FALSE; } - ass_configure_fonts(vf->priv->renderer_realaspect); - ass_configure_fonts(vf->priv->renderer_vsfilter); + mp_ass_configure_fonts(vf->priv->renderer_realaspect); + mp_ass_configure_fonts(vf->priv->renderer_vsfilter); return CONTROL_TRUE; case VFCTRL_DRAW_EOSD: if (vf->priv->renderer_realaspect) diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c index b10181cf14..4d94569ef3 100644 --- a/libmpcodecs/vf_vo.c +++ b/libmpcodecs/vf_vo.c @@ -85,10 +85,10 @@ static int config(struct vf_instance *vf, vf->priv->scale_ratio = (double) d_width / d_height * height / width; if (vf->priv->renderer_realaspect) { - ass_configure(vf->priv->renderer_realaspect, width, height, - vf->default_caps & VFCAP_EOSD_UNSCALED); - ass_configure(vf->priv->renderer_vsfilter, width, height, - vf->default_caps & VFCAP_EOSD_UNSCALED); + mp_ass_configure(vf->priv->renderer_realaspect, width, height, + vf->default_caps & VFCAP_EOSD_UNSCALED); + mp_ass_configure(vf->priv->renderer_vsfilter, width, height, + vf->default_caps & VFCAP_EOSD_UNSCALED); } #endif @@ -143,8 +143,8 @@ static int control(struct vf_instance *vf, int request, void* data) ass_renderer_done(vf->priv->renderer_realaspect); return CONTROL_FALSE; } - ass_configure_fonts(vf->priv->renderer_realaspect); - ass_configure_fonts(vf->priv->renderer_vsfilter); + mp_ass_configure_fonts(vf->priv->renderer_realaspect); + mp_ass_configure_fonts(vf->priv->renderer_vsfilter); vf->priv->prev_visibility = false; return CONTROL_TRUE; } @@ -175,7 +175,7 @@ static int control(struct vf_instance *vf, int request, void* data) ass_set_aspect_ratio(renderer, scale, 1); } - images.imgs = ass_mp_render_frame(renderer, + images.imgs = mp_ass_render_frame(renderer, osd->ass_track, (pts+sub_delay) * 1000 + .5, &images.changed); |