[xine-cvs] CVS: xine-lib/src/xine-engine Makefile.am,1.108,1.109 osd.c,1.74,1.75 osd.h,1.25,1.26 video_overlay.c,1.38,1.39 xine_internal.h,1.167,1.168

[Miguel F. <mig...@us...>]

Update of /cvsroot/xine/xine-lib/src/xine-engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17108/xine-engine

Modified Files:
	Makefile.am osd.c osd.h video_overlay.c xine_internal.h 
Log Message:
move alphablend to core


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/Makefile.am,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- Makefile.am	5 Sep 2005 17:02:57 -0000	1.108
+++ Makefile.am	25 Sep 2005 00:44:04 -0000	1.109
@@ -18,7 +18,8 @@
 	audio_decoder.c video_out.c audio_out.c resample.c events.c \
 	video_overlay.c osd.c scratch.c demux.c vo_scale.c \
 	xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \
-	input_rip.c input_cache.c info_helper.c refcounter.c
+	input_rip.c input_cache.c info_helper.c refcounter.c \
+	alphablend.c
 
 # FIXME: these are currently unused:
 EXTRA_DIST = lrb.c lrb.h accel_xvmc.h
@@ -41,7 +42,7 @@
         audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \
 	video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h  \
 	plugin_catalog.h audio_decoder.h video_decoder.h post.h \
-	io_helper.h broadcaster.h info_helper.h refcounter.h
+	io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h
 
 noinst_HEADERS = bswap.h
 

Index: osd.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/osd.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- osd.c	24 Sep 2005 19:08:26 -0000	1.74
+++ osd.c	25 Sep 2005 00:44:04 -0000	1.75
@@ -49,7 +49,6 @@
 #define XINE_ENGINE_INTERNAL
 
 #include "xine_internal.h"
-#include "video_out/alphablend.h"
 #include "xine-engine/bswap.h"
 #include "xineutils.h"
 #include "video_out.h"

Index: osd.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/osd.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- osd.h	14 Mar 2004 09:38:03 -0000	1.25
+++ osd.h	25 Sep 2005 00:44:04 -0000	1.26
@@ -31,7 +31,7 @@
 #ifdef XINE_COMPILE
 #  include "video_overlay.h"
 #  ifdef __OSD_C__
-#    include "video_out/alphablend.h"
+#    include "alphablend.h"
 #  endif
 #else
 #  include <xine/video_overlay.h>

Index: video_overlay.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/video_overlay.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- video_overlay.c	24 Sep 2005 19:08:26 -0000	1.38
+++ video_overlay.c	25 Sep 2005 00:44:04 -0000	1.39
@@ -30,8 +30,7 @@
 
 #include "buffer.h"
 #include "xine_internal.h"
-#include "video_out/alphablend.h"
-#include "xine-engine/bswap.h"
+#include "bswap.h"
 #include "xineutils.h"
 #include "video_overlay.h"
 

Index: xine_internal.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/xine_internal.h,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- xine_internal.h	25 Aug 2005 15:36:30 -0000	1.167
+++ xine_internal.h	25 Sep 2005 00:44:04 -0000	1.168
@@ -50,6 +50,7 @@
 #  include "broadcaster.h"
 #  include "io_helper.h"
 #  include "info_helper.h"
+#  include "alphablend.h"
 #else
 #  include <xine.h>
 #  include <xine/refcounter.h>
@@ -68,6 +69,7 @@
 #  include <xine/broadcaster.h>
 #  include <xine/io_helper.h>
 #  include <xine/info_helper.h>
+#  include <xine/alphablend.h>
 #endif