move alphablend to core

CVS patchset: 7745
CVS date: 2005/09/25 00:44:04

5 files changed, 10 insertions, 9 deletions

diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 83b79f43b..18f3541b5 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -18,7 +18,8 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
 	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 @@ include_HEADERS  = buffer.h metronom.h configfile.h vo_scale.h \
         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
 
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index 2f40d73b1..e1c47d198 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -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"
diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h
index b50b1f1f4..a8cb80249 100644
--- a/src/xine-engine/osd.h
+++ b/src/xine-engine/osd.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
  * OSD stuff (text and graphic primitives)
- * $Id: osd.h,v 1.25 2004/03/14 09:38:03 valtri Exp $
+ * $Id: osd.h,v 1.26 2005/09/25 00:44:04 miguelfreitas Exp $
  */
 
 #ifndef HAVE_OSD_H
@@ -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>
diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c
index 346c3c9a6..c312aea1a 100644
--- a/src/xine-engine/video_overlay.c
+++ b/src/xine-engine/video_overlay.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_overlay.c,v 1.38 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_overlay.c,v 1.39 2005/09/25 00:44:04 miguelfreitas Exp $
  *
  */
 
@@ -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"
 
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index d5aba92b4..94235ad51 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_internal.h,v 1.167 2005/08/25 15:36:30 valtri Exp $
+ * $Id: xine_internal.h,v 1.168 2005/09/25 00:44:04 miguelfreitas Exp $
  *
  */
 
@@ -50,6 +50,7 @@ extern "C" {
 #  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 @@ extern "C" {
 #  include <xine/broadcaster.h>
 #  include <xine/io_helper.h>
 #  include <xine/info_helper.h>
+#  include <xine/alphablend.h>
 #endif