Move/rename subreader.c

Makefile

@@ -208,6 +208,7 @@ SOURCES = talloc.c \
           demux/demux_mkv.c \
           demux/demux_mpg.c \
           demux/demux_sub.c \
+          demux/demux_subreader.c \
           demux/demux_ts.c \
           demux/mp3_hdr.c \
           demux/parse_es.c \
@@ -240,7 +241,6 @@ SOURCES = talloc.c \
           sub/sd_srt.c \
           sub/spudec.c \
           sub/sub.c \
-          sub/subreader.c \
           video/csputils.c \
           video/fmt-conversion.c \
           video/image_writer.c \

core/mplayer.c

@@ -71,7 +71,7 @@
 #include "core/mplayer.h"
 #include "core/m_property.h"
 
-#include "sub/subreader.h"
+#include "demux/subreader.h"
 #include "sub/find_subfiles.h"
 #include "sub/dec_sub.h"
 #include "sub/sd.h"

sub/ass_mp.c

@@ -33,7 +33,6 @@
 #include "core/mp_msg.h"
 #include "core/path.h"
 #include "ass_mp.h"
-#include "subreader.h"
 #include "sub/sub.h"
 #include "stream/stream.h"
 #include "core/options.h"

sub/ass_mp.h

@@ -25,7 +25,6 @@
 #include <stdbool.h>
 
 #include "config.h"
-#include "subreader.h"
 
 // This is probably arbitrary.
 // sd_lavc_conv might indirectly still assume this PlayResY, though.

sub/dec_sub.c

@@ -25,7 +25,7 @@
 #include "sd.h"
 #include "sub.h"
 #include "dec_sub.h"
-#include "subreader.h"
+#include "demux/subreader.h"
 #include "core/options.h"
 #include "core/mp_msg.h"
 

sub/sub.c

@@ -37,7 +37,6 @@
 #include "dec_sub.h"
 #include "img_convert.h"
 #include "draw_bmp.h"
-#include "subreader.h"
 #include "video/mp_image.h"
 #include "video/mp_image_pool.h"