mirror of https://github.com/mpv-player/mpv
spudec.c: simplify
Reuse spudec_visible to avoid code duplication. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31661 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
4a9c879ca7
commit
1882a37adb
4
spudec.c
4
spudec.c
|
@ -656,7 +656,7 @@ void spudec_set_forced_subs_only(void * const this, const unsigned int flag)
|
||||||
void spudec_draw(void *this, void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride))
|
void spudec_draw(void *this, void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride))
|
||||||
{
|
{
|
||||||
spudec_handle_t *spu = (spudec_handle_t *)this;
|
spudec_handle_t *spu = (spudec_handle_t *)this;
|
||||||
if (spu->start_pts <= spu->now_pts && spu->now_pts < spu->end_pts && spu->image)
|
if (spudec_visible(spu))
|
||||||
{
|
{
|
||||||
draw_alpha(spu->start_col, spu->start_row, spu->width, spu->height,
|
draw_alpha(spu->start_col, spu->start_row, spu->width, spu->height,
|
||||||
spu->image, spu->aimage, spu->stride);
|
spu->image, spu->aimage, spu->stride);
|
||||||
|
@ -807,7 +807,7 @@ void spudec_draw_scaled(void *me, unsigned int dxs, unsigned int dys, void (*dra
|
||||||
scale_pixel *table_x;
|
scale_pixel *table_x;
|
||||||
scale_pixel *table_y;
|
scale_pixel *table_y;
|
||||||
|
|
||||||
if (spu->start_pts <= spu->now_pts && spu->now_pts < spu->end_pts) {
|
if (spudec_visible(spu)) {
|
||||||
|
|
||||||
// check if only forced subtitles are requested
|
// check if only forced subtitles are requested
|
||||||
if( (spu->forced_subs_only) && !(spu->is_forced_sub) ){
|
if( (spu->forced_subs_only) && !(spu->is_forced_sub) ){
|
||||||
|
|
Loading…
Reference in New Issue