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.

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"

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"

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"
 

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"

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"

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"

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"
 

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"

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 \

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"
 

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"

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;

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"

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;

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",

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"

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"

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)
 {

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"

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"

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;

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 {

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"
 

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"

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;
 };

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
 

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;

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 {

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

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"

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

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 {

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;

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"

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"

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"

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"
 

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"

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"

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"

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"

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" ),