[MPlayer-cvslog] r32547 - in trunk: Makefile ass_mp.c command.c eosd.c eosd.h libmpcodecs/dec_video.c libmpcodecs/vf_ass.c libmpcodecs/vf_vo.c libvo/vo_gl.c libvo/vo_vdpau.c mencoder.c mplayer.c sub/eosd.c sub/eosd.h

[cigaes]

Author: cigaes
Date: Wed Oct 27 19:03:26 2010
New Revision: 32547

Log:
Move eosd.[ch] to the sub directory.
Remove a duplicate include of eosd.h.

Added:
   trunk/sub/eosd.c
      - copied, changed from r32541, trunk/eosd.c
   trunk/sub/eosd.h
      - copied unchanged from r32541, trunk/eosd.h
Deleted:
   trunk/eosd.c
   trunk/eosd.h
Modified:
   trunk/Makefile
   trunk/ass_mp.c
   trunk/command.c
   trunk/libmpcodecs/dec_video.c
   trunk/libmpcodecs/vf_ass.c
   trunk/libmpcodecs/vf_vo.c
   trunk/libvo/vo_gl.c
   trunk/libvo/vo_vdpau.c
   trunk/mencoder.c
   trunk/mplayer.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Oct 27 18:58:23 2010	(r32546)
+++ trunk/Makefile	Wed Oct 27 19:03:26 2010	(r32547)
@@ -335,7 +335,6 @@ SRCS_COMMON = asxparser.c \
               codec-cfg.c \
               cpudetect.c \
               edl.c \
-              eosd.c \
               fmt-conversion.c \
               m_config.c \
               m_option.c \
@@ -517,6 +516,7 @@ SRCS_COMMON = asxparser.c \
               stream/stream_mf.c \
               stream/stream_null.c \
               stream/url.c \
+              sub/eosd.c \
               sub/find_sub.c \
               sub/spudec.c \
               sub/sub_cc.c \

Modified: trunk/ass_mp.c
==============================================================================
--- trunk/ass_mp.c	Wed Oct 27 18:58:23 2010	(r32546)
+++ trunk/ass_mp.c	Wed Oct 27 19:03:26 2010	(r32547)
@@ -28,7 +28,7 @@
 #include "sub/subreader.h"
 
 #include "ass_mp.h"
-#include "eosd.h"
+#include "sub/eosd.h"
 #include "mpcommon.h"
 #include "libvo/sub.h"
 #include "help_mp.h"

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	Wed Oct 27 18:58:23 2010	(r32546)
+++ trunk/command.c	Wed Oct 27 19:03:26 2010	(r32547)
@@ -62,7 +62,7 @@
 #include "m_struct.h"
 #include "libmenu/menu.h"
 #include "gui/interface.h"
-#include "eosd.h"
+#include "sub/eosd.h"
 #include "pnm_loader.h"
 
 #include "mp_core.h"

Modified: trunk/libmpcodecs/dec_video.c
==============================================================================
--- trunk/libmpcodecs/dec_video.c	Wed Oct 27 18:58:23 2010	(r32546)
+++ trunk/libmpcodecs/dec_video.c	Wed Oct 27 19:03:26 2010	(r32547)
@@ -40,7 +40,7 @@
 #include "libmpdemux/stheader.h"
 #include "vd.h"
 #include "vf.h"
-#include "eosd.h"
+#include "sub/eosd.h"
 
 #include "dec_video.h"
 

Modified: trunk/libmpcodecs/vf_ass.c
==============================================================================
--- trunk/libmpcodecs/vf_ass.c	Wed Oct 27 18:58:23 2010	(r32546)
+++ trunk/libmpcodecs/vf_ass.c	Wed Oct 27 19:03:26 2010	(r32547)
@@ -41,7 +41,7 @@
 #include "m_struct.h"
 
 #include "ass_mp.h"
-#include "eosd.h"
+#include "sub/eosd.h"
 
 #define _r(c)  ((c)>>24)
 #define _g(c)  (((c)>>16)&0xFF)

Modified: trunk/libmpcodecs/vf_vo.c
==============================================================================
--- trunk/libmpcodecs/vf_vo.c	Wed Oct 27 18:58:23 2010	(r32546)
+++ trunk/libmpcodecs/vf_vo.c	Wed Oct 27 19:03:26 2010	(r32547)
@@ -28,9 +28,7 @@
 
 #include "libvo/sub.h"
 #include "libvo/video_out.h"
-#include "eosd.h"
-
-#include "eosd.h"
+#include "sub/eosd.h"
 
 //===========================================================================//
 

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	Wed Oct 27 18:58:23 2010	(r32546)
+++ trunk/libvo/vo_gl.c	Wed Oct 27 19:03:26 2010	(r32547)
@@ -38,7 +38,7 @@
 #include "gl_common.h"
 #include "aspect.h"
 #include "fastmemcpy.h"
-#include "eosd.h"
+#include "sub/eosd.h"
 
 #ifdef CONFIG_GL_SDL
 #ifdef CONFIG_SDL_SDL_H

Modified: trunk/libvo/vo_vdpau.c
==============================================================================
--- trunk/libvo/vo_vdpau.c	Wed Oct 27 18:58:23 2010	(r32546)
+++ trunk/libvo/vo_vdpau.c	Wed Oct 27 19:03:26 2010	(r32547)
@@ -43,7 +43,7 @@
 #include "aspect.h"
 #include "font_load.h"
 #include "sub.h"
-#include "eosd.h"
+#include "sub/eosd.h"
 #include "subopt-helper.h"
 
 #include "libavcodec/vdpau.h"

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Wed Oct 27 18:58:23 2010	(r32546)
+++ trunk/mencoder.c	Wed Oct 27 19:03:26 2010	(r32547)
@@ -96,7 +96,7 @@
 #include "path.h"
 #include "sub/spudec.h"
 #include "sub/vobsub.h"
-#include "eosd.h"
+#include "sub/eosd.h"
 #include "mencoder.h"
 
 

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Oct 27 18:58:23 2010	(r32546)
+++ trunk/mplayer.c	Wed Oct 27 19:03:26 2010	(r32547)
@@ -123,7 +123,7 @@
 #include "sub/spudec.h"
 #include "sub/subreader.h"
 #include "sub/vobsub.h"
-#include "eosd.h"
+#include "sub/eosd.h"
 #include "osdep/getch2.h"
 #include "osdep/timer.h"
 

Copied and modified: trunk/sub/eosd.c (from r32541, trunk/eosd.c)
==============================================================================
--- trunk/eosd.c	Wed Oct 27 18:28:50 2010	(r32541, copy source)
+++ trunk/sub/eosd.c	Wed Oct 27 19:03:26 2010	(r32547)
@@ -24,7 +24,7 @@
 #include "libvo/video_out.h"
 #include "libvo/sub.h"
 #include "ass_mp.h"
-#include "eosd.h"
+#include "sub/eosd.h"
 
 static struct mp_eosd_source *sources;
 static struct mp_eosd_settings settings;