[MPlayer-cvslog] r32553 - in trunk: Makefile command.c gui/interface.c gui/interface.h help/help_mp-de.h help/help_mp-fr.h help/help_mp-ru.h help/help_mp-tr.h libass/mputils.h libmenu/menu.c libmenu/menu_cmdlist.c ...
cigaes
subversion at mplayerhq.hu
Wed Oct 27 19:37:29 CEST 2010
Author: cigaes
Date: Wed Oct 27 19:37:29 2010
New Revision: 32553
Log:
Move font_load.[ch], font_load_ft.c and osd_font.h from libvo to sub.
Added:
trunk/sub/font_load.c
- copied, changed from r32550, trunk/libvo/font_load.c
trunk/sub/font_load.h
- copied unchanged from r32550, trunk/libvo/font_load.h
trunk/sub/font_load_ft.c
- copied unchanged from r32550, trunk/libvo/font_load_ft.c
trunk/sub/osd_font.h
- copied unchanged from r32550, trunk/libvo/osd_font.h
Deleted:
trunk/libvo/font_load.c
trunk/libvo/font_load.h
trunk/libvo/font_load_ft.c
trunk/libvo/osd_font.h
Modified:
trunk/Makefile
trunk/command.c
trunk/gui/interface.c
trunk/gui/interface.h
trunk/libass/mputils.h
trunk/libmenu/menu.c
trunk/libmenu/menu_cmdlist.c
trunk/libmenu/menu_console.c
trunk/libmenu/menu_list.c
trunk/libmenu/menu_txt.c
trunk/libmenu/vf_menu.c
trunk/libvo/sub.c
trunk/libvo/video_out.h
trunk/libvo/vo_aa.c
trunk/libvo/vo_direct3d.c
trunk/libvo/vo_gl.c
trunk/libvo/vo_vdpau.c
trunk/mencoder.c
trunk/mpcommon.c
trunk/mplayer.c
trunk/sub/ass_mp.c
Changes in other areas also in this revision:
Modified:
trunk/help/help_mp-de.h
trunk/help/help_mp-fr.h
trunk/help/help_mp-ru.h
trunk/help/help_mp-tr.h
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/Makefile Wed Oct 27 19:37:29 2010 (r32553)
@@ -27,7 +27,7 @@ SRCS_AUDIO_INPUT-$(ALSA1X) +=
SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c
SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c
SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes)
-SRCS_COMMON-$(BITMAP_FONT) += libvo/font_load.c
+SRCS_COMMON-$(BITMAP_FONT) += sub/font_load.c
SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \
stream/cdinfo.c
SRCS_COMMON-$(CDDB) += stream/stream_cddb.c
@@ -119,7 +119,7 @@ SRCS_COMMON-$(FFMPEG_A) +=
libmpcodecs/vf_spp.c \
libmpcodecs/vf_uspp.c \
-SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c
+SRCS_COMMON-$(FREETYPE) += sub/font_load_ft.c
SRCS_COMMON-$(FTP) += stream/stream_ftp.c
SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c
SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c
Modified: trunk/command.c
==============================================================================
--- trunk/command.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/command.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -37,7 +37,7 @@
#include "libmpcodecs/vf.h"
#include "libmpcodecs/vd.h"
#include "libvo/video_out.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "playtree.h"
#include "libao2/audio_out.h"
#include "mpcommon.h"
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/gui/interface.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -45,7 +45,7 @@
#include "libmpcodecs/vf.h"
#include "libvo/x11_common.h"
#include "libvo/video_out.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "libvo/sub.h"
#include "input/input.h"
#include "libao2/audio_out.h"
Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/gui/interface.h Wed Oct 27 19:37:29 2010 (r32553)
@@ -23,7 +23,7 @@
#include "m_config.h"
#include "playtree.h"
#include "mplayer/play.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "cfg.h"
#include "stream/stream.h"
Modified: trunk/libass/mputils.h
==============================================================================
--- trunk/libass/mputils.h Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/libass/mputils.h Wed Oct 27 19:37:29 2010 (r32553)
@@ -23,7 +23,7 @@
#include "mp_msg.h"
#include "help_mp.h"
-#include "libvo/font_load.h" // for blur()
+#include "sub/font_load.h" // for blur()
#include "sub/subreader.h" // for guess_buffer_cp
#include "libvo/sub.h" // for utf8_get_char
#include "libavutil/common.h"
Modified: trunk/libmenu/menu.c
==============================================================================
--- trunk/libmenu/menu.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/libmenu/menu.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -27,7 +27,7 @@
#include <unistd.h>
#include "libvo/osd.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "libvo/sub.h"
#include "osdep/keycodes.h"
#include "asxparser.h"
Modified: trunk/libmenu/menu_cmdlist.c
==============================================================================
--- trunk/libmenu/menu_cmdlist.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/libmenu/menu_cmdlist.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -34,7 +34,7 @@
#include "menu.h"
#include "menu_list.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "input/input.h"
Modified: trunk/libmenu/menu_console.c
==============================================================================
--- trunk/libmenu/menu_console.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/libmenu/menu_console.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -39,7 +39,7 @@
#include "m_option.h"
#include "menu.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "osdep/keycodes.h"
#include "input/input.h"
#include "osdep/timer.h"
Modified: trunk/libmenu/menu_list.c
==============================================================================
--- trunk/libmenu/menu_list.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/libmenu/menu_list.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -29,7 +29,7 @@
#include "m_struct.h"
#include "menu.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "osdep/keycodes.h"
#define IMPL 1
Modified: trunk/libmenu/menu_txt.c
==============================================================================
--- trunk/libmenu/menu_txt.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/libmenu/menu_txt.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -31,7 +31,7 @@
#include "m_option.h"
#include "menu.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "osdep/keycodes.h"
struct menu_priv_s {
Modified: trunk/libmenu/vf_menu.c
==============================================================================
--- trunk/libmenu/vf_menu.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/libmenu/vf_menu.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -33,7 +33,7 @@
#include "libvo/fastmemcpy.h"
#include "libvo/video_out.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "libvo/sub.h"
#include "input/input.h"
#include "m_struct.h"
Modified: trunk/libvo/sub.c
==============================================================================
--- trunk/libvo/sub.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/libvo/sub.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -36,7 +36,7 @@
#include "mp_msg.h"
#include "help_mp.h"
#include "video_out.h"
-#include "font_load.h"
+#include "sub/font_load.h"
#include "sub.h"
#include "sub/spudec.h"
#include "libavutil/common.h"
Modified: trunk/libvo/video_out.h
==============================================================================
--- trunk/libvo/video_out.h Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/libvo/video_out.h Wed Oct 27 19:37:29 2010 (r32553)
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include <stdarg.h>
-//#include "font_load.h"
+//#include "sub/font_load.h"
#include "libmpcodecs/img_format.h"
//#include "vidix/vidix.h"
Modified: trunk/libvo/vo_aa.c
==============================================================================
--- trunk/libvo/vo_aa.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/libvo/vo_aa.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -39,7 +39,7 @@
#include "aspect.h"
#include "libswscale/swscale.h"
#include "libmpcodecs/vf_scale.h"
-#include "font_load.h"
+#include "sub/font_load.h"
#include "sub.h"
#include "osdep/keycodes.h"
Modified: trunk/libvo/vo_direct3d.c
==============================================================================
--- trunk/libvo/vo_direct3d.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/libvo/vo_direct3d.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -30,7 +30,7 @@
#include "aspect.h"
#include "w32_common.h"
#include "libavutil/common.h"
-#include "font_load.h"
+#include "sub/font_load.h"
#include "sub.h"
static const vo_info_t info =
Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/libvo/vo_gl.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -32,7 +32,7 @@
#include "subopt-helper.h"
#include "video_out.h"
#include "video_out_internal.h"
-#include "font_load.h"
+#include "sub/font_load.h"
#include "sub.h"
#include "gl_common.h"
Modified: trunk/libvo/vo_vdpau.c
==============================================================================
--- trunk/libvo/vo_vdpau.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/libvo/vo_vdpau.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -41,7 +41,7 @@
#include "video_out_internal.h"
#include "x11_common.h"
#include "aspect.h"
-#include "font_load.h"
+#include "sub/font_load.h"
#include "sub.h"
#include "sub/eosd.h"
#include "subopt-helper.h"
Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/mencoder.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -72,7 +72,7 @@
#include "libmpdemux/muxer.h"
#include "libmpdemux/stheader.h"
#include "libvo/fastmemcpy.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "libvo/sub.h"
#include "libvo/video_out.h"
#include "osdep/timer.h"
Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/mpcommon.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -28,7 +28,7 @@
#include "osdep/priority.h"
#include "path.h"
#include "mplayer.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "libvo/sub.h"
#include "libvo/video_out.h"
#include "cpudetect.h"
Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/mplayer.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -86,7 +86,7 @@
#include "libmpcodecs/vf.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
#include "libvo/sub.h"
#include "libvo/video_out.h"
#include "stream/cache2.h"
Modified: trunk/sub/ass_mp.c
==============================================================================
--- trunk/sub/ass_mp.c Wed Oct 27 19:36:46 2010 (r32552)
+++ trunk/sub/ass_mp.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -32,7 +32,7 @@
#include "mpcommon.h"
#include "libvo/sub.h"
#include "help_mp.h"
-#include "libvo/font_load.h"
+#include "font_load.h"
#include "stream/stream.h"
#ifdef CONFIG_FONTCONFIG
Copied and modified: trunk/sub/font_load.c (from r32550, trunk/libvo/font_load.c)
==============================================================================
--- trunk/libvo/font_load.c Wed Oct 27 19:13:54 2010 (r32550, copy source)
+++ trunk/sub/font_load.c Wed Oct 27 19:37:29 2010 (r32553)
@@ -26,7 +26,7 @@
#include <unistd.h>
#include "font_load.h"
-#include "sub.h"
+#include "libvo/sub.h"
#include "mp_msg.h"
raw_file* load_raw(char *name,int verbose){
More information about the MPlayer-cvslog
mailing list