Rename sub.c/.h to osd.c/.h

This was way too misleading. osd.c merely calls the subtitle renderers,
instead of actually dealing with subtitles.

43 files changed, 36 insertions, 47 deletions

diff --git a/mpvcore/options.c b/mpvcore/options.c
index b584099eff..1eec14284d 100644
--- a/mpvcore/options.c
+++ b/mpvcore/options.c
@@ -35,7 +35,7 @@
 #include "stream/tv.h"
 #include "stream/stream_radio.h"
 #include "video/csputils.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "audio/mixer.h"
 #include "audio/filter/af.h"
 #include "audio/decode/dec_audio.h"
diff --git a/mpvcore/player/command.c b/mpvcore/player/command.c
index c2433106ac..884a9244b0 100644
--- a/mpvcore/player/command.c
+++ b/mpvcore/player/command.c
@@ -38,7 +38,7 @@
 #include "mpvcore/resolve.h"
 #include "mpvcore/playlist.h"
 #include "mpvcore/playlist_parser.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "sub/dec_sub.h"
 #include "mpvcore/m_option.h"
 #include "mpvcore/m_property.h"
diff --git a/mpvcore/player/main.c b/mpvcore/player/main.c
index 1e56cf3084..c1c25bce27 100644
--- a/mpvcore/player/main.c
+++ b/mpvcore/player/main.c
@@ -56,7 +56,7 @@
 #include "demux/demux.h"
 #include "stream/stream.h"
 #include "sub/ass_mp.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "video/decode/dec_video.h"
 #include "video/out/vo.h"
 
diff --git a/mpvcore/player/mp_lua.c b/mpvcore/player/mp_lua.c
index 4b5512c926..03e21bf535 100644
--- a/mpvcore/player/mp_lua.c
+++ b/mpvcore/player/mp_lua.c
@@ -15,7 +15,7 @@
 #include "mpvcore/path.h"
 #include "mpvcore/bstr.h"
 #include "osdep/timer.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "mp_core.h"
 #include "command.h"
 #include "mp_lua.h"
diff --git a/mpvcore/player/osd.c b/mpvcore/player/osd.c
index afb04c837a..1674fcab8b 100644
--- a/mpvcore/player/osd.c
+++ b/mpvcore/player/osd.c
@@ -36,7 +36,7 @@
 #include "osdep/timer.h"
 
 #include "demux/demux.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 
 #include "mp_core.h"
 #include "command.h"
diff --git a/mpvcore/player/playloop.c b/mpvcore/player/playloop.c
index 591d31fbca..ad32371699 100644
--- a/mpvcore/player/playloop.c
+++ b/mpvcore/player/playloop.c
@@ -41,7 +41,7 @@
 #include "audio/out/ao.h"
 #include "demux/demux.h"
 #include "stream/stream.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "video/filter/vf.h"
 #include "video/decode/dec_video.h"
 #include "video/out/vo.h"
diff --git a/mpvcore/player/screenshot.c b/mpvcore/player/screenshot.c
index f564b5e9d7..47f76f2a1e 100644
--- a/mpvcore/player/screenshot.c
+++ b/mpvcore/player/screenshot.c
@@ -36,7 +36,7 @@
 #include "video/filter/vf.h"
 #include "video/out/vo.h"
 #include "video/image_writer.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 
 #include "video/csputils.h"
 
diff --git a/mpvcore/player/video.c b/mpvcore/player/video.c
index 7b3a236265..5ba9d5624b 100644
--- a/mpvcore/player/video.c
+++ b/mpvcore/player/video.c
@@ -34,7 +34,7 @@
 #include "audio/out/ao.h"
 #include "demux/demux.h"
 #include "stream/stream.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "video/hwdec.h"
 #include "video/filter/vf.h"
 #include "video/decode/dec_video.h"
diff --git a/old-makefile b/old-makefile
index fe516b66b1..85ad2e028f 100644
--- a/old-makefile
+++ b/old-makefile
@@ -244,6 +244,7 @@ SOURCES = audio/audio.c \
           sub/draw_bmp.c \
           sub/find_subfiles.c \
           sub/img_convert.c \
+          sub/osd.c \
           sub/sd_lavc.c \
           sub/sd_lavc_conv.c \
           sub/sd_lavf_srt.c \
@@ -252,7 +253,6 @@ SOURCES = audio/audio.c \
           sub/sd_spu.c \
           sub/sd_srt.c \
           sub/spudec.c \
-          sub/sub.c \
           ta/ta.c \
           ta/ta_utils.c \
           ta/ta_talloc.c \
diff --git a/sub/ass_mp.c b/sub/ass_mp.c
index ac36e2d954..33cd1559fc 100644
--- a/sub/ass_mp.c
+++ b/sub/ass_mp.c
@@ -33,7 +33,7 @@
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/path.h"
 #include "ass_mp.h"
-#include "sub/sub.h"
+#include "osd.h"
 #include "stream/stream.h"
 #include "mpvcore/options.h"
 
diff --git a/sub/dec_sub.c b/sub/dec_sub.c
index cb76acc248..425db1b3e8 100644
--- a/sub/dec_sub.c
+++ b/sub/dec_sub.c
@@ -25,7 +25,6 @@
 #include "config.h"
 #include "demux/demux.h"
 #include "sd.h"
-#include "sub.h"
 #include "dec_sub.h"
 #include "mpvcore/options.h"
 #include "mpvcore/mp_msg.h"
diff --git a/sub/dec_sub.h b/sub/dec_sub.h
index 9ff2b366bd..4fa62d7b97 100644
--- a/sub/dec_sub.h
+++ b/sub/dec_sub.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "sub/sub.h"
+#include "osd.h"
 
 struct sh_stream;
 struct ass_track;
diff --git a/sub/draw_bmp.c b/sub/draw_bmp.c
index 3dc46fb827..2b91befe50 100644
--- a/sub/draw_bmp.c
+++ b/sub/draw_bmp.c
@@ -26,9 +26,8 @@
 #include <libavutil/common.h>
 
 #include "mpvcore/mp_common.h"
-#include "sub/draw_bmp.h"
-#include "sub/sub.h"
-#include "sub/img_convert.h"
+#include "draw_bmp.h"
+#include "img_convert.h"
 #include "video/mp_image.h"
 #include "video/sws_utils.h"
 #include "video/img_format.h"
diff --git a/sub/draw_bmp.h b/sub/draw_bmp.h
index 489e91f666..9ccd764d5d 100644
--- a/sub/draw_bmp.h
+++ b/sub/draw_bmp.h
@@ -1,7 +1,7 @@
 #ifndef MPLAYER_DRAW_BMP_H
 #define MPLAYER_DRAW_BMP_H
 
-#include "sub/sub.h"
+#include "osd.h"
 
 struct mp_image;
 struct sub_bitmaps;
diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c
index a5b1bdeb22..fc55484c52 100644
--- a/sub/find_subfiles.c
+++ b/sub/find_subfiles.c
@@ -11,7 +11,6 @@
 #include "mpvcore/path.h"
 #include "mpvcore/mp_common.h"
 #include "sub/find_subfiles.h"
-#include "sub/sub.h"
 
 static const char *sub_exts[] = {"utf", "utf8", "utf-8", "idx", "sub", "srt",
                                  "smi", "rt", "txt", "ssa", "aqt", "jss",
diff --git a/sub/img_convert.c b/sub/img_convert.c
index 3ebe993c17..ce72f2c6d3 100644
--- a/sub/img_convert.c
+++ b/sub/img_convert.c
@@ -24,7 +24,7 @@
 #include "talloc.h"
 
 #include "img_convert.h"
-#include "sub.h"
+#include "osd.h"
 #include "video/img_format.h"
 #include "video/mp_image.h"
 #include "video/sws_utils.h"
diff --git a/sub/sub.c b/sub/osd.c
index 9be61bd1d3..4c1b2ff322 100644
--- a/sub/sub.c
+++ b/sub/osd.c
@@ -32,7 +32,7 @@
 #include "talloc.h"
 #include "mpvcore/options.h"
 #include "mpvcore/mp_msg.h"
-#include "sub.h"
+#include "osd.h"
 #include "dec_sub.h"
 #include "img_convert.h"
 #include "draw_bmp.h"
diff --git a/sub/sub.h b/sub/osd.h
index 64e10193ea..64e10193ea 100644
--- a/sub/sub.h
+++ b/sub/osd.h
diff --git a/sub/osd_dummy.c b/sub/osd_dummy.c
index a330c63982..cc2ba37377 100644
--- a/sub/osd_dummy.c
+++ b/sub/osd_dummy.c
@@ -4,7 +4,7 @@
 
 #include "config.h"
 #include "talloc.h"
-#include "sub.h"
+#include "osd.h"
 
 void osd_init_backend(struct osd_state *osd)
 {
diff --git a/sub/osd_libass.c b/sub/osd_libass.c
index 29db58f464..0564fbb4d3 100644
--- a/sub/osd_libass.c
+++ b/sub/osd_libass.c
@@ -27,7 +27,7 @@
 #include "talloc.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/mp_msg.h"
-#include "sub.h"
+#include "osd.h"
 
 static const char osd_font_pfb[] =
 #include "sub/osd_font.h"
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index fd545cdbda..631c81a083 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -30,7 +30,6 @@
 #include "mpvcore/mp_msg.h"
 #include "video/csputils.h"
 #include "video/mp_image.h"
-#include "sub.h"
 #include "dec_sub.h"
 #include "ass_mp.h"
 #include "sd.h"
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c
index 683436eb2a..9741b0de70 100644
--- a/sub/sd_lavc.c
+++ b/sub/sd_lavc.c
@@ -28,7 +28,6 @@
 #include "video/mp_image.h"
 #include "sd.h"
 #include "dec_sub.h"
-#include "sub.h"
 
 struct sd_lavc_priv {
     AVCodecContext *avctx;
diff --git a/sub/sd_spu.c b/sub/sd_spu.c
index 0061ec81e3..15ea351159 100644
--- a/sub/sd_spu.c
+++ b/sub/sd_spu.c
@@ -22,7 +22,6 @@
 #include "mpvcore/options.h"
 #include "video/mp_image.h"
 #include "sd.h"
-#include "sub.h"
 #include "spudec.h"
 
 struct sd_spu_priv {
diff --git a/sub/spudec.c b/sub/spudec.c
index 5d58b3664c..5a2c094be9 100644
--- a/sub/spudec.c
+++ b/sub/spudec.c
@@ -43,7 +43,7 @@
 #include "mpvcore/mp_msg.h"
 
 #include "spudec.h"
-#include "sub.h"
+#include "osd.h"
 #include "mpvcore/mp_common.h"
 #include "video/csputils.h"
 
diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c
index 0c72105cda..646216967b 100644
--- a/video/filter/vf_sub.c
+++ b/video/filter/vf_sub.c
@@ -34,7 +34,7 @@
 #include "video/img_format.h"
 #include "video/mp_image.h"
 #include "vf.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "sub/dec_sub.h"
 
 #include "video/sws_utils.h"
diff --git a/video/filter/vf_vo.c b/video/filter/vf_vo.c
index 5b6e2ab4d2..74becd7250 100644
--- a/video/filter/vf_vo.c
+++ b/video/filter/vf_vo.c
@@ -30,8 +30,6 @@
 
 #include "video/out/vo.h"
 
-#include "sub/sub.h"
-
 struct vf_priv_s {
     struct vo *vo;
 };
diff --git a/video/out/gl_common.c b/video/out/gl_common.c
index a3ed6d626d..8ab2c8ec10 100644
--- a/video/out/gl_common.c
+++ b/video/out/gl_common.c
@@ -44,8 +44,6 @@
 #include "gl_common.h"
 #include "mpvcore/options.h"
 #include "mpvcore/m_option.h"
-#include "sub/sub.h"
-#include "bitmap_packer.h"
 
 //! \defgroup glgeneral OpenGL general helper functions
 
diff --git a/video/out/gl_osd.h b/video/out/gl_osd.h
index 29b4584a4a..445766d19a 100644
--- a/video/out/gl_osd.h
+++ b/video/out/gl_osd.h
@@ -5,7 +5,7 @@
 #include <inttypes.h>
 
 #include "gl_common.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 
 struct mpgl_osd_part {
     enum sub_bitmap_format format;
diff --git a/video/out/gl_video.h b/video/out/gl_video.h
index cab5f0f077..27da29461c 100644
--- a/video/out/gl_video.h
+++ b/video/out/gl_video.h
@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "gl_common.h"
 
 struct lut3d {
diff --git a/video/out/vo.c b/video/out/vo.c
index 737c9c34f9..9fc4db1418 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -42,7 +42,7 @@
 #include "mpvcore/mpv_global.h"
 #include "video/mp_image.h"
 #include "video/vfcap.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 
 //
 // Externally visible list of all vo drivers
diff --git a/video/out/vo_corevideo.c b/video/out/vo_corevideo.c
index 7b34a91924..9b415de191 100644
--- a/video/out/vo_corevideo.c
+++ b/video/out/vo_corevideo.c
@@ -31,7 +31,7 @@
 
 #include "talloc.h"
 #include "video/out/vo.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "mpvcore/m_option.h"
 
 #include "video/csputils.h"
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index cd440f89f6..06d91e4e18 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -40,7 +40,7 @@
 #include "mpvcore/mp_msg.h"
 #include "w32_common.h"
 #include "libavutil/common.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "bitmap_packer.h"
 
 // shaders generated by fxc.exe from d3d_shader_yuv.hlsl
diff --git a/video/out/vo_image.c b/video/out/vo_image.c
index 64619a47d6..6fcf77e5d6 100644
--- a/video/out/vo_image.c
+++ b/video/out/vo_image.c
@@ -37,7 +37,7 @@
 #include "video/fmt-conversion.h"
 #include "video/image_writer.h"
 #include "video/sws_utils.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "mpvcore/m_option.h"
 
 struct priv {
diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c
index b1416b7fe3..0080126c7d 100644
--- a/video/out/vo_lavc.c
+++ b/video/out/vo_lavc.c
@@ -33,8 +33,7 @@
 
 #include "mpvcore/encode_lavc.h"
 
-#include "sub/sub.h"
-#include "sub/dec_sub.h"
+#include "sub/osd.h"
 
 struct priv {
     uint8_t *buffer;
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 71a5092288..e086e36e7d 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -42,7 +42,7 @@
 #include "vo.h"
 #include "video/vfcap.h"
 #include "video/mp_image.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 
 #include "gl_common.h"
 #include "gl_osd.h"
diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c
index 310583a8ed..3c11f3cac2 100644
--- a/video/out/vo_opengl_old.c
+++ b/video/out/vo_opengl_old.c
@@ -38,7 +38,7 @@
 #include "vo.h"
 #include "video/vfcap.h"
 #include "video/mp_image.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 
 #include "gl_common.h"
 #include "gl_osd.h"
diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c
index 60498e2847..6fe62b187b 100644
--- a/video/out/vo_sdl.c
+++ b/video/out/vo_sdl.c
@@ -38,7 +38,7 @@
 
 #include "osdep/timer.h"
 
-#include "sub/sub.h"
+#include "sub/osd.h"
 
 #include "video/mp_image.h"
 #include "video/vfcap.h"
diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c
index 83528a2100..df9ff2ce5d 100644
--- a/video/out/vo_vaapi.c
+++ b/video/out/vo_vaapi.c
@@ -32,7 +32,7 @@
 #include "mpvcore/mp_msg.h"
 #include "video/out/vo.h"
 #include "video/memcpy_pic.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "sub/img_convert.h"
 #include "x11_common.h"
 
diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c
index e1816b1595..54b13cfd94 100644
--- a/video/out/vo_vdpau.c
+++ b/video/out/vo_vdpau.c
@@ -43,7 +43,7 @@
 #include "vo.h"
 #include "x11_common.h"
 #include "video/csputils.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "mpvcore/m_option.h"
 #include "video/vfcap.h"
 #include "video/mp_image.h"
diff --git a/video/out/vo_wayland.c b/video/out/vo_wayland.c
index b1f99bd26f..293b3081eb 100644
--- a/video/out/vo_wayland.c
+++ b/video/out/vo_wayland.c
@@ -30,7 +30,7 @@
 
 #include "config.h"
 #include "vo.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "video/vfcap.h"
 #include "video/mp_image.h"
 #include "mpvcore/mp_msg.h"
diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c
index be385ac621..513f63aa10 100644
--- a/video/out/vo_x11.c
+++ b/video/out/vo_x11.c
@@ -46,7 +46,7 @@
 #include <X11/extensions/XShm.h>
 #endif
 
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "sub/draw_bmp.h"
 
 #include "video/sws_utils.h"
diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c
index a64dd1202a..b86f0e5f6b 100644
--- a/video/out/vo_xv.c
+++ b/video/out/vo_xv.c
@@ -52,7 +52,7 @@
 #include "video/img_fourcc.h"
 #include "x11_common.h"
 #include "video/memcpy_pic.h"
-#include "sub/sub.h"
+#include "sub/osd.h"
 #include "sub/draw_bmp.h"
 #include "video/csputils.h"
 #include "mpvcore/m_option.h"
diff --git a/wscript_build.py b/wscript_build.py
index 7c2f262cf3..92d7137669 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -262,6 +262,7 @@ def build(ctx):
         ( "sub/draw_bmp.c" ),
         ( "sub/find_subfiles.c" ),
         ( "sub/img_convert.c" ),
+        ( "sub/osd.c" ),
         ( "sub/osd_dummy.c",                     "dummy-osd" ),
         ( "sub/osd_libass.c",                    "libass-osd" ),
         ( "sub/sd_ass.c",                        "libass" ),
@@ -273,7 +274,6 @@ def build(ctx):
         ( "sub/sd_spu.c" ),
         ( "sub/sd_srt.c" ),
         ( "sub/spudec.c" ),
-        ( "sub/sub.c" ),
 
         ## Video
         ( "video/csputils.c" ),