Skip to content

V
vlc-1.1
Commit 4994baa7 authored by Cyril Deguet's avatar Cyril Deguet
Browse files
Options

* all: created a new module type "opengl provider", which provides a 

   simple interface to create and use OpenGL windows
 * modules/video_output/x11/glx.c: the GLX vout now implements the
  "opengl provider" interface
 * modules/visualization/galaktos/*: no more dependency on GLX: we use
   the generic opengl provider interface instead.
parent 42d17b9d
Show whitespace changes
Inline Side-by-side
Showing with 357 additions and 542 deletions
include/vlc_common.h
View file @ 4994baa7
...@@ -340,6 +340,10 @@ typedef int (*httpd_file_callback_t)( httpd_file_sys_t*, httpd_file_t *, uint8_t ...@@ -340,6 +340,10 @@ typedef int (*httpd_file_callback_t)( httpd_file_sys_t*, httpd_file_t *, uint8_t
typedef struct httpd_redirect_t httpd_redirect_t; typedef struct httpd_redirect_t httpd_redirect_t;
typedef struct httpd_stream_t httpd_stream_t; typedef struct httpd_stream_t httpd_stream_t;
/* opengl */
typedef struct opengl_t opengl_t;
typedef struct opengl_sys_t opengl_sys_t;
/* divers */ /* divers */
typedef struct vlc_meta_t vlc_meta_t; typedef struct vlc_meta_t vlc_meta_t;
......
include/vlc_objects.h
View file @ 4994baa7
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#define VLC_OBJECT_DEMUX (-18) #define VLC_OBJECT_DEMUX (-18)
#define VLC_OBJECT_ACCESS (-19) #define VLC_OBJECT_ACCESS (-19)
#define VLC_OBJECT_STREAM (-20) #define VLC_OBJECT_STREAM (-20)
#define VLC_OBJECT_OPENGL (-21)
#define VLC_OBJECT_GENERIC (-666) #define VLC_OBJECT_GENERIC (-666)
......
modules/visualization/galaktos/glx.h → include/vlc_opengl.h
View file @ 4994baa7
/***************************************************************************** /*****************************************************************************
* plugin.h: * vlc_opengl.h: OpenGL provider interface
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 VideoLAN * Copyright (C) 2004 VideoLAN
* $Id$ * $Id$
...@@ -21,33 +21,28 @@ ...@@ -21,33 +21,28 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef _GALAKTOS_GLX_H_ #ifndef _VLC_OPENGL_H
#define _GALAKTOS_GLX_H_ #define _VLC_OPENGL_H 1
#include "plugin.h"
int galaktos_glx_init( galaktos_thread_t *p_thread ); struct opengl_t
void galaktos_glx_done( galaktos_thread_t *p_thread );
int galaktos_glx_handle_events( galaktos_thread_t *p_thread );
void galaktos_glx_activate_pbuffer( galaktos_thread_t *p_thread );
void galaktos_glx_activate_window( galaktos_thread_t *p_thread );
void galaktos_glx_swap( galaktos_thread_t *p_thread );
/*****************************************************************************
* mwmhints_t: window manager hints
*****************************************************************************
* Fullscreen needs to be able to hide the wm decorations so we provide
* this structure to make it easier.
*****************************************************************************/
#define MWM_HINTS_DECORATIONS (1L << 1)
#define PROP_MWM_HINTS_ELEMENTS 5
typedef struct mwmhints_t
{ {
uint32_t flags; VLC_COMMON_MEMBERS
uint32_t functions;
uint32_t decorations; int i_width; /* window width */
int32_t input_mode; int i_height; /* window height */
uint32_t status; int b_fullscreen; /* fullscreen flag */
} mwmhints_t;
opengl_sys_t *p_sys; /* private data */
/* Create an OpenGL window of the requested size (if possible) */
int ( *pf_init )( opengl_t *, int i_width, int i_height );
/* Swap front/back buffers */
void ( *pf_swap )( opengl_t * );
/* Handle window events */
int ( *pf_handle_events )( opengl_t * );
};
#endif #endif
modules/video_output/x11/glx.c
View file @ 4994baa7
...@@ -32,28 +32,59 @@ ...@@ -32,28 +32,59 @@
#include <vlc/intf.h> #include <vlc/intf.h>
#include <vlc/vout.h> #include <vlc/vout.h>
/* For the opengl provider interface */
#include "vlc_opengl.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <GL/glx.h> #include <GL/glx.h>
/* Data common to vout and opengl provider structures */
typedef struct glx_t
{
Display *p_display;
int b_glx13;
int i_width;
int i_height;
int b_fullscreen;
GLXContext gwctx;
Window wnd;
GLXWindow gwnd;
Atom wm_delete;
} glx_t;
/***************************************************************************** /*****************************************************************************
* Local prototypes * Vout interface
*****************************************************************************/ *****************************************************************************/
static int Create ( vlc_object_t * ); static int CreateVout ( vlc_object_t * );
static void Destroy ( vlc_object_t * ); static void DestroyVout ( vlc_object_t * );
static int Init ( vout_thread_t * ); static int Init ( vout_thread_t * );
static void End ( vout_thread_t * ); static void End ( vout_thread_t * );
static int Manage ( vout_thread_t * ); static int Manage ( vout_thread_t * );
static void Render ( vout_thread_t *p_vout, picture_t *p_pic ); static void Render ( vout_thread_t *p_vout, picture_t *p_pic );
static void DisplayVideo( vout_thread_t *, picture_t * ); static void DisplayVideo ( vout_thread_t *, picture_t * );
/*****************************************************************************
* OpenGL providerinterface
*****************************************************************************/
static int CreateOpenGL ( vlc_object_t * );
static void DestroyOpenGL( vlc_object_t * );
static int InitOpenGL ( opengl_t *, int, int );
static void SwapBuffers ( opengl_t * );
static int HandleEvents ( opengl_t * );
static int OpenDisplay ( vout_thread_t * ); /*****************************************************************************
static void CloseDisplay( vout_thread_t * ); * Local prototypes
static int InitGLX12 ( vout_thread_t *p_vout ); *****************************************************************************/
static int InitGLX13 ( vout_thread_t *p_vout ); static int OpenDisplay ( vlc_object_t *, glx_t * );
static void CreateWindow( vout_thread_t *p_vout, XVisualInfo *p_vi ); static void CloseDisplay( glx_t * );
static void SwitchContext( vout_thread_t *p_vout ); static int InitGLX12 ( vlc_object_t *, glx_t * );
static int InitGLX13 ( vlc_object_t *, glx_t * );
static void CreateWindow( vlc_object_t *, glx_t *, XVisualInfo *);
static int HandleX11Events( vlc_object_t *, glx_t * );
static void SwitchContext( glx_t * );
static inline int GetAlignedSize( int i_size ); static inline int GetAlignedSize( int i_size );
...@@ -64,9 +95,15 @@ vlc_module_begin(); ...@@ -64,9 +95,15 @@ vlc_module_begin();
set_description( _("X11 OpenGL (GLX) video output") ); set_description( _("X11 OpenGL (GLX) video output") );
set_capability( "video output", 20 ); set_capability( "video output", 20 );
add_shortcut( "glx" ); add_shortcut( "glx" );
set_callbacks( Create, Destroy ); set_callbacks( CreateVout, DestroyVout );
add_submodule();
set_description( _("X11 OpenGL provider") );
set_capability( "opengl provider", 50 );
set_callbacks( CreateOpenGL, DestroyOpenGL );
vlc_module_end(); vlc_module_end();
/***************************************************************************** /*****************************************************************************
* vout_sys_t: GLX video output method descriptor * vout_sys_t: GLX video output method descriptor
***************************************************************************** *****************************************************************************
...@@ -77,26 +114,20 @@ struct vout_sys_t ...@@ -77,26 +114,20 @@ struct vout_sys_t
{ {
uint8_t *p_buffer; uint8_t *p_buffer;
int i_index; int i_index;
int i_tex_width; int i_tex_width;
int i_tex_height; int i_tex_height;
int i_width;
int i_height;
int b_fullscreen;
Display *p_display;
int b_glx13;
GLXContext gwctx;
Window wnd;
GLXWindow gwnd;
Atom wm_delete;
GLuint texture; GLuint texture;
int i_effect; //XXX int i_effect; //XXX
glx_t glx;
}; };
struct opengl_sys_t
{
glx_t glx;
};
#define MWM_HINTS_DECORATIONS (1L << 1) #define MWM_HINTS_DECORATIONS (1L << 1)
#define PROP_MWM_HINTS_ELEMENTS 5 #define PROP_MWM_HINTS_ELEMENTS 5
typedef struct mwmhints_t typedef struct mwmhints_t
...@@ -110,11 +141,11 @@ typedef struct mwmhints_t ...@@ -110,11 +141,11 @@ typedef struct mwmhints_t
/***************************************************************************** /*****************************************************************************
* Create: allocates GLX video thread output method * CreateVout: allocates GLX video thread output method
***************************************************************************** *****************************************************************************
* This function allocates and initializes a GLX vout method. * This function allocates and initializes a GLX vout method.
*****************************************************************************/ *****************************************************************************/
static int Create( vlc_object_t *p_this ) static int CreateVout( vlc_object_t *p_this )
{ {
vout_thread_t *p_vout = (vout_thread_t *)p_this; vout_thread_t *p_vout = (vout_thread_t *)p_this;
...@@ -129,11 +160,11 @@ static int Create( vlc_object_t *p_this ) ...@@ -129,11 +160,11 @@ static int Create( vlc_object_t *p_this )
//XXX set to 0 to disable the cube effect //XXX set to 0 to disable the cube effect
p_vout->p_sys->i_effect = 1; p_vout->p_sys->i_effect = 1;
/* p_vout->p_sys->i_width = p_vout->i_window_width; /* p_vout->p_sys->glx.i_width = p_vout->i_window_width;
p_vout->p_sys->i_height = p_vout->i_window_height; */ p_vout->p_sys->glx.i_height = p_vout->i_window_height; */
p_vout->p_sys->i_width = 700; p_vout->p_sys->glx.i_width = 700;
p_vout->p_sys->i_height = 700; p_vout->p_sys->glx.i_height = 700;
p_vout->p_sys->b_fullscreen = 0; p_vout->p_sys->glx.b_fullscreen = 0;
/* A texture must have a size aligned on a power of 2 */ /* A texture must have a size aligned on a power of 2 */
p_vout->p_sys->i_tex_width = GetAlignedSize( p_vout->render.i_width ); p_vout->p_sys->i_tex_width = GetAlignedSize( p_vout->render.i_width );
...@@ -143,7 +174,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -143,7 +174,7 @@ static int Create( vlc_object_t *p_this )
p_vout->p_sys->i_tex_height ); p_vout->p_sys->i_tex_height );
/* Open and initialize device */ /* Open and initialize device */
if( OpenDisplay( p_vout ) ) if( OpenDisplay( p_this, &p_vout->p_sys->glx ) )
{ {
msg_Err( p_vout, "cannot open display" ); msg_Err( p_vout, "cannot open display" );
free( p_vout->p_sys ); free( p_vout->p_sys );
...@@ -200,6 +231,13 @@ static int Init( vout_thread_t *p_vout ) ...@@ -200,6 +231,13 @@ static int Init( vout_thread_t *p_vout )
* directly by the decoder */ * directly by the decoder */
p_pic->i_planes = 1; p_pic->i_planes = 1;
p_vout->p_sys->p_buffer =
malloc( p_vout->p_sys->i_tex_width * p_vout->p_sys->i_tex_height * 4 );
if( !p_vout->p_sys->p_buffer )
{
msg_Err( p_vout, "Out of memory" );
return -1;
}
p_pic->p->p_pixels = p_vout->p_sys->p_buffer p_pic->p->p_pixels = p_vout->p_sys->p_buffer
+ 2 * p_vout->p_sys->i_tex_width * + 2 * p_vout->p_sys->i_tex_width *
...@@ -217,7 +255,7 @@ static int Init( vout_thread_t *p_vout ) ...@@ -217,7 +255,7 @@ static int Init( vout_thread_t *p_vout )
I_OUTPUTPICTURES = 1; I_OUTPUTPICTURES = 1;
SwitchContext( p_vout ); SwitchContext( &p_vout->p_sys->glx );
/* Set the texture parameters */ /* Set the texture parameters */
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
...@@ -226,7 +264,7 @@ static int Init( vout_thread_t *p_vout ) ...@@ -226,7 +264,7 @@ static int Init( vout_thread_t *p_vout )
if( p_vout->p_sys->i_effect ) if( p_vout->p_sys->i_effect )
{ {
glEnable( GL_CULL_FACE); glEnable( GL_CULL_FACE);
/*glDisable( GL_DEPTH_TEST ); /* glDisable( GL_DEPTH_TEST );
glEnable( GL_BLEND ); glEnable( GL_BLEND );
glBlendFunc( GL_SRC_ALPHA, GL_ONE );*/ glBlendFunc( GL_SRC_ALPHA, GL_ONE );*/
...@@ -253,13 +291,13 @@ static void End( vout_thread_t *p_vout ) ...@@ -253,13 +291,13 @@ static void End( vout_thread_t *p_vout )
/***************************************************************************** /*****************************************************************************
* Destroy: destroy GLX video thread output method * Destroy: destroy GLX video thread output method
***************************************************************************** *****************************************************************************
* Terminate an output method created by Create * Terminate an output method created by CreateVout
*****************************************************************************/ *****************************************************************************/
static void Destroy( vlc_object_t *p_this ) static void DestroyVout( vlc_object_t *p_this )
{ {
vout_thread_t *p_vout = (vout_thread_t *)p_this; vout_thread_t *p_vout = (vout_thread_t *)p_this;
CloseDisplay( p_vout ); CloseDisplay( &p_vout->p_sys->glx );
/* Free the texture buffer*/ /* Free the texture buffer*/
if( p_vout->p_sys->p_buffer ) if( p_vout->p_sys->p_buffer )
...@@ -270,6 +308,95 @@ static void Destroy( vlc_object_t *p_this ) ...@@ -270,6 +308,95 @@ static void Destroy( vlc_object_t *p_this )
free( p_vout->p_sys ); free( p_vout->p_sys );
} }
/*****************************************************************************
* CreateOpenGL: initialize an OpenGL provider
*****************************************************************************/
static int CreateOpenGL( vlc_object_t *p_this )
{
opengl_t *p_opengl = (opengl_t*)p_this;
/* Allocate the structure */
p_opengl->p_sys = malloc(sizeof(opengl_sys_t));
/* Set the function pointers */
p_opengl->pf_init = InitOpenGL;
p_opengl->pf_swap = SwapBuffers;
p_opengl->pf_handle_events = HandleEvents;
p_opengl->p_sys->glx.wnd = None;
return VLC_SUCCESS;
}
/*****************************************************************************
* DestroyOpenGL: destroys an OpenGL provider
*****************************************************************************/
static void DestroyOpenGL( vlc_object_t *p_this )
{
opengl_t *p_opengl = (opengl_t*)p_this;
/* Free the structure */
free(p_opengl->p_sys);
}
/*****************************************************************************
* InitOpenGL: creates the OpenGL window
*****************************************************************************/
static int InitOpenGL( opengl_t *p_opengl, int i_width, int i_height )
{
p_opengl->p_sys->glx.i_width = i_width;
p_opengl->p_sys->glx.i_height = i_height;
p_opengl->p_sys->glx.b_fullscreen = 0;
if( OpenDisplay( (vlc_object_t*)p_opengl, &p_opengl->p_sys->glx ) )
{
msg_Err( p_opengl, "Cannot create OpenGL window" );
return VLC_EGENERIC;
}
/* Set the OpenGL context _for the current thread_ */
SwitchContext( &p_opengl->p_sys->glx );
return VLC_SUCCESS;
}
/*****************************************************************************
* SwapBuffers: swap front/back buffers
*****************************************************************************/
static void SwapBuffers( opengl_t *p_opengl )
{
if( p_opengl->p_sys->glx.b_glx13 )
{
glXSwapBuffers( p_opengl->p_sys->glx.p_display,
p_opengl->p_sys->glx.gwnd );
}
else
{
glXSwapBuffers( p_opengl->p_sys->glx.p_display,
p_opengl->p_sys->glx.wnd );
}
}
/*****************************************************************************
* HandleEvents: handle window events
*****************************************************************************/
static int HandleEvents( opengl_t *p_opengl )
{
int i_ret =
HandleX11Events( (vlc_object_t*)p_opengl, &p_opengl->p_sys->glx );
if( i_ret )
{
/* close the window */
CloseDisplay( &p_opengl->p_sys->glx );
}
return i_ret;
}
/***************************************************************************** /*****************************************************************************
* Manage: handle X11 events * Manage: handle X11 events
***************************************************************************** *****************************************************************************
...@@ -277,10 +404,28 @@ static void Destroy( vlc_object_t *p_this ) ...@@ -277,10 +404,28 @@ static void Destroy( vlc_object_t *p_this )
* console events. It returns a non null value on error. * console events. It returns a non null value on error.
*****************************************************************************/ *****************************************************************************/
static int Manage( vout_thread_t *p_vout ) static int Manage( vout_thread_t *p_vout )
{
if( HandleX11Events( (vlc_object_t*)p_vout, &p_vout->p_sys->glx ) )
{
/* the user wants to close the window */
playlist_t * p_playlist =
(playlist_t *)vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist != NULL )
{
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
}
}
return 0;
}
static int HandleX11Events( vlc_object_t *p_thread, glx_t *p_glx )
{ {
Display *p_display; Display *p_display;
p_display = p_vout->p_sys->p_display; p_display = p_glx->p_display;
/* loop on X11 events */ /* loop on X11 events */
while( XPending( p_display ) > 0 ) while( XPending( p_display ) > 0 )
...@@ -293,17 +438,10 @@ static int Manage( vout_thread_t *p_vout ) ...@@ -293,17 +438,10 @@ static int Manage( vout_thread_t *p_vout )
{ {
/* Delete notification */ /* Delete notification */
if( (evt.xclient.format == 32) && if( (evt.xclient.format == 32) &&
((Atom)evt.xclient.data.l[0] == p_vout->p_sys->wm_delete) ) ((Atom)evt.xclient.data.l[0] ==
{ p_glx->wm_delete) )
/* the user wants to close the window */
playlist_t * p_playlist =
(playlist_t *)vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist != NULL )
{ {
playlist_Stop( p_playlist ); return -1;
vlc_object_release( p_playlist );
}
} }
break; break;
} }
...@@ -312,6 +450,7 @@ static int Manage( vout_thread_t *p_vout ) ...@@ -312,6 +450,7 @@ static int Manage( vout_thread_t *p_vout )
return 0; return 0;
} }
/***************************************************************************** /*****************************************************************************
* Render: render previously calculated output * Render: render previously calculated output
*****************************************************************************/ *****************************************************************************/
...@@ -421,99 +560,88 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -421,99 +560,88 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
glEnd(); glEnd();
} }
glDisable( GL_TEXTURE_2D); glDisable( GL_TEXTURE_2D);
} }
/***************************************************************************** /*****************************************************************************
* DisplayVideo: displays previously rendered output * DisplayVideo: displays previously rendered output
*****************************************************************************/ *****************************************************************************/
static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic )
{ {
if( p_vout->p_sys->b_glx13 ) if( p_vout->p_sys->glx.b_glx13 )
{ {
glXSwapBuffers( p_vout->p_sys->p_display, p_vout->p_sys->gwnd ); glXSwapBuffers( p_vout->p_sys->glx.p_display,
p_vout->p_sys->glx.gwnd );
} }
else else
{ {
glXSwapBuffers( p_vout->p_sys->p_display, p_vout->p_sys->wnd ); glXSwapBuffers( p_vout->p_sys->glx.p_display,
p_vout->p_sys->glx.wnd );
} }
} }
/* following functions are local */
/***************************************************************************** /*****************************************************************************
* OpenDisplay: open and initialize OpenGL device * OpenDisplay: open and initialize OpenGL device
*****************************************************************************/ *****************************************************************************/
static int OpenDisplay( vlc_object_t *p_thread, glx_t *p_glx )
static int OpenDisplay( vout_thread_t *p_vout )
{ {
Display *p_display; Display *p_display;
int i_opcode, i_evt, i_err; int i_opcode, i_evt, i_err;
int i_maj, i_min; int i_maj, i_min;
/* Open the display */ /* Open the display */
p_vout->p_sys->p_display = p_display = XOpenDisplay( NULL ); p_glx->p_display = p_display = XOpenDisplay( NULL );
if( !p_display ) if( !p_display )
{ {
msg_Err( p_vout, "Cannot open display" ); msg_Err( p_thread, "Cannot open display" );
return -1; return -1;
} }
/* Check for GLX extension */ /* Check for GLX extension */
if( !XQueryExtension( p_display, "GLX", &i_opcode, &i_evt, &i_err ) ) if( !XQueryExtension( p_display, "GLX", &i_opcode, &i_evt, &i_err ) )
{ {
msg_Err( p_vout, "GLX extension not supported" ); msg_Err( p_thread, "GLX extension not supported" );
return -1; return -1;
} }
if( !glXQueryExtension( p_display, &i_err, &i_evt ) ) if( !glXQueryExtension( p_display, &i_err, &i_evt ) )
{ {
msg_Err( p_vout, "glXQueryExtension failed" ); msg_Err( p_thread, "glXQueryExtension failed" );
return -1; return -1;
} }
/* Check GLX version */ /* Check GLX version */
if (!glXQueryVersion( p_display, &i_maj, &i_min ) ) if (!glXQueryVersion( p_display, &i_maj, &i_min ) )
{ {
msg_Err( p_vout, "glXQueryVersion failed" ); msg_Err( p_thread, "glXQueryVersion failed" );
return -1; return -1;
} }
if( i_maj <= 0 || ((i_maj == 1) && (i_min < 3)) ) if( i_maj <= 0 || ((i_maj == 1) && (i_min < 3)) )
{ {
p_vout->p_sys->b_glx13 = 0; p_glx->b_glx13 = 0;
msg_Dbg( p_vout, "Using GLX 1.2 API" ); msg_Dbg( p_thread, "Using GLX 1.2 API" );
if( InitGLX12( p_vout ) == -1 ) if( InitGLX12( p_thread, p_glx ) == -1 )
{ {
return -1; return -1;
} }
} }
else else
{ {
p_vout->p_sys->b_glx13 = 1; p_glx->b_glx13 = 1;
msg_Dbg( p_vout, "Using GLX 1.3 API" ); msg_Dbg( p_thread, "Using GLX 1.3 API" );
if( InitGLX13( p_vout ) == -1 ) if( InitGLX13( p_thread, p_glx ) == -1 )
{ {
return -1; return -1;
} }
} }
XMapWindow( p_display, p_vout->p_sys->wnd ); XMapWindow( p_display, p_glx->wnd );
if( p_vout->p_sys->b_fullscreen ) if( p_glx->b_fullscreen )
{ {
//XXX //XXX
XMoveWindow( p_display, p_vout->p_sys->wnd, 0, 0 ); XMoveWindow( p_display, p_glx->wnd, 0, 0 );
} }
XFlush( p_display ); XFlush( p_display );
/* Allocate the texture buffer */
p_vout->p_sys->p_buffer =
malloc( p_vout->p_sys->i_tex_width * p_vout->p_sys->i_tex_height * 4 );
if( !p_vout->p_sys->p_buffer )
{
msg_Err( p_vout, "Out of memory" );
return -1;
}
return 0; return 0;
} }
...@@ -523,25 +651,29 @@ static int OpenDisplay( vout_thread_t *p_vout ) ...@@ -523,25 +651,29 @@ static int OpenDisplay( vout_thread_t *p_vout )
* Returns all resources allocated by OpenDisplay and restore the original * Returns all resources allocated by OpenDisplay and restore the original
* state of the device. * state of the device.
*****************************************************************************/ *****************************************************************************/
static void CloseDisplay( vout_thread_t *p_vout ) static void CloseDisplay( glx_t *p_glx )
{ {
Display *p_display; Display *p_display;
glFlush(); if (p_glx->wnd == None )
p_display = p_vout->p_sys->p_display;
glXDestroyContext( p_display, p_vout->p_sys->gwctx );
if( p_vout->p_sys->b_glx13 )
{ {
glXDestroyWindow( p_display, p_vout->p_sys->gwnd ); // Already closed or not opened...
return;
} }
XDestroyWindow( p_display, p_vout->p_sys->wnd );
XCloseDisplay( p_display );
glFlush();
p_display = p_glx->p_display;
glXDestroyContext( p_display, p_glx->gwctx );
if( p_glx->b_glx13 )
{
glXDestroyWindow( p_display, p_glx->gwnd );
}
XDestroyWindow( p_display, p_glx->wnd );
p_glx->wnd = None;
} }
int InitGLX12( vout_thread_t *p_vout ) int InitGLX12( vlc_object_t *p_thread, glx_t *p_glx )
{ {
Display *p_display; Display *p_display;
XVisualInfo *p_vi; XVisualInfo *p_vi;
...@@ -550,23 +682,23 @@ int InitGLX12( vout_thread_t *p_vout ) ...@@ -550,23 +682,23 @@ int InitGLX12( vout_thread_t *p_vout )
GLX_BLUE_SIZE, 5, GLX_DOUBLEBUFFER, GLX_BLUE_SIZE, 5, GLX_DOUBLEBUFFER,
0 }; 0 };
p_display = p_vout->p_sys->p_display; p_display = p_glx->p_display;
p_vi = glXChooseVisual( p_display, DefaultScreen( p_display), p_attr ); p_vi = glXChooseVisual( p_display, DefaultScreen( p_display), p_attr );
if(! p_vi ) if(! p_vi )
{ {
msg_Err( p_vout, "Cannot get GLX 1.2 visual" ); msg_Err( p_thread, "Cannot get GLX 1.2 visual" );
return -1; return -1;
} }
/* Create the window */ /* Create the window */
CreateWindow( p_vout, p_vi ); CreateWindow( p_thread, p_glx, p_vi );
/* Create an OpenGL context */ /* Create an OpenGL context */
p_vout->p_sys->gwctx = gwctx = glXCreateContext( p_display, p_vi, 0, True ); p_glx->gwctx = gwctx = glXCreateContext( p_display, p_vi, 0, True );
if( !gwctx ) if( !gwctx )
{ {
msg_Err( p_vout, "Cannot create OpenGL context"); msg_Err( p_thread, "Cannot create OpenGL context");
XFree( p_vi ); XFree( p_vi );
return -1; return -1;
} }
...@@ -576,7 +708,7 @@ int InitGLX12( vout_thread_t *p_vout ) ...@@ -576,7 +708,7 @@ int InitGLX12( vout_thread_t *p_vout )
} }
int InitGLX13( vout_thread_t *p_vout ) int InitGLX13( vlc_object_t *p_thread, glx_t *p_glx )
{ {
Display *p_display; Display *p_display;
int i_nbelem; int i_nbelem;
...@@ -587,13 +719,13 @@ int InitGLX13( vout_thread_t *p_vout ) ...@@ -587,13 +719,13 @@ int InitGLX13( vout_thread_t *p_vout )
GLX_BLUE_SIZE, 5, GLX_DOUBLEBUFFER, True, GLX_BLUE_SIZE, 5, GLX_DOUBLEBUFFER, True,
GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, 0 }; GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, 0 };
p_display = p_vout->p_sys->p_display; p_display = p_glx->p_display;
/* Get the FB configuration */ /* Get the FB configuration */
p_fbconfs = glXChooseFBConfig( p_display, 0, p_attr, &i_nbelem ); p_fbconfs = glXChooseFBConfig( p_display, 0, p_attr, &i_nbelem );
if( (i_nbelem <= 0) || !p_fbconfs ) if( (i_nbelem <= 0) || !p_fbconfs )
{ {
msg_Err( p_vout, "Cannot get FB configurations"); msg_Err( p_thread, "Cannot get FB configurations");
if( p_fbconfs ) if( p_fbconfs )
{ {
XFree( p_fbconfs ); XFree( p_fbconfs );
...@@ -606,30 +738,30 @@ int InitGLX13( vout_thread_t *p_vout ) ...@@ -606,30 +738,30 @@ int InitGLX13( vout_thread_t *p_vout )
p_vi = glXGetVisualFromFBConfig( p_display, fbconf ); p_vi = glXGetVisualFromFBConfig( p_display, fbconf );
if( !p_vi ) if( !p_vi )
{ {
msg_Err( p_vout, "Cannot get X11 visual" ); msg_Err( p_thread, "Cannot get X11 visual" );
XFree( p_fbconfs ); XFree( p_fbconfs );
return -1; return -1;
} }
/* Create the window */ /* Create the window */
CreateWindow( p_vout, p_vi ); CreateWindow( p_thread, p_glx, p_vi );
XFree( p_vi ); XFree( p_vi );
/* Create the GLX window */ /* Create the GLX window */
p_vout->p_sys->gwnd = glXCreateWindow( p_display, fbconf, p_vout->p_sys->wnd, NULL ); p_glx->gwnd = glXCreateWindow( p_display, fbconf, p_glx->wnd, NULL );
if( p_vout->p_sys->gwnd == None ) if( p_glx->gwnd == None )
{ {
msg_Err( p_vout, "Cannot create GLX window" ); msg_Err( p_thread, "Cannot create GLX window" );
return -1; return -1;
} }
/* Create an OpenGL context */ /* Create an OpenGL context */
p_vout->p_sys->gwctx = gwctx = glXCreateNewContext( p_display, fbconf, p_glx->gwctx = gwctx = glXCreateNewContext( p_display, fbconf,
GLX_RGBA_TYPE, NULL, True ); GLX_RGBA_TYPE, NULL, True );
if( !gwctx ) if( !gwctx )
{ {
msg_Err( p_vout, "Cannot create OpenGL context"); msg_Err( p_thread, "Cannot create OpenGL context");
XFree( p_fbconfs ); XFree( p_fbconfs );
return -1; return -1;
} }
...@@ -639,8 +771,7 @@ int InitGLX13( vout_thread_t *p_vout ) ...@@ -639,8 +771,7 @@ int InitGLX13( vout_thread_t *p_vout )
} }
void CreateWindow( vlc_object_t *p_thread, glx_t *p_glx, XVisualInfo *p_vi )
void CreateWindow( vout_thread_t *p_vout, XVisualInfo *p_vi )
{ {
Display *p_display; Display *p_display;
XSetWindowAttributes xattr; XSetWindowAttributes xattr;
...@@ -650,7 +781,7 @@ void CreateWindow( vout_thread_t *p_vout, XVisualInfo *p_vi ) ...@@ -650,7 +781,7 @@ void CreateWindow( vout_thread_t *p_vout, XVisualInfo *p_vi )
Atom prop; Atom prop;
mwmhints_t mwmhints; mwmhints_t mwmhints;
p_display = p_vout->p_sys->p_display; p_display = p_glx->p_display;
/* Create a colormap */ /* Create a colormap */
cm = XCreateColormap( p_display, RootWindow( p_display, p_vi->screen ), cm = XCreateColormap( p_display, RootWindow( p_display, p_vi->screen ),
...@@ -660,16 +791,16 @@ void CreateWindow( vout_thread_t *p_vout, XVisualInfo *p_vi ) ...@@ -660,16 +791,16 @@ void CreateWindow( vout_thread_t *p_vout, XVisualInfo *p_vi )
xattr.background_pixel = BlackPixel( p_display, DefaultScreen(p_display) ); xattr.background_pixel = BlackPixel( p_display, DefaultScreen(p_display) );
xattr.border_pixel = 0; xattr.border_pixel = 0;
xattr.colormap = cm; xattr.colormap = cm;
p_vout->p_sys->wnd = wnd = XCreateWindow( p_display, DefaultRootWindow(p_display), p_glx->wnd = wnd = XCreateWindow( p_display, DefaultRootWindow(p_display),
0, 0, p_vout->p_sys->i_width, p_vout->p_sys->i_height, 0, p_vi->depth, 0, 0, p_glx->i_width, p_glx->i_height, 0, p_vi->depth,
InputOutput, p_vi->visual, InputOutput, p_vi->visual,
CWBackPixel | CWBorderPixel | CWColormap, &xattr); CWBackPixel | CWBorderPixel | CWColormap, &xattr);
/* Allow the window to be deleted by the window manager */ /* Allow the window to be deleted by the window manager */
p_vout->p_sys->wm_delete = XInternAtom( p_display, "WM_DELETE_WINDOW", False ); p_glx->wm_delete = XInternAtom( p_display, "WM_DELETE_WINDOW", False );
XSetWMProtocols( p_display, wnd, &p_vout->p_sys->wm_delete, 1 ); XSetWMProtocols( p_display, wnd, &p_glx->wm_delete, 1 );
if( p_vout->p_sys->b_fullscreen ) if( p_glx->b_fullscreen )
{ {
mwmhints.flags = MWM_HINTS_DECORATIONS; mwmhints.flags = MWM_HINTS_DECORATIONS;
mwmhints.decorations = False; mwmhints.decorations = False;
...@@ -683,10 +814,10 @@ void CreateWindow( vout_thread_t *p_vout, XVisualInfo *p_vi ) ...@@ -683,10 +814,10 @@ void CreateWindow( vout_thread_t *p_vout, XVisualInfo *p_vi )
/* Prevent the window from being resized */ /* Prevent the window from being resized */
p_size_hints = XAllocSizeHints(); p_size_hints = XAllocSizeHints();
p_size_hints->flags = PMinSize | PMaxSize; p_size_hints->flags = PMinSize | PMaxSize;
p_size_hints->min_width = p_vout->p_sys->i_width; p_size_hints->min_width = p_glx->i_width;
p_size_hints->min_height = p_vout->p_sys->i_height; p_size_hints->min_height = p_glx->i_height;
p_size_hints->max_width = p_vout->p_sys->i_width; p_size_hints->max_width = p_glx->i_width;
p_size_hints->max_height = p_vout->p_sys->i_height; p_size_hints->max_height = p_glx->i_height;
XSetWMNormalHints( p_display, wnd, p_size_hints ); XSetWMNormalHints( p_display, wnd, p_size_hints );
XFree( p_size_hints ); XFree( p_size_hints );
} }
...@@ -694,18 +825,18 @@ void CreateWindow( vout_thread_t *p_vout, XVisualInfo *p_vi ) ...@@ -694,18 +825,18 @@ void CreateWindow( vout_thread_t *p_vout, XVisualInfo *p_vi )
} }
void SwitchContext( vout_thread_t *p_vout ) void SwitchContext( glx_t *p_glx )
{ {
/* Change the current OpenGL context */ /* Change the current OpenGL context */
if( p_vout->p_sys->b_glx13 ) if( p_glx->b_glx13 )
{ {
glXMakeContextCurrent( p_vout->p_sys->p_display, p_vout->p_sys->gwnd, glXMakeContextCurrent( p_glx->p_display, p_glx->gwnd,
p_vout->p_sys->gwnd, p_vout->p_sys->gwctx ); p_glx->gwnd, p_glx->gwctx );
} }
else else
{ {
glXMakeCurrent( p_vout->p_sys->p_display, p_vout->p_sys->wnd, glXMakeCurrent( p_glx->p_display, p_glx->wnd,
p_vout->p_sys->gwctx ); p_glx->gwctx );
} }
} }
......
modules/visualization/galaktos/Modules.am
View file @ 4994baa7
SOURCES_galaktos = plugin.c \ SOURCES_galaktos = plugin.c \
plugin.h \ plugin.h \
glx.c \
glx.h \
main.c \ main.c \
main.h \ main.h \
preset.c \ preset.c \
......
modules/visualization/galaktos/glx.c deleted 100644 → 0
View file @ 42d17b9d
/*****************************************************************************
* glx.c:
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id$
*
* Authors: Cyril Deguet <asmax@videolan.org>
* based on Scivi http://xmms-scivi.sourceforge.net
*
* This program 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.
*
* This program 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, USA.
*****************************************************************************/
#include "glx.h"
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <GL/glx.h>
/* Local prototypes */
static int InitGLX12( galaktos_thread_t *p_thread );
static int InitGLX13( galaktos_thread_t *p_thread );
static void CreateWindow( galaktos_thread_t *p_thread, XVisualInfo *p_vi );
typedef struct
{
Display *p_display;
int b_glx13;
GLXContext gwctx;
Window wnd;
GLXWindow gwnd;
GLXPbuffer gpbuf;
GLXContext gpctx;
Atom wm_delete;
}
glx_data_t;
#define OS_DATA ((glx_data_t*)(p_thread->p_os_data))
int galaktos_glx_init( galaktos_thread_t *p_thread )
{
Display *p_display;
int i_opcode, i_evt, i_err;
int i_maj, i_min;
/* Initialize OS data */
p_thread->p_os_data = malloc( sizeof( glx_data_t ) );
/* Open the display */
OS_DATA->p_display = p_display = XOpenDisplay( NULL );
if( !p_display )
{
msg_Err( p_thread, "Cannot open display" );
return -1;
}
/* Check for GLX extension */
if( !XQueryExtension( p_display, "GLX", &i_opcode, &i_evt, &i_err ) )
{
msg_Err( p_thread, "GLX extension not supported" );
return -1;
}
if( !glXQueryExtension( p_display, &i_err, &i_evt ) )
{
msg_Err( p_thread, "glXQueryExtension failed" );
return -1;
}
/* Check GLX version */
if (!glXQueryVersion( p_display, &i_maj, &i_min ) )
{
msg_Err( p_thread, "glXQueryVersion failed" );
return -1;
}
if( i_maj <= 0 || ((i_maj == 1) && (i_min < 3)) )
{
OS_DATA->b_glx13 = 0;
msg_Info( p_thread, "Using GLX 1.2 API" );
if( InitGLX12( p_thread ) == -1 )
{
return -1;
}
}
else
{
OS_DATA->b_glx13 = 1;
msg_Info( p_thread, "Using GLX 1.3 API" );
if( InitGLX13( p_thread ) == -1 )
{
return -1;
}
}
XMapWindow( p_display, OS_DATA->wnd );
if( p_thread->b_fullscreen )
{
//XXX
XMoveWindow( p_display, OS_DATA->wnd, 0, 0 );
}
XFlush( p_display );
return 0;
}
int galaktos_glx_handle_events( galaktos_thread_t *p_thread )
{
Display *p_display;
p_display = OS_DATA->p_display;
/* loop on X11 events */
while( XPending( p_display ) > 0 )
{
XEvent evt;
XNextEvent( p_display, &evt );
switch( evt.type )
{
case ClientMessage:
{
/* Delete notification */
if( (evt.xclient.format == 32) &&
((Atom)evt.xclient.data.l[0] == OS_DATA->wm_delete) )
{
return 1;
}
break;
}
}
}
return 0;
}
void galaktos_glx_activate_pbuffer( galaktos_thread_t *p_thread )
{
glXMakeContextCurrent( OS_DATA->p_display, OS_DATA->gpbuf, OS_DATA->gpbuf,
OS_DATA->gpctx );
}
void galaktos_glx_activate_window( galaktos_thread_t *p_thread )
{
if( OS_DATA->b_glx13 )
{
glXMakeContextCurrent( OS_DATA->p_display, OS_DATA->gwnd, OS_DATA->gwnd,
OS_DATA->gwctx );
}
else
{
glXMakeCurrent( OS_DATA->p_display, OS_DATA->wnd, OS_DATA->gwctx );
}
}
void galaktos_glx_swap( galaktos_thread_t *p_thread )
{
if( OS_DATA->b_glx13 )
{
glXSwapBuffers( OS_DATA->p_display, OS_DATA->gwnd );
}
else
{
glXSwapBuffers( OS_DATA->p_display, OS_DATA->wnd );
}
}
void galaktos_glx_done( galaktos_thread_t *p_thread )
{
Display *p_display;
p_display = OS_DATA->p_display;
if( OS_DATA->b_glx13 )
{
glXDestroyContext( p_display, OS_DATA->gpctx );
glXDestroyPbuffer( p_display, OS_DATA->gpbuf );
}
glXDestroyContext( p_display, OS_DATA->gwctx );
if( OS_DATA->b_glx13 )
{
glXDestroyWindow( p_display, OS_DATA->gwnd );
}
XDestroyWindow( p_display, OS_DATA->wnd );
XCloseDisplay( p_display );
}
int InitGLX12( galaktos_thread_t *p_thread )
{
Display *p_display;
XVisualInfo *p_vi;
GLXContext gwctx;
int p_attr[] = { GLX_RGBA, GLX_RED_SIZE, 5, GLX_GREEN_SIZE, 5,
GLX_BLUE_SIZE, 5, GLX_DOUBLEBUFFER,
0 };
p_display = OS_DATA->p_display;
p_vi = glXChooseVisual( p_display, DefaultScreen( p_display), p_attr );
if(! p_vi )
{
msg_Err( p_thread, "Cannot get GLX 1.2 visual" );
return -1;
}
/* Create the window */
CreateWindow( p_thread, p_vi );
/* Create an OpenGL context */
OS_DATA->gwctx = gwctx = glXCreateContext( p_display, p_vi, 0, True );
if( !gwctx )
{
msg_Err( p_thread, "Cannot create OpenGL context");
XFree( p_vi );
return -1;
}
XFree( p_vi );
return 0;
}
int InitGLX13( galaktos_thread_t *p_thread )
{
Display *p_display;
int i_nbelem;
GLXFBConfig *p_fbconfs, fbconf;
XVisualInfo *p_vi;
GLXContext gwctx;
int i;
GLXPbuffer gpbuf;
int p_attr[] = { GLX_RED_SIZE, 5, GLX_GREEN_SIZE, 5,
GLX_BLUE_SIZE, 5, GLX_DOUBLEBUFFER, True,
GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, 0 };
p_display = OS_DATA->p_display;
/* Get the FB configuration */
p_fbconfs = glXChooseFBConfig( p_display, 0, p_attr, &i_nbelem );
if( (i_nbelem <= 0) || !p_fbconfs )
{
msg_Err( p_thread, "Cannot get FB configurations");
if( p_fbconfs )
{
XFree( p_fbconfs );
}
return -1;
}
fbconf = p_fbconfs[0];
/* Get the X11 visual */
p_vi = glXGetVisualFromFBConfig( p_display, fbconf );
if( !p_vi )
{
msg_Err( p_thread, "Cannot get X11 visual" );
XFree( p_fbconfs );
return -1;
}
/* Create the window */
CreateWindow( p_thread, p_vi );
XFree( p_vi );
/* Create the GLX window */
OS_DATA->gwnd = glXCreateWindow( p_display, fbconf, OS_DATA->wnd, NULL );
if( OS_DATA->gwnd == None )
{
msg_Err( p_thread, "Cannot create GLX window" );
return -1;
}
/* Create an OpenGL context */
OS_DATA->gwctx = gwctx = glXCreateNewContext( p_display, fbconf,
GLX_RGBA_TYPE, NULL, True );
if( !gwctx )
{
msg_Err( p_thread, "Cannot create OpenGL context");
XFree( p_fbconfs );
return -1;
}
XFree( p_fbconfs );
/* Get a FB config for the pbuffer */
p_attr[1] = 8; // RED_SIZE
p_attr[3] = 8; // GREEN_SIZE
p_attr[5] = 8; // BLUE_SIZE
p_attr[7] = False; // DOUBLEBUFFER
p_attr[9] = GLX_PBUFFER_BIT; // DRAWABLE_TYPE
p_fbconfs = glXChooseFBConfig( p_display, 0, p_attr, &i_nbelem );
if( (i_nbelem <= 0) || !p_fbconfs )
{
msg_Err( p_thread, "Cannot get FB configurations for pbuffer");
if( p_fbconfs )
{
XFree( p_fbconfs );
}
return -1;
}
fbconf = p_fbconfs[0];
/* Create a pbuffer */
i = 0;
p_attr[i++] = GLX_PBUFFER_WIDTH;
p_attr[i++] = 512;
p_attr[i++] = GLX_PBUFFER_HEIGHT;
p_attr[i++] = 512;
p_attr[i++] = GLX_PRESERVED_CONTENTS;
p_attr[i++] = True;
p_attr[i++] = 0;
OS_DATA->gpbuf = gpbuf = glXCreatePbuffer( p_display, fbconf, p_attr );
if( !gpbuf )
{
msg_Err( p_thread, "Failed to create GLX pbuffer" );
XFree( p_fbconfs );
return -1;
}
/* Create the pbuffer context */
OS_DATA->gpctx = glXCreateNewContext( p_display, fbconf, GLX_RGBA_TYPE,
gwctx, True );
if( !OS_DATA->gpctx )
{
msg_Err( p_thread, "Failed to create pbuffer context" );
XFree( p_fbconfs );
return -1;
}
XFree( p_fbconfs );
return 0;
}
void CreateWindow( galaktos_thread_t *p_thread, XVisualInfo *p_vi )
{
Display *p_display;
XSetWindowAttributes xattr;
Window wnd;
Colormap cm;
XSizeHints* p_size_hints;
Atom prop;
mwmhints_t mwmhints;
p_display = OS_DATA->p_display;
/* Create a colormap */
cm = XCreateColormap( p_display, RootWindow( p_display, p_vi->screen ),
p_vi->visual, AllocNone );
/* Create the window */
xattr.background_pixel = BlackPixel( p_display, DefaultScreen(p_display) );
xattr.border_pixel = 0;
xattr.colormap = cm;
OS_DATA->wnd = wnd = XCreateWindow( p_display, DefaultRootWindow(p_display),
0, 0, p_thread->i_width, p_thread->i_height, 0, p_vi->depth,
InputOutput, p_vi->visual,
CWBackPixel | CWBorderPixel | CWColormap, &xattr);
/* Allow the window to be deleted by the window manager */
OS_DATA->wm_delete = XInternAtom( p_display, "WM_DELETE_WINDOW", False );
XSetWMProtocols( p_display, wnd, &OS_DATA->wm_delete, 1 );
if( p_thread->b_fullscreen )
{
mwmhints.flags = MWM_HINTS_DECORATIONS;
mwmhints.decorations = False;
prop = XInternAtom( p_display, "_MOTIF_WM_HINTS", False );
XChangeProperty( p_display, wnd, prop, prop, 32, PropModeReplace,
(unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS );
}
else
{
/* Prevent the window from being resized */
p_size_hints = XAllocSizeHints();
p_size_hints->flags = PMinSize | PMaxSize;
p_size_hints->min_width = p_thread->i_width;
p_size_hints->min_height = p_thread->i_height;
p_size_hints->max_width = p_thread->i_width;
p_size_hints->max_height = p_thread->i_height;
XSetWMNormalHints( p_display, wnd, p_size_hints );
XFree( p_size_hints );
}
XSelectInput( p_display, wnd, KeyPressMask );
}
modules/visualization/galaktos/main.c
View file @ 4994baa7
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
#include "glx.h" #include "plugin.h"
#include "vlc_opengl.h"
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#include <unistd.h> #include <unistd.h>
...@@ -269,10 +270,10 @@ int galaktos_update( galaktos_thread_t *p_thread ) ...@@ -269,10 +270,10 @@ int galaktos_update( galaktos_thread_t *p_thread )
glFinish(); glFinish();
glFlush(); glFlush();
// printf("Flush %d\n",(SDL_GetTicks()-timestart)); // printf("Flush %d\n",(SDL_GetTicks()-timestart));
galaktos_glx_swap( p_thread ); (p_thread->p_opengl->pf_swap)( p_thread->p_opengl );
/* Process X11 events */ /* Process events */
if( galaktos_glx_handle_events( p_thread ) == 1 ) if( (p_thread->p_opengl->pf_handle_events)( p_thread->p_opengl ) )
{ {
return 1; return 1;
} }
......
modules/visualization/galaktos/plugin.c
View file @ 4994baa7
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
*****************************************************************************/ *****************************************************************************/
#include "plugin.h" #include "plugin.h"
#include "glx.h"
#include "main.h" #include "main.h"
#include "PCM.h" #include "PCM.h"
#include "video_init.h" #include "video_init.h"
...@@ -38,6 +37,7 @@ ...@@ -38,6 +37,7 @@
#include <vlc/input.h> #include <vlc/input.h>
#include <vlc/vout.h> #include <vlc/vout.h>
#include "aout_internal.h" #include "aout_internal.h"
#include "vlc_opengl.h"
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
...@@ -104,6 +104,25 @@ static int Open( vlc_object_t *p_this ) ...@@ -104,6 +104,25 @@ static int Open( vlc_object_t *p_this )
vlc_object_create( p_filter, sizeof( galaktos_thread_t ) ); vlc_object_create( p_filter, sizeof( galaktos_thread_t ) );
vlc_object_attach( p_thread, p_this ); vlc_object_attach( p_thread, p_this );
/* Get on OpenGL provider */
p_thread->p_opengl =
(opengl_t *)vlc_object_create( p_this, VLC_OBJECT_OPENGL );
if( p_thread->p_opengl == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_thread->p_module =
module_Need( p_thread->p_opengl, "opengl provider", NULL, 0 );
if( p_thread->p_module == NULL )
{
msg_Err( p_filter, "No OpenGL provider found" );
vlc_object_destroy( p_thread->p_opengl );
p_thread->p_opengl = NULL;
return VLC_ENOOBJ;
}
/* /*
var_Create( p_thread, "galaktos-width", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); var_Create( p_thread, "galaktos-width", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
var_Get( p_thread, "galaktos-width", &width ); var_Get( p_thread, "galaktos-width", &width );
...@@ -116,7 +135,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -116,7 +135,6 @@ static int Open( vlc_object_t *p_this )
p_thread->i_width = 600; p_thread->i_width = 600;
p_thread->i_height = 600; p_thread->i_height = 600;
p_thread->b_fullscreen = 0; p_thread->b_fullscreen = 0;
galaktos_glx_init( p_thread );
galaktos_init( p_thread ); galaktos_init( p_thread );
p_thread->i_channels = aout_FormatNbChannels( &p_filter->input ); p_thread->i_channels = aout_FormatNbChannels( &p_filter->input );
...@@ -203,7 +221,10 @@ static void Thread( vlc_object_t *p_this ) ...@@ -203,7 +221,10 @@ static void Thread( vlc_object_t *p_this )
int timestart=0; int timestart=0;
int mspf=0; int mspf=0;
galaktos_glx_activate_window( p_thread ); /* Initialize the opengl provider */
(p_thread->p_opengl->pf_init)(p_thread->p_opengl, p_thread->i_width,
p_thread->i_height);
setup_opengl( p_thread->i_width, p_thread->i_height ); setup_opengl( p_thread->i_width, p_thread->i_height );
CreateRenderTarget(512, &RenderTargetTextureID, NULL); CreateRenderTarget(512, &RenderTargetTextureID, NULL);
...@@ -235,8 +256,6 @@ static void Thread( vlc_object_t *p_this ) ...@@ -235,8 +256,6 @@ static void Thread( vlc_object_t *p_this )
// printf("Limiter %d\n",(mdate()/1000-timestart)); // printf("Limiter %d\n",(mdate()/1000-timestart));
timestart=mdate()/1000; timestart=mdate()/1000;
} }
galaktos_glx_done( p_thread );
} }
/***************************************************************************** /*****************************************************************************
...@@ -254,6 +273,10 @@ static void Close( vlc_object_t *p_this ) ...@@ -254,6 +273,10 @@ static void Close( vlc_object_t *p_this )
vlc_thread_join( p_sys->p_thread ); vlc_thread_join( p_sys->p_thread );
/* Free the openGL provider */
module_Unneed( p_sys->p_thread->p_opengl, p_sys->p_thread->p_module );
vlc_object_destroy( p_sys->p_thread->p_opengl );
/* Free data */ /* Free data */
vlc_object_detach( p_sys->p_thread ); vlc_object_detach( p_sys->p_thread );
......
modules/visualization/galaktos/plugin.h
View file @ 4994baa7
...@@ -35,6 +35,10 @@ typedef struct ...@@ -35,6 +35,10 @@ typedef struct
char *psz_title; char *psz_title;
/* OpenGL provider */
opengl_t *p_opengl;
module_t *p_module;
/* Window properties */ /* Window properties */
int i_width; int i_width;
int i_height; int i_height;
......
src/misc/objects.c
View file @ 4994baa7
...@@ -48,6 +48,8 @@ ...@@ -48,6 +48,8 @@
#include "vlc_interface.h" #include "vlc_interface.h"
#include "vlc_codec.h" #include "vlc_codec.h"
#include "vlc_opengl.h"
#include "vlc_httpd.h" #include "vlc_httpd.h"
#include "vlc_vlm.h" #include "vlc_vlm.h"
/***************************************************************************** /*****************************************************************************
...@@ -169,6 +171,10 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) ...@@ -169,6 +171,10 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
i_size = sizeof( vlm_t ); i_size = sizeof( vlm_t );
psz_type = "vlm dameon"; psz_type = "vlm dameon";
break; break;
case VLC_OBJECT_OPENGL:
i_size = sizeof( opengl_t );
psz_type = "opengl provider";
break;
case VLC_OBJECT_ANNOUNCE: case VLC_OBJECT_ANNOUNCE:
i_size = sizeof( announce_handler_t ); i_size = sizeof( announce_handler_t );
psz_type = "announce handler"; psz_type = "announce handler";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment