diff options
| author | wm4 <wm4@nowhere> | 2016-03-08 21:54:17 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-03-08 22:01:57 +0100 |
| commit | 876a3bafc5a0cb491ee1f1d5e928cd6e6ef530a8 (patch) | |
| tree | af35260c02da290067e7a5b6bd1d5860cbb1ea7d /player/sub.c | |
| parent | 75a36662cb6bb0c8a2aeb3a4034d3f8dc745bbdd (diff) | |
| download | mpv-876a3bafc5a0cb491ee1f1d5e928cd6e6ef530a8.tar.bz2 mpv-876a3bafc5a0cb491ee1f1d5e928cd6e6ef530a8.tar.xz | |
osd: cleanup: make OSDTYPE_ constants private to OSD code
No need to have them everywhere. The only exception/annoyance is
MAX_OSD_PARTS, which is now basically duplicated (and at runtime
initialization is checked with an assert()).
Diffstat (limited to 'player/sub.c')
| -rw-r--r-- | player/sub.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/player/sub.c b/player/sub.c index 69c1dbbd19..6d01e0ca5d 100644 --- a/player/sub.c +++ b/player/sub.c @@ -71,8 +71,7 @@ void uninit_sub(struct MPContext *mpctx, struct track *track) reset_subtitles(mpctx, track); sub_select(track->d_sub, false); int order = get_order(mpctx, track); - if (order >= 0 && order <= 1) - osd_set_sub(mpctx->osd, OSDTYPE_SUB + order, NULL); + osd_set_sub(mpctx->osd, order, NULL); } } @@ -182,8 +181,7 @@ void reinit_sub(struct MPContext *mpctx, struct track *track) sub_select(track->d_sub, true); int order = get_order(mpctx, track); - if (order >= 0 && order <= 1) - osd_set_sub(mpctx->osd, OSDTYPE_SUB + order, track->d_sub); + osd_set_sub(mpctx->osd, order, track->d_sub); sub_control(track->d_sub, SD_CTRL_SET_TOP, &(bool){!!order}); } |