From e5311586ab7641e0e1936473594bd9fbaa67bb2d Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 24 Nov 2013 12:58:06 +0100 Subject: 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 | 2 +- mpvcore/player/command.c | 2 +- mpvcore/player/main.c | 2 +- mpvcore/player/mp_lua.c | 2 +- mpvcore/player/osd.c | 2 +- mpvcore/player/playloop.c | 2 +- mpvcore/player/screenshot.c | 2 +- mpvcore/player/video.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'mpvcore') 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" -- cgit v1.2.3