summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-01-26 16:34:31 +0100
committerwm4 <wm4@nowhere>2017-01-26 16:34:31 +0100
commit60452f640fd405133ebf6f7ba773b0e25071fcf1 (patch)
treedfcd28fb2e4c72e5e182aeb6f7c54a6eab7889fa
parent753dbea83fb3df7197ade934b01ecd2d4a310c33 (diff)
downloadmpv-60452f640fd405133ebf6f7ba773b0e25071fcf1.tar.bz2
mpv-60452f640fd405133ebf6f7ba773b0e25071fcf1.tar.xz
osd: move some internal declarations to internal headers
-rw-r--r--sub/osd.h9
-rw-r--r--sub/osd_dummy.c2
-rw-r--r--sub/osd_state.h6
3 files changed, 7 insertions, 10 deletions
diff --git a/sub/osd.h b/sub/osd.h
index 755aca9969..f0ebc3b827 100644
--- a/sub/osd.h
+++ b/sub/osd.h
@@ -199,17 +199,8 @@ void osd_rescale_bitmaps(struct sub_bitmaps *imgs, int frame_w, int frame_h,
struct mp_osd_res res, double compensate_par);
// defined in osd_libass.c and osd_dummy.c
-
-// internal use only
-void osd_object_get_bitmaps(struct osd_state *osd, struct osd_object *obj,
- int format, struct sub_bitmaps *out_imgs);
-void osd_init_backend(struct osd_state *osd);
-void osd_destroy_backend(struct osd_state *osd);
-
void osd_set_external(struct osd_state *osd, void *id, int res_x, int res_y,
char *text);
-
-// doesn't need locking
void osd_get_function_sym(char *buffer, size_t buffer_size, int osd_function);
#endif /* MPLAYER_SUB_H */
diff --git a/sub/osd_dummy.c b/sub/osd_dummy.c
index 796d954c08..f7710ae2df 100644
--- a/sub/osd_dummy.c
+++ b/sub/osd_dummy.c
@@ -4,7 +4,7 @@
#include "config.h"
#include "mpv_talloc.h"
-#include "osd.h"
+#include "osd_state.h"
void osd_init_backend(struct osd_state *osd)
{
diff --git a/sub/osd_state.h b/sub/osd_state.h
index cce415a1b9..dc2d6d5b6c 100644
--- a/sub/osd_state.h
+++ b/sub/osd_state.h
@@ -79,4 +79,10 @@ struct osd_state {
struct mp_draw_sub_cache *draw_cache;
};
+// defined in osd_libass.c and osd_dummy.c
+void osd_object_get_bitmaps(struct osd_state *osd, struct osd_object *obj,
+ int format, struct sub_bitmaps *out_imgs);
+void osd_init_backend(struct osd_state *osd);
+void osd_destroy_backend(struct osd_state *osd);
+
#endif