diff options
| author | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2004-04-30 22:12:15 +0000 |
|---|---|---|
| committer | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2004-04-30 22:12:15 +0000 |
| commit | 2855d20ef0939f84c40278cc0e18bafdaac8575a (patch) | |
| tree | 692e0376464a94231fe5cfa8a37a6d7826cf9942 /src/video_out | |
| parent | 4d237f55ef91606af05116939b977e4b1af1ad1b (diff) | |
| download | xine-lib-2855d20ef0939f84c40278cc0e18bafdaac8575a.tar.gz xine-lib-2855d20ef0939f84c40278cc0e18bafdaac8575a.tar.bz2 | |
Enable opengl compiling.
It seg faults at the moment, but we will fix that.
CVS patchset: 6470
CVS date: 2004/04/30 22:12:15
Diffstat (limited to 'src/video_out')
| -rw-r--r-- | src/video_out/Makefile.am | 18 | ||||
| -rw-r--r-- | src/video_out/video_out_opengl.c | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index c96119314..acdfe1273 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -23,10 +23,10 @@ endif if HAVE_XVMC xvmc_module = xineplug_vo_out_xvmc.la endif -#if HAVE_OPENGL -opengl_module = -#opengl_module = xineplug_vo_out_opengl.la -#endif +if HAVE_OPENGL +#opengl_module = +opengl_module = xineplug_vo_out_opengl.la +endif if HAVE_SYNCFB syncfb_module = xineplug_vo_out_syncfb.la endif @@ -101,11 +101,11 @@ xineplug_vo_out_xvmc_la_SOURCES = deinterlace.c alphablend.c video_out_xvmc.c xineplug_vo_out_xvmc_la_LIBADD = $(XV_LIB) $(XVMC_LIB) $(X_LIBS) -lXext $(XINE_LIB) xineplug_vo_out_xvmc_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 -#xineplug_vo_out_opengl_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \ -# $(GLU_LIBS) $(X_LIBS) $(XINE_LIB) -#xineplug_vo_out_opengl_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 +xineplug_vo_out_opengl_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \ + $(GLU_LIBS) $(X_LIBS) $(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_LIBADD = $(X_LIBS) $(XINE_LIB) diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 87def8a54..99016c182 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.37 2004/04/26 17:50:09 mroi Exp $ + * $Id: video_out_opengl.c,v 1.38 2004/04/30 22:12:15 jcdutton Exp $ * * video_out_glut.c, glut based OpenGL rendering interface for xine * Matthias Hopf <mat@mshopf.de> @@ -785,7 +785,7 @@ static int opengl_set_property (vo_driver_t *this_gen, case VO_PROP_BRIGHTNESS: this->yuv2rgb_brightness = value; this->yuv2rgb_factory->set_csc_levels (this->yuv2rgb_factory, value, 128, 128); - xrintf(this->xine, XINE_VERBOSITY_DEBUG, "video_out_opengl: brightness changed to %d\n",value); + xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video_out_opengl: brightness changed to %d\n",value); break; default: xprintf (this->xine, XINE_VERBOSITY_DEBUG, @@ -959,7 +959,7 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, this->vo_driver.redraw_needed = opengl_redraw_needed; this->yuv2rgb_brightness = - config->register_range(this->config, "video.opengl_gamma", 0, + this->config->register_range(this->config, "video.opengl_gamma", 0, -100, 100, _("brightness correction"), _("The brightness correction can be used to lighten or darken the image. " |