diff options
Diffstat (limited to 'src/video_out/video_out_opengl.c')
| -rw-r--r-- | src/video_out/video_out_opengl.c | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index b85bd3ccf..21383453e 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -15,15 +15,12 @@ * * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: video_out_opengl.c,v 1.59 2006/07/10 22:08:44 dgp85 Exp $ - * * video_out_opengl.c, OpenGL based interface for xine * * Written by Matthias Hopf <mat@mshopf.de>, * based on the xshm and xv video output plugins. - * */ /* #define LOG */ @@ -91,11 +88,11 @@ #endif #include "xine.h" -#include "video_out.h" +#include <xine/video_out.h> -#include "xine_internal.h" +#include <xine/xine_internal.h> #include "yuv2rgb.h" -#include "xineutils.h" +#include <xine/xineutils.h> #include "x11osd.h" @@ -966,7 +963,7 @@ static int render_setup_fp_yuv (opengl_driver_t *this) { * List of render backends */ /* name, display, image, setup, needsrgb, defaction, fallback */ -opengl_render_t opengl_rb[] = { +static const opengl_render_t opengl_rb[] = { { "2D_Tex_Fragprog", render_tex2d, render_image_fp_yuv, render_setup_fp_yuv, 0, RENDER_NONE, 1 }, { "2D_Tex", render_tex2d, render_image_tex, @@ -1007,7 +1004,7 @@ static void *render_run (opengl_driver_t *this) { opengl_frame_t *frame; struct timeval curtime; struct timespec timeout; - opengl_render_t *render; + const opengl_render_t *render; lprintf ("* render thread created\n"); while (1) { @@ -1616,7 +1613,7 @@ static int opengl_set_property (vo_driver_t *this_gen, this->sc.force_redraw = 1; /* trigger re-calc of output size */ xprintf(this->xine, XINE_VERBOSITY_DEBUG, - "video_out_opengl: aspect ratio changed to %s\n", _x_vo_scale_aspect_ratio_name(value)); + "video_out_opengl: aspect ratio changed to %s\n", _x_vo_scale_aspect_ratio_name_table[value]); break; case VO_PROP_BRIGHTNESS: this->yuv2rgb_brightness = value; @@ -1957,28 +1954,13 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v /* * class functions */ - -static char* opengl_get_identifier (video_driver_class_t *this_gen) { - return "opengl"; -} - -static char* opengl_get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using the OpenGL 3D graphics API"); -} - -static void opengl_dispose_class (video_driver_class_t *this_gen) { - opengl_class_t *this = (opengl_class_t *) this_gen; - - free (this); -} - static void *opengl_init_class (xine_t *xine, void *visual_gen) { opengl_class_t *this = (opengl_class_t *) xine_xmalloc (sizeof (opengl_class_t)); this->driver_class.open_plugin = opengl_open_plugin; - this->driver_class.get_identifier = opengl_get_identifier; - this->driver_class.get_description = opengl_get_description; - this->driver_class.dispose = opengl_dispose_class; + this->driver_class.identifier = "opengl"; + this->driver_class.description = N_("xine video output plugin using the OpenGL 3D graphics API"); + this->driver_class.dispose = default_video_driver_class_dispose; this->xine = xine; return this; @@ -1997,6 +1979,6 @@ static const vo_info_t vo_info_opengl = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "opengl", XINE_VERSION_CODE, &vo_info_opengl, opengl_init_class }, + { PLUGIN_VIDEO_OUT, 22, "opengl", XINE_VERSION_CODE, &vo_info_opengl, opengl_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; |