summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/dxr3/Makefile.am2
-rw-r--r--src/dxr3/alphablend.c1
-rw-r--r--src/dxr3/alphablend.h1
-rw-r--r--src/dxr3/video_out_dxr3.c7
-rw-r--r--src/dxr3/video_out_dxr3.h3
-rw-r--r--src/libspucc/cc_decoder.c3
-rw-r--r--src/libspudec/spu.c3
-rw-r--r--src/libspudec/xine_decoder.c3
-rw-r--r--src/libspudvb/xine_decoder.c3
-rw-r--r--src/video_out/Makefile.am30
-rw-r--r--src/video_out/alphablend.c1
-rw-r--r--src/video_out/alphablend.h1
-rw-r--r--src/video_out/video_out_directfb.c5
-rwxr-xr-xsrc/video_out/video_out_directx.c8
-rw-r--r--src/video_out/video_out_fb.c9
-rw-r--r--src/video_out/video_out_macosx.m3
-rw-r--r--src/video_out/video_out_opengl.c7
-rw-r--r--src/video_out/video_out_pgx32.c3
-rw-r--r--src/video_out/video_out_pgx64.c11
-rw-r--r--src/video_out/video_out_sdl.c7
-rw-r--r--src/video_out/video_out_stk.c7
-rw-r--r--src/video_out/video_out_syncfb.c7
-rw-r--r--src/video_out/video_out_vidix.c7
-rw-r--r--src/video_out/video_out_xshm.c9
-rw-r--r--src/video_out/video_out_xv.c7
-rw-r--r--src/video_out/video_out_xvmc.c7
-rw-r--r--src/video_out/video_out_xxmc.c18
-rw-r--r--src/video_out/x11osd.c3
-rw-r--r--src/video_out/xxmc.h3
-rw-r--r--src/xine-engine/Makefile.am5
-rw-r--r--src/xine-engine/osd.c1
-rw-r--r--src/xine-engine/osd.h4
-rw-r--r--src/xine-engine/video_overlay.c5
-rw-r--r--src/xine-engine/xine_internal.h4
34 files changed, 88 insertions, 110 deletions
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index 4fbe6b306..b93cb3a62 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -37,7 +37,6 @@ endif
xineplug_decode_dxr3_spu_la_LDFLAGS = -avoid-version -module
xineplug_vo_out_dxr3_la_SOURCES = \
- alphablend.c \
dxr3_mpeg_encoders.c \
dxr3_spu_encoder.c \
dxr3_scr.c \
@@ -48,7 +47,6 @@ xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
noinst_HEADERS = \
em8300.h \
- alphablend.h \
dxr3.h \
dxr3_scr.h \
video_out_dxr3.h
diff --git a/src/dxr3/alphablend.c b/src/dxr3/alphablend.c
deleted file mode 100644
index 39949ab51..000000000
--- a/src/dxr3/alphablend.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../video_out/alphablend.c"
diff --git a/src/dxr3/alphablend.h b/src/dxr3/alphablend.h
deleted file mode 100644
index 86dec99d4..000000000
--- a/src/dxr3/alphablend.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../video_out/alphablend.h"
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index 3d2cf960a..676722f14 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.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_out_dxr3.c,v 1.110 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_dxr3.c,v 1.111 2005/09/25 00:44:04 miguelfreitas Exp $
*/
/* mpeg1 encoding video out plugin for the dxr3.
@@ -65,7 +65,6 @@
#include "xine_internal.h"
#include "xineutils.h"
#include "video_out.h"
-#include "alphablend.h"
#include "dxr3.h"
#include "video_out_dxr3.h"
@@ -819,11 +818,11 @@ static void dxr3_overlay_blend(vo_driver_t *this_gen, vo_frame_t *frame_gen,
if (overlay->rle) {
if (frame_gen->format == XINE_IMGFMT_YV12)
- blend_yuv(frame->vo_frame.base, overlay,
+ _x_blend_yuv(frame->vo_frame.base, overlay,
frame->vo_frame.width, frame->vo_frame.height,
frame->vo_frame.pitches, &this->alphablend_extra_data);
else
- blend_yuy2(frame->vo_frame.base[0], overlay,
+ _x_blend_yuy2(frame->vo_frame.base[0], overlay,
frame->vo_frame.width, frame->vo_frame.height,
frame->vo_frame.pitches[0], &this->alphablend_extra_data);
}
diff --git a/src/dxr3/video_out_dxr3.h b/src/dxr3/video_out_dxr3.h
index 00494445d..8a5e9a8e6 100644
--- a/src/dxr3/video_out_dxr3.h
+++ b/src/dxr3/video_out_dxr3.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: video_out_dxr3.h,v 1.24 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_dxr3.h,v 1.25 2005/09/25 00:44:04 miguelfreitas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -32,7 +32,6 @@
#include "vo_scale.h"
#include "dxr3_scr.h"
#include "dxr3.h"
-#include "alphablend.h"
/* the number of supported encoders */
#define SUPPORTED_ENCODER_COUNT 3
diff --git a/src/libspucc/cc_decoder.c b/src/libspucc/cc_decoder.c
index 1f7dda890..4acd2cf0e 100644
--- a/src/libspucc/cc_decoder.c
+++ b/src/libspucc/cc_decoder.c
@@ -20,7 +20,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: cc_decoder.c,v 1.26 2004/08/27 19:33:21 valtri Exp $
+ * $Id: cc_decoder.c,v 1.27 2005/09/25 00:44:04 miguelfreitas Exp $
*
* stuff needed to provide closed captioning decoding and display
*
@@ -41,7 +41,6 @@
#include "video_out.h"
#include "xineutils.h"
#include "osd.h"
-#include "video_out/alphablend.h"
#include "cc_decoder.h"
#include "osd.h"
diff --git a/src/libspudec/spu.c b/src/libspudec/spu.c
index 6dfe956dd..3818a393a 100644
--- a/src/libspudec/spu.c
+++ b/src/libspudec/spu.c
@@ -36,7 +36,7 @@
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: spu.c,v 1.81 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: spu.c,v 1.82 2005/09/25 00:44:04 miguelfreitas Exp $
*
*/
@@ -51,7 +51,6 @@
#include <fcntl.h>
#include "xine_internal.h"
-#include "video_out/alphablend.h"
#include "xineutils.h"
#include "spu.h"
#include "buffer.h"
diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c
index dea99d59c..bbd38c070 100644
--- a/src/libspudec/xine_decoder.c
+++ b/src/libspudec/xine_decoder.c
@@ -19,7 +19,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_decoder.c,v 1.112 2005/09/24 23:44:34 miguelfreitas Exp $
+ * $Id: xine_decoder.c,v 1.113 2005/09/25 00:44:04 miguelfreitas Exp $
*
* stuff needed to turn libspu into a xine decoder plugin
*/
@@ -33,7 +33,6 @@
#include "xine_internal.h"
#include "buffer.h"
-#include "video_out/alphablend.h" /* For clut_t */
#include "xine-engine/bswap.h"
#include "xineutils.h"
#include "spu.h"
diff --git a/src/libspudvb/xine_decoder.c b/src/libspudvb/xine_decoder.c
index 606ba05f6..6ea5e7bf6 100644
--- a/src/libspudvb/xine_decoder.c
+++ b/src/libspudvb/xine_decoder.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: xine_decoder.c,v 1.16 2004/12/18 19:51:46 mlampard Exp $
+ * $Id: xine_decoder.c,v 1.17 2005/09/25 00:44:04 miguelfreitas Exp $
*
* DVB Subtitle decoder (ETS 300 743)
* (c) 2004 Mike Lampard <mlampard@users.sourceforge.net>
@@ -30,7 +30,6 @@
#include "pthread.h"
#include "xine_internal.h"
#include "osd.h"
-#include "video_out/alphablend.h"
#define MAX_REGIONS 7
/* check every DVBSUB_TIMER_DELAY seconds */
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 6bbc68970..54f3cde08 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -93,34 +93,34 @@ lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) \
xineplug_vo_out_none.la
xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
- alphablend.c video_out_xshm.c $(X11OSD)
+ video_out_xshm.c $(X11OSD)
xineplug_vo_out_xshm_la_LIBADD = $(MLIB_LIBS) $(X_LIBS) -lXext $(XINE_LIB)
xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-xineplug_vo_out_xv_la_SOURCES = $(X11OSD) deinterlace.c alphablend.c video_out_xv.c
+xineplug_vo_out_xv_la_SOURCES = $(X11OSD) deinterlace.c video_out_xv.c
xineplug_vo_out_xv_la_LIBADD = $(XV_LIB) $(X_LIBS) -lXext $(XINE_LIB)
xineplug_vo_out_xv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-xineplug_vo_out_xvmc_la_SOURCES = deinterlace.c alphablend.c video_out_xvmc.c
+xineplug_vo_out_xvmc_la_SOURCES = deinterlace.c video_out_xvmc.c
xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIB) $(XV_LIB) $(X_LIBS) -lXext $(XINE_LIB)
xineplug_vo_out_xvmc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-xineplug_vo_out_xxmc_la_SOURCES = $(X11OSD) deinterlace.c alphablend.c video_out_xxmc.c\
+xineplug_vo_out_xxmc_la_SOURCES = $(X11OSD) deinterlace.c video_out_xxmc.c\
xvmc_mocomp.c xvmc_vld.c xxmc.h
xineplug_vo_out_xxmc_la_LIBADD = $(XXMC_LIB) $(XV_LIB) $(X_LIBS) -lXext $(XINE_LIB)
xineplug_vo_out_xxmc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
- alphablend.c video_out_opengl.c myglext.h $(X11OSD)
+ video_out_opengl.c myglext.h $(X11OSD)
xineplug_vo_out_opengl_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \
$(GLU_LIBS) $(X_LIBS) -lXext $(XINE_LIB)
xineplug_vo_out_opengl_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-xineplug_vo_out_syncfb_la_SOURCES = alphablend.c video_out_syncfb.c
+xineplug_vo_out_syncfb_la_SOURCES = video_out_syncfb.c
xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(XINE_LIB)
xineplug_vo_out_syncfb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-xineplug_vo_out_pgx64_la_SOURCES = alphablend.c video_out_pgx64.c
+xineplug_vo_out_pgx64_la_SOURCES = video_out_pgx64.c
xineplug_vo_out_pgx64_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS)
xineplug_vo_out_pgx64_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
@@ -128,7 +128,7 @@ xineplug_vo_out_pgx32_la_SOURCES = video_out_pgx32.c
xineplug_vo_out_pgx32_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS)
xineplug_vo_out_pgx32_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-xineplug_vo_out_vidix_la_SOURCES = alphablend.c video_out_vidix.c $(X11OSD)
+xineplug_vo_out_vidix_la_SOURCES = video_out_vidix.c $(X11OSD)
xineplug_vo_out_vidix_la_LIBADD = $(X_LIBS) \
$(top_builddir)/src/video_out/vidix/libvidix.la \
$(top_builddir)/src/video_out/libdha/libdha.la
@@ -144,23 +144,23 @@ xineplug_vo_out_caca_la_LIBADD = $(CACA_LIBS)
xineplug_vo_out_caca_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
- alphablend.c video_out_fb.c
+ video_out_fb.c
xineplug_vo_out_fb_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB)
xineplug_vo_out_fb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-xineplug_vo_out_directfb_la_SOURCES = alphablend.c video_out_directfb.c
+xineplug_vo_out_directfb_la_SOURCES = video_out_directfb.c
xineplug_vo_out_directfb_la_LIBADD = $(DIRECTFB_LIBS) $(X_LIBS)
xineplug_vo_out_directfb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-xineplug_vo_out_sdl_la_SOURCES = alphablend.c video_out_sdl.c
+xineplug_vo_out_sdl_la_SOURCES = video_out_sdl.c
xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS) $(XINE_LIB)
xineplug_vo_out_sdl_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-xineplug_vo_out_stk_la_SOURCES = alphablend.c video_out_stk.c
+xineplug_vo_out_stk_la_SOURCES = video_out_stk.c
xineplug_vo_out_stk_la_LIBADD = $(LIBSTK_LIBS)
xineplug_vo_out_stk_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-xineplug_vo_out_directx_la_SOURCES = alphablend.c yuv2rgb.c yuv2rgb_mmx.c video_out_directx.c
+xineplug_vo_out_directx_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c video_out_directx.c
xineplug_vo_out_directx_la_CPPFLAGS = $(DIRECTX_CPPFLAGS)
xineplug_vo_out_directx_la_LIBADD = $(DIRECTX_VIDEO_LIBS) $(XINE_LIB) $(THREAD_LIBS)
xineplug_vo_out_directx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
@@ -169,7 +169,7 @@ xineplug_vo_out_none_la_SOURCES = video_out_none.c
xineplug_vo_out_none_la_LIBADD = $(XINE_LIB)
xineplug_vo_out_none_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-xineplug_vo_out_macosx_la_SOURCES = alphablend.c video_out_macosx.m
+xineplug_vo_out_macosx_la_SOURCES = video_out_macosx.m
xineplug_vo_out_macosx_la_CPPFLAGS = $(X_CFLAGS) $(MLIB_CFLAGS)
xineplug_vo_out_macosx_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \
$(GLU_LIBS) $(X_LIBS) $(XINE_LIB)
@@ -178,5 +178,5 @@ xineplug_vo_out_macosx_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \
xineplug_vo_out_macosx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ \
-Wl,-framework -Wl,Cocoa -framework Cocoa -framework OpenGL
-noinst_HEADERS = alphablend.h deinterlace.h video_out_syncfb.h \
+noinst_HEADERS = deinterlace.h video_out_syncfb.h \
yuv2rgb.h x11osd.h
diff --git a/src/video_out/alphablend.c b/src/video_out/alphablend.c
index b0942b066..8e151d417 100644
--- a/src/video_out/alphablend.c
+++ b/src/video_out/alphablend.c
@@ -1,3 +1,4 @@
+#error "Do not compile this file. moved to xine-engine/alphablend.c"
/*
*
* Copyright (C) James Courtier-Dutton James@superbug.demon.co.uk - July 2001
diff --git a/src/video_out/alphablend.h b/src/video_out/alphablend.h
index e29ddf11d..311db7cf1 100644
--- a/src/video_out/alphablend.h
+++ b/src/video_out/alphablend.h
@@ -1,3 +1,4 @@
+#error "Do not include this file. moved to xine-engine/alphablend.h"
/*
*
* Copyright (C) 2000 Thomas Mirlacher
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
index 53ba33c0f..71f3f8027 100644
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -48,7 +48,6 @@
#include "xine.h"
#include "xine_internal.h"
#include "video_out.h"
-#include "alphablend.h"
#include "xineutils.h"
#include "vo_scale.h"
@@ -328,13 +327,13 @@ static void directfb_overlay_blend (vo_driver_t *this_gen,
this->alphablend_extra_data.offset_y = frame_gen->overlay_offset_y;
if (frame->format == DSPF_YUY2) {
- blend_yuy2 (frame->vo_frame.base[0], overlay,
+ _x_blend_yuy2 (frame->vo_frame.base[0], overlay,
frame->width, frame->height,
frame->vo_frame.pitches[0],
&this->alphablend_extra_data);
}
else {
- blend_yuv (frame->vo_frame.base, overlay,
+ _x_blend_yuv (frame->vo_frame.base, overlay,
frame->width, frame->height,
frame->vo_frame.pitches,
&this->alphablend_extra_data);
diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c
index d0daa25da..71bcf4217 100755
--- a/src/video_out/video_out_directx.c
+++ b/src/video_out/video_out_directx.c
@@ -20,7 +20,7 @@
* video_out_directx.c, direct draw video output plugin for xine
* by Matthew Grooms <elon@altavista.com>
*
- * $Id: video_out_directx.c,v 1.25 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_directx.c,v 1.26 2005/09/25 00:44:04 miguelfreitas Exp $
*/
typedef unsigned char boolean;
@@ -32,7 +32,7 @@ typedef unsigned char boolean;
#include "xine.h"
#include "video_out.h"
-#include "alphablend.h"
+#include "xine_internal.h"
#define LOG_MODULE "video_out_directx"
#define LOG_VERBOSE
@@ -1116,9 +1116,9 @@ static void win32_overlay_blend( vo_driver_t * vo_driver, vo_frame_t * vo_frame,
if( vo_overlay->rle )
{
if( vo_frame->format == XINE_IMGFMT_YV12 )
- blend_yuv( win32_frame->vo_frame.base, vo_overlay, win32_frame->width, win32_frame->height, win32_frame->vo_frame.pitches, &win32_driver->alphablend_extra_data );
+ _x_blend_yuv( win32_frame->vo_frame.base, vo_overlay, win32_frame->width, win32_frame->height, win32_frame->vo_frame.pitches, &win32_driver->alphablend_extra_data );
else
- blend_yuy2( win32_frame->vo_frame.base[0], vo_overlay, win32_frame->width, win32_frame->height, win32_frame->vo_frame.pitches[0], &win32_driver->alphablend_extra_data );
+ _x_blend_yuy2( win32_frame->vo_frame.base[0], vo_overlay, win32_frame->width, win32_frame->height, win32_frame->vo_frame.pitches[0], &win32_driver->alphablend_extra_data );
}
}
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index 90ebfe107..e532b5651 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.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_out_fb.c,v 1.44 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_fb.c,v 1.45 2005/09/25 00:44:04 miguelfreitas Exp $
*
* video_out_fb.c, frame buffer xine driver by Miguel Freitas
*
@@ -81,7 +81,6 @@
*/
#include "xine_internal.h"
-#include "alphablend.h"
#include "yuv2rgb.h"
#include "xineutils.h"
#include "vo_scale.h"
@@ -531,7 +530,7 @@ static void fb_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen,
switch(this->bpp)
{
case 16:
- blend_rgb16(frame->data,
+ _x_blend_rgb16(frame->data,
overlay,
frame->sc.output_width,
frame->sc.output_height,
@@ -541,7 +540,7 @@ static void fb_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen,
break;
case 24:
- blend_rgb24(frame->data,
+ _x_blend_rgb24(frame->data,
overlay,
frame->sc.output_width,
frame->sc.output_height,
@@ -551,7 +550,7 @@ static void fb_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen,
break;
case 32:
- blend_rgb32(frame->data,
+ _x_blend_rgb32(frame->data,
overlay,
frame->sc.output_width,
frame->sc.output_height,
diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m
index 93e71e8b3..e69d4e3f3 100644
--- a/src/video_out/video_out_macosx.m
+++ b/src/video_out/video_out_macosx.m
@@ -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_out_macosx.m,v 1.12 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_macosx.m,v 1.13 2005/09/25 00:44:04 miguelfreitas Exp $
*
* This output driver makes use of xine's objective-c video_output
* classes located in the macosx folder.
@@ -38,7 +38,6 @@
#define LOG
*/
-#include "alphablend.h"
#include "video_out.h"
#include "vo_scale.h"
#include "xine.h"
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index 414629566..804edb797 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.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_out_opengl.c,v 1.53 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_opengl.c,v 1.54 2005/09/25 00:44:04 miguelfreitas Exp $
*
* video_out_opengl.c, OpenGL based interface for xine
*
@@ -94,7 +94,6 @@
#include "video_out.h"
#include "xine_internal.h"
-#include "alphablend.h"
#include "yuv2rgb.h"
#include "xineutils.h"
#include "x11osd.h"
@@ -1481,12 +1480,12 @@ static void opengl_overlay_blend (vo_driver_t *this_gen,
opengl_overlay_clut_yuv2rgb (this, overlay, frame);
# if BYTES_PER_PIXEL == 3
- blend_rgb24 ((uint8_t *)frame->rgb, overlay,
+ _x_blend_rgb24 ((uint8_t *)frame->rgb, overlay,
frame->width, frame->height,
frame->width, frame->height,
&this->alphablend_extra_data);
# elif BYTES_PER_PIXEL == 4
- blend_rgb32 ((uint8_t *)frame->rgb, overlay,
+ _x_blend_rgb32 ((uint8_t *)frame->rgb, overlay,
frame->width, frame->height,
frame->width, frame->height,
&this->alphablend_extra_data);
diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c
index b2f108db8..e7f1d221f 100644
--- a/src/video_out/video_out_pgx32.c
+++ b/src/video_out/video_out_pgx32.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_out_pgx32.c,v 1.13 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_pgx32.c,v 1.14 2005/09/25 00:44:04 miguelfreitas Exp $
*
* video_out_pgx32.c, Sun PGX32 output plugin for xine
*
@@ -45,7 +45,6 @@
#include <dga/dga.h>
#include "xine_internal.h"
-#include "alphablend.h"
#include "bswap.h"
#include "vo_scale.h"
#include "xineutils.h"
diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
index 18046ea7b..988f158e1 100644
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.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_out_pgx64.c,v 1.74 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_pgx64.c,v 1.75 2005/09/25 00:44:04 miguelfreitas Exp $
*
* video_out_pgx64.c, Sun XVR100/PGX64/PGX24 output plugin for xine
*
@@ -47,7 +47,6 @@
#include <dga/dga.h>
#include "xine_internal.h"
-#include "alphablend.h"
#include "bswap.h"
#include "vo_scale.h"
#include "xineutils.h"
@@ -1085,12 +1084,12 @@ static void pgx64_overlay_blend(vo_driver_t *this_gen, vo_frame_t *frame_gen, vo
/* FIXME: Implement out of place alphablending functions for better performance */
switch (frame->format) {
case XINE_IMGFMT_YV12: {
- blend_yuv(frame->buffer_ptrs, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
+ _x_blend_yuv(frame->buffer_ptrs, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
}
break;
case XINE_IMGFMT_YUY2: {
- blend_yuy2(frame->buffer_ptrs[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
+ _x_blend_yuy2(frame->buffer_ptrs[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
}
break;
}
@@ -1098,12 +1097,12 @@ static void pgx64_overlay_blend(vo_driver_t *this_gen, vo_frame_t *frame_gen, vo
else {
switch (frame->format) {
case XINE_IMGFMT_YV12: {
- blend_yuv(frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
+ _x_blend_yuv(frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
}
break;
case XINE_IMGFMT_YUY2: {
- blend_yuy2(frame->vo_frame.base[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
+ _x_blend_yuy2(frame->vo_frame.base[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
}
break;
}
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c
index 87cb1b11a..5d0d96f8f 100644
--- a/src/video_out/video_out_sdl.c
+++ b/src/video_out/video_out_sdl.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_out_sdl.c,v 1.43 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_sdl.c,v 1.44 2005/09/25 00:44:04 miguelfreitas Exp $
*
* video_out_sdl.c, Simple DirectMedia Layer
*
@@ -62,7 +62,6 @@
#include "xine.h"
#include "xine_internal.h"
#include "video_out.h"
-#include "alphablend.h"
#include "xineutils.h"
#include "vo_scale.h"
@@ -247,9 +246,9 @@ static void sdl_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_
if (overlay->rle) {
if( frame->format == XINE_IMGFMT_YV12 )
- blend_yuv( frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
+ _x_blend_yuv( frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
else
- blend_yuy2( frame->vo_frame.base[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
+ _x_blend_yuy2( frame->vo_frame.base[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
}
}
diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c
index f0b6429dd..5d57cec44 100644
--- a/src/video_out/video_out_stk.c
+++ b/src/video_out/video_out_stk.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_out_stk.c,v 1.15 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_stk.c,v 1.16 2005/09/25 00:44:04 miguelfreitas Exp $
*
* video_out_stk.c, Libstk Surface Video Driver
* more info on Libstk at http://www.libstk.org
@@ -63,7 +63,6 @@
#include "xine.h"
#include "xine_internal.h"
#include "video_out.h"
-#include "alphablend.h"
#include "xineutils.h"
#include "vo_scale.h"
@@ -233,9 +232,9 @@ static void stk_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_
if (overlay->rle) {
if (frame->format == XINE_IMGFMT_YV12)
- blend_yuv( frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
+ _x_blend_yuv( frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
else
- blend_yuy2( frame->vo_frame.base[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
+ _x_blend_yuy2( frame->vo_frame.base[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
}
}
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index 19bd29fe1..e38a1e91f 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.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_out_syncfb.c,v 1.101 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_syncfb.c,v 1.102 2005/09/25 00:44:04 miguelfreitas Exp $
*
* video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine
*
@@ -55,7 +55,6 @@
#include "xine.h"
#include "video_out.h"
#include "xine_internal.h"
-#include "alphablend.h"
#include "xineutils.h"
#include "vo_scale.h"
@@ -574,9 +573,9 @@ static void syncfb_overlay_blend(vo_driver_t* this_gen, vo_frame_t* frame_gen, v
/* alpha blend here */
if (overlay->rle) {
if (frame->format == XINE_IMGFMT_YV12)
- blend_yuv(frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
+ _x_blend_yuv(frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
else
- blend_yuy2(frame->vo_frame.base[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
+ _x_blend_yuy2(frame->vo_frame.base[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
}
}
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
index bd2b85e94..a6aaea0e1 100644
--- a/src/video_out/video_out_vidix.c
+++ b/src/video_out/video_out_vidix.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_out_vidix.c,v 1.69 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_vidix.c,v 1.70 2005/09/25 00:44:04 miguelfreitas Exp $
*
* video_out_vidix.c
*
@@ -62,7 +62,6 @@
#include "video_out.h"
#include "xine_internal.h"
-#include "alphablend.h"
#include "xineutils.h"
#include "vo_scale.h"
@@ -617,9 +616,9 @@ static void vidix_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, v
#endif
} else {
if( frame->format == XINE_IMGFMT_YV12 )
- blend_yuv( frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
+ _x_blend_yuv( frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
else
- blend_yuy2( frame->vo_frame.base[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
+ _x_blend_yuy2( frame->vo_frame.base[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
}
}
}
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index f66ca3d2d..a4cbeb49f 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.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_out_xshm.c,v 1.141 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_xshm.c,v 1.142 2005/09/25 00:44:04 miguelfreitas Exp $
*
* video_out_xshm.c, X11 shared memory extension interface for xine
*
@@ -61,7 +61,6 @@
*/
#include "xine_internal.h"
-#include "alphablend.h"
#include "yuv2rgb.h"
#include "xineutils.h"
#include "vo_scale.h"
@@ -665,19 +664,19 @@ static void xshm_overlay_blend (vo_driver_t *this_gen,
switch (this->bpp) {
case 16:
- blend_rgb16 ((uint8_t *)frame->image->data, overlay,
+ _x_blend_rgb16 ((uint8_t *)frame->image->data, overlay,
frame->sc.output_width, frame->sc.output_height,
frame->sc.delivered_width, frame->sc.delivered_height,
&this->alphablend_extra_data);
break;
case 24:
- blend_rgb24 ((uint8_t *)frame->image->data, overlay,
+ _x_blend_rgb24 ((uint8_t *)frame->image->data, overlay,
frame->sc.output_width, frame->sc.output_height,
frame->sc.delivered_width, frame->sc.delivered_height,
&this->alphablend_extra_data);
break;
case 32:
- blend_rgb32 ((uint8_t *)frame->image->data, overlay,
+ _x_blend_rgb32 ((uint8_t *)frame->image->data, overlay,
frame->sc.output_width, frame->sc.output_height,
frame->sc.delivered_width, frame->sc.delivered_height,
&this->alphablend_extra_data);
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index cf7605239..116d4dae4 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.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_out_xv.c,v 1.213 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_xv.c,v 1.214 2005/09/25 00:44:04 miguelfreitas Exp $
*
* video_out_xv.c, X11 video extension interface for xine
*
@@ -69,7 +69,6 @@
#include "video_out.h"
#include "xine_internal.h"
/* #include "overlay.h" */
-#include "alphablend.h"
#include "deinterlace.h"
#include "xineutils.h"
#include "vo_scale.h"
@@ -665,11 +664,11 @@ static void xv_overlay_blend (vo_driver_t *this_gen,
}
} else {
if (frame->format == XINE_IMGFMT_YV12)
- blend_yuv(frame->vo_frame.base, overlay,
+ _x_blend_yuv(frame->vo_frame.base, overlay,
frame->width, frame->height, frame->vo_frame.pitches,
&this->alphablend_extra_data);
else
- blend_yuy2(frame->vo_frame.base[0], overlay,
+ _x_blend_yuy2(frame->vo_frame.base[0], overlay,
frame->width, frame->height, frame->vo_frame.pitches[0],
&this->alphablend_extra_data);
}
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index 0288ed0df..a01804690 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.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_out_xvmc.c,v 1.24 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_xvmc.c,v 1.25 2005/09/25 00:44:04 miguelfreitas Exp $
*
* video_out_xvmc.c, X11 video motion compensation extension interface for xine
*
@@ -73,7 +73,6 @@
#include "accel_xvmc.h"
/* TODO - delete these? */
-#include "alphablend.h"
#include "deinterlace.h"
#include "xineutils.h"
@@ -847,11 +846,11 @@ static void xvmc_overlay_blend (vo_driver_t *this_gen,
if (overlay->rle) {
if (frame->format == XINE_IMGFMT_YV12)
- blend_yuv(frame->vo_frame.base, overlay,
+ _x_blend_yuv(frame->vo_frame.base, overlay,
frame->width, frame->height, frame->vo_frame.pitches,
&this->alphablend_extra_data);
else if (frame->format != XINE_IMGFMT_XVMC)
- blend_yuy2(frame->vo_frame.base[0], overlay,
+ _x_blend_yuy2(frame->vo_frame.base[0], overlay,
frame->width, frame->height, frame->vo_frame.pitches[0],
&this->alphablend_extra_data);
}
diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c
index 86f8ff7f4..66b2d3bf8 100644
--- a/src/video_out/video_out_xxmc.c
+++ b/src/video_out/video_out_xxmc.c
@@ -18,7 +18,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_out_xxmc.c,v 1.18 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_xxmc.c,v 1.19 2005/09/25 00:44:04 miguelfreitas Exp $
*
* video_out_xxmc.c, X11 decoding accelerated video extension interface for xine
*
@@ -763,7 +763,7 @@ static void xxmc_dispose_context(xxmc_driver_t *driver)
xprintf(driver->xine, XINE_VERBOSITY_LOG,
"video_out_xxmc: Freeing up XvMC Surfaces and subpictures.\n");
if (driver->xvmc_palette) free(driver->xvmc_palette);
- dispose_xx44_palette( &driver->palette );
+ _x_dispose_xx44_palette( &driver->palette );
xxmc_xvmc_destroy_subpictures( driver );
xxmc_xvmc_destroy_surfaces( driver );
xprintf(driver->xine, XINE_VERBOSITY_LOG,
@@ -899,7 +899,7 @@ static void xxmc_setup_subpictures(xxmc_driver_t *driver, unsigned width, unsign
height, curCap->subPicType.id);
if (sp == NULL) return;
- init_xx44_palette( &driver->palette, sp->num_palette_entries);
+ _x_init_xx44_palette( &driver->palette, sp->num_palette_entries);
driver->xvmc_palette = (char *) xine_xmalloc(sp->num_palette_entries
* sp->entry_bytes);
xxmc_xvmc_free_subpicture( driver, sp);
@@ -1405,7 +1405,7 @@ static void xxmc_overlay_begin (vo_driver_t *this_gen,
this->xvmc_width,
this->xvmc_height, 0x00);
XVMCUNLOCKDISPLAY( this->display );
- clear_xx44_palette(&this->palette);
+ _x_clear_xx44_palette(&this->palette);
}
}
xvmc_context_reader_unlock( &this->xvmc_lock );
@@ -1435,7 +1435,7 @@ static void xxmc_overlay_end (vo_driver_t *this_gen, vo_frame_t *vo_img)
if (this->new_subpic) {
this->old_subpic = this->new_subpic;
this->new_subpic = NULL;
- xx44_to_xvmc_palette( &this->palette, this->xvmc_palette,
+ _x_xx44_to_xvmc_palette( &this->palette, this->xvmc_palette,
0, this->old_subpic->num_palette_entries,
this->old_subpic->entry_bytes,
this->reverse_nvidia_palette ? "YVU" :
@@ -1492,7 +1492,7 @@ static void xxmc_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen,
this->subImage->height);
this->first_overlay = 0;
}
- blend_xx44(this->subImage->data, overlay, this->subImage->width,
+ _x_blend_xx44(this->subImage->data, overlay, this->subImage->width,
this->subImage->height, this->subImage->width,
&this->alphablend_extra_data,
&this->palette, (this->subImage->id == FOURCC_IA44));
@@ -1508,11 +1508,11 @@ static void xxmc_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen,
}
} else {
if (frame->format == XINE_IMGFMT_YV12) {
- blend_yuv(frame->vo_frame.base, overlay,
+ _x_blend_yuv(frame->vo_frame.base, overlay,
frame->width, frame->height, frame->vo_frame.pitches,
&this->alphablend_extra_data);
} else {
- blend_yuy2(frame->vo_frame.base[0], overlay,
+ _x_blend_yuy2(frame->vo_frame.base[0], overlay,
frame->width, frame->height, frame->vo_frame.pitches[0],
&this->alphablend_extra_data);
}
@@ -2232,7 +2232,7 @@ static void checkXvMCCap( xxmc_driver_t *this, XvPortID xv_port)
xxmc_xvmc_surface_handler_construct(this);
this->capabilities |= VO_CAP_XXMC;
XVMCUNLOCKDISPLAY( this->display );
- init_xx44_palette( &this->palette , 0);
+ _x_init_xx44_palette( &this->palette , 0);
this->last_accel_request = 0xFFFFFFFF;
xvmc_context_writer_unlock( &this->xvmc_lock );
return;
diff --git a/src/video_out/x11osd.c b/src/video_out/x11osd.c
index ec9a663f1..f1e0656d1 100644
--- a/src/video_out/x11osd.c
+++ b/src/video_out/x11osd.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: x11osd.c,v 1.14 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: x11osd.c,v 1.15 2005/09/25 00:44:04 miguelfreitas Exp $
*
* x11osd.c, use X11 Nonrectangular Window Shape Extension to draw xine OSD
*
@@ -54,7 +54,6 @@
*/
#include "xine_internal.h"
-#include "alphablend.h"
#include "x11osd.h"
struct x11osd
diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h
index fcbd082e3..5fb9f66ee 100644
--- a/src/video_out/xxmc.h
+++ b/src/video_out/xxmc.h
@@ -18,7 +18,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: xxmc.h,v 1.8 2005/05/06 07:42:21 totte67 Exp $
+ * $Id: xxmc.h,v 1.9 2005/09/25 00:44:04 miguelfreitas Exp $
*
* video_out_xxmc.c, X11 decoding accelerated video extension interface for xine
*
@@ -87,7 +87,6 @@
#include "xine.h"
#include "video_out.h"
#include "xine_internal.h"
-#include "alphablend.h"
#include "deinterlace.h"
#include "xineutils.h"
#include "vo_scale.h"
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 05:26:59 +0000