[xine-cvs] CVS: xine-lib/src/video_out video_out_opengl.c,NONE,1.1 Makefile.am,1.26,1.27 video_out_x11.h,1.11,1.12

[Matthias H. <ms...@us...>]

Update of /cvsroot/xine/xine-lib/src/video_out
In directory usw-pr-cvs1:/tmp/cvs-serv31116/src/video_out

Modified Files:
	Makefile.am video_out_x11.h 
Added Files:
	video_out_opengl.c 
Log Message:
New OpenGL output plugin. Will only work with upcoming changes in xine-ui.
EXPERIMENTAL. Read README.opengl in xine-ui.


--- NEW FILE: video_out_opengl.c ---
/*
 * Copyright (C) 2000, 2001 the xine project
 * 
 * This file is part of xine, a unix video player.
 * 
 * xine is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 * 
 * xine is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
 *
[...998 lines suppressed...]
  this->yuv2rgb = yuv2rgb_init (YUV_FORMAT, YUV_SWAP_MODE, NULL);

  yuv2rgb_set_gamma(this->yuv2rgb, config->register_range (config, "video.opengl_gamma", 0,
							   -100, 100, "(software) gamma correction for OpenGL driver",
							   NULL, NULL, NULL));
  return &this->vo_driver;
}

static vo_info_t vo_info_shm = {
  3,
  "OpenGL",
  "xine video output plugin using the MIT X shared memory extension",
  VISUAL_TYPE_X11,
  8
};

vo_info_t *get_video_out_plugin_info() {
  return &vo_info_shm;
}


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.am	2002/01/17 02:35:20	1.26
+++ Makefile.am	2002/01/22 20:15:00	1.27
@@ -11,7 +11,10 @@
 if HAVE_XV
 xv_module = xineplug_vo_out_xv.la
 endif
+if HAVE_OPENGL
+opengl_module = xineplug_vo_out_opengl.la
 endif
+endif
 
 if HAVE_AA
 aa_module = xineplug_vo_out_aa.la
@@ -33,7 +36,7 @@
 # scheme "xineplug_vo_out_"
 #
 lib_LTLIBRARIES = $(xv_module) $(syncfb_module) $(xshm_module) $(aa_module) \
-                  $(fb_module) $(sdl_module)
+                  $(fb_module) $(sdl_module) $(opengl_module)
 
 xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c
 xineplug_vo_out_xv_la_LIBADD =  $(XV_LIB) $(X_LIBS) -lXext
@@ -43,6 +46,11 @@
 	alphablend.c video_out_xshm.c
 xineplug_vo_out_xshm_la_LIBADD =  $(X_LIBS) -lXext
 xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module
+
+xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
+	alphablend.c video_out_opengl.c
+xineplug_vo_out_opengl_la_LIBADD =  $(OPENGL_LIBS) $(X_LIBS)
+xineplug_vo_out_opengl_la_LDFLAGS = -avoid-version -module
 
 xineplug_vo_out_syncfb_la_SOURCES = alphablend.c video_out_syncfb.c 
 xineplug_vo_out_syncfb_la_LDFLAGS = -avoid-version -module

Index: video_out_x11.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_x11.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- video_out_x11.h	2002/01/03 22:41:54	1.11
+++ video_out_x11.h	2002/01/22 20:15:00	1.12
@@ -110,6 +110,11 @@
 /* int *data */
 #define GUI_DATA_EX_FULLSCREEN        	   7
 
+/* *data contains chosen visual, select a new one or change it to NULL
+ * to indicate the visual to use or that no visual will work */
+/* XVisualInfo **data */
+#define GUI_SELECT_VISUAL                  8
+
 #ifdef __cplusplus
 }
 #endif