From 2ccc3721ef9fc0acf39203e6709fa638a79222ae Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 30 Oct 2013 21:47:14 +0100 Subject: player: merge mp_osd.h into mp_core.h Just doing this because mp_osd.h and osd.c is not consistent. There are some other header files (command.h and screenshot.h), but since I don't feel too good about inflating mp_core.h, I'm not merging them, at least not yet. --- mpvcore/player/osd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mpvcore/player/osd.c') diff --git a/mpvcore/player/osd.c b/mpvcore/player/osd.c index f9b8fdad87..c7964c03f9 100644 --- a/mpvcore/player/osd.c +++ b/mpvcore/player/osd.c @@ -38,7 +38,6 @@ #include "sub/sub.h" #include "mp_core.h" -#include "mp_osd.h" #include "command.h" #define saddf(var, ...) (*(var) = talloc_asprintf_append((*var), __VA_ARGS__)) @@ -368,6 +367,7 @@ static void set_osd_bar_chapters(struct MPContext *mpctx, int type) } } +// osd_function is the symbol appearing in the video status, such as OSD_PLAY void set_osd_function(struct MPContext *mpctx, int osd_function) { struct MPOpts *opts = mpctx->opts; -- cgit v1.2.3