[MPlayer-cvslog] r32541 - in trunk: Makefile ass_mp.c ass_mp.h find_sub.c libass/mputils.h libmpdemux/demux_mkv.c libmpdemux/demux_ogg.c libmpdemux/demux_ty_osd.c libvo/sub.h mp_core.h mpcommon.h mplayer.c sub sub/...
cigaes
subversion at mplayerhq.hu
Wed Oct 27 18:28:50 CEST 2010
Author: cigaes
Date: Wed Oct 27 18:28:50 2010
New Revision: 32541
Log:
Create a new directory, "sub", for subtitles and OSD related code.
Move subreader.[ch] into it.
Added:
trunk/sub/
trunk/sub/subreader.c
- copied, changed from r32533, trunk/subreader.c
trunk/sub/subreader.h
- copied unchanged from r32533, trunk/subreader.h
Deleted:
trunk/subreader.c
trunk/subreader.h
Modified:
trunk/Makefile
trunk/ass_mp.c
trunk/ass_mp.h
trunk/find_sub.c
trunk/libass/mputils.h
trunk/libmpdemux/demux_mkv.c
trunk/libmpdemux/demux_ogg.c
trunk/libmpdemux/demux_ty_osd.c
trunk/libvo/sub.h
trunk/mp_core.h
trunk/mpcommon.h
trunk/mplayer.c
trunk/sub_cc.c
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Wed Oct 27 17:21:49 2010 (r32540)
+++ trunk/Makefile Wed Oct 27 18:28:50 2010 (r32541)
@@ -350,7 +350,6 @@ SRCS_COMMON = asxparser.c \
spudec.c \
sub_cc.c \
subopt-helper.c \
- subreader.c \
vobsub.c \
libaf/af.c \
libaf/af_center.c \
@@ -522,6 +521,7 @@ SRCS_COMMON = asxparser.c \
stream/stream_mf.c \
stream/stream_null.c \
stream/url.c \
+ sub/subreader.c \
$(SRCS_COMMON-yes)
Modified: trunk/ass_mp.c
==============================================================================
--- trunk/ass_mp.c Wed Oct 27 17:21:49 2010 (r32540)
+++ trunk/ass_mp.c Wed Oct 27 18:28:50 2010 (r32541)
@@ -25,7 +25,7 @@
#include "mp_msg.h"
#include "mpcommon.h"
#include "path.h"
-#include "subreader.h"
+#include "sub/subreader.h"
#include "ass_mp.h"
#include "eosd.h"
Modified: trunk/ass_mp.h
==============================================================================
--- trunk/ass_mp.h Wed Oct 27 17:21:49 2010 (r32540)
+++ trunk/ass_mp.h Wed Oct 27 18:28:50 2010 (r32541)
@@ -24,7 +24,7 @@
#include "config.h"
#include <stdint.h>
-#include "subreader.h"
+#include "sub/subreader.h"
#if defined(CONFIG_ASS_INTERNAL) || !defined(CONFIG_ASS)
#include "libass/ass.h"
#else
Modified: trunk/find_sub.c
==============================================================================
--- trunk/find_sub.c Wed Oct 27 17:21:49 2010 (r32540)
+++ trunk/find_sub.c Wed Oct 27 18:28:50 2010 (r32541)
@@ -24,7 +24,7 @@
#include "libvo/video_out.h"
#include "libvo/sub.h"
-#include "subreader.h"
+#include "sub/subreader.h"
#include "mp_msg.h"
#include "help_mp.h"
Modified: trunk/libass/mputils.h
==============================================================================
--- trunk/libass/mputils.h Wed Oct 27 17:21:49 2010 (r32540)
+++ trunk/libass/mputils.h Wed Oct 27 18:28:50 2010 (r32541)
@@ -24,7 +24,7 @@
#include "mp_msg.h"
#include "help_mp.h"
#include "libvo/font_load.h" // for blur()
-#include "subreader.h" // for guess_buffer_cp
+#include "sub/subreader.h" // for guess_buffer_cp
#include "libvo/sub.h" // for utf8_get_char
#include "libavutil/common.h"
Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c Wed Oct 27 17:21:49 2010 (r32540)
+++ trunk/libmpdemux/demux_mkv.c Wed Oct 27 18:28:50 2010 (r32541)
@@ -40,7 +40,7 @@
#include "help_mp.h"
#include "vobsub.h"
-#include "subreader.h"
+#include "sub/subreader.h"
#include "libvo/sub.h"
#include "libavutil/common.h"
Modified: trunk/libmpdemux/demux_ogg.c
==============================================================================
--- trunk/libmpdemux/demux_ogg.c Wed Oct 27 17:21:49 2010 (r32540)
+++ trunk/libmpdemux/demux_ogg.c Wed Oct 27 18:28:50 2010 (r32541)
@@ -167,7 +167,7 @@ typedef struct ogg_demuxer {
//-------- subtitle support - should be moved to decoder layer, and queue
// - subtitles up in demuxer buffer...
-#include "subreader.h"
+#include "sub/subreader.h"
#include "libvo/sub.h"
#define OGG_SUB_MAX_LINE 128
Modified: trunk/libmpdemux/demux_ty_osd.c
==============================================================================
--- trunk/libmpdemux/demux_ty_osd.c Wed Oct 27 17:21:49 2010 (r32540)
+++ trunk/libmpdemux/demux_ty_osd.c Wed Oct 27 18:28:50 2010 (r32541)
@@ -23,7 +23,7 @@
//#include "parse_es.h"
//#include "stheader.h"
//#include "mp3_hdr.h"
-//#include "subreader.h"
+//#include "sub/subreader.h"
#include "sub_cc.h"
#include "libvo/sub.h"
#include "demux_ty_osd.h"
Modified: trunk/libvo/sub.h
==============================================================================
--- trunk/libvo/sub.h Wed Oct 27 17:21:49 2010 (r32540)
+++ trunk/libvo/sub.h Wed Oct 27 18:28:50 2010 (r32541)
@@ -67,7 +67,7 @@ typedef struct mp_osd_obj_s {
} mp_osd_obj_t;
-#include "subreader.h"
+#include "sub/subreader.h"
extern sub_data* subdata; //currently used subtitles
extern subtitle* vo_sub;
Modified: trunk/mp_core.h
==============================================================================
--- trunk/mp_core.h Wed Oct 27 17:21:49 2010 (r32540)
+++ trunk/mp_core.h Wed Oct 27 18:28:50 2010 (r32541)
@@ -28,7 +28,7 @@
#include "libmpdemux/stheader.h"
#include "mixer.h"
#include "libvo/video_out.h"
-#include "subreader.h"
+#include "sub/subreader.h"
// definitions used internally by the core player code
Modified: trunk/mpcommon.h
==============================================================================
--- trunk/mpcommon.h Wed Oct 27 17:21:49 2010 (r32540)
+++ trunk/mpcommon.h Wed Oct 27 18:28:50 2010 (r32541)
@@ -21,7 +21,7 @@
#include "m_config.h"
#include "m_option.h"
-#include "subreader.h"
+#include "sub/subreader.h"
#include "libmpdemux/demuxer.h"
#include "ass_mp.h"
Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c Wed Oct 27 17:21:49 2010 (r32540)
+++ trunk/mplayer.c Wed Oct 27 18:28:50 2010 (r32541)
@@ -121,7 +121,7 @@
#include "playtree.h"
#include "playtreeparser.h"
#include "spudec.h"
-#include "subreader.h"
+#include "sub/subreader.h"
#include "vobsub.h"
#include "eosd.h"
#include "osdep/getch2.h"
Copied and modified: trunk/sub/subreader.c (from r32533, trunk/subreader.c)
==============================================================================
--- trunk/subreader.c Sat Oct 23 23:09:45 2010 (r32533, copy source)
+++ trunk/sub/subreader.c Wed Oct 27 18:28:50 2010 (r32541)
@@ -33,7 +33,7 @@
#include "config.h"
#include "mp_msg.h"
#include "mpcommon.h"
-#include "subreader.h"
+#include "sub/subreader.h"
#include "subassconvert.h"
#include "libvo/sub.h"
#include "stream/stream.h"
Modified: trunk/sub_cc.c
==============================================================================
--- trunk/sub_cc.c Wed Oct 27 17:21:49 2010 (r32540)
+++ trunk/sub_cc.c Wed Oct 27 18:28:50 2010 (r32541)
@@ -35,7 +35,7 @@
#include "config.h"
#include "sub_cc.h"
-#include "subreader.h"
+#include "sub/subreader.h"
#include "libvo/video_out.h"
#include "libvo/sub.h"
More information about the MPlayer-cvslog
mailing list