diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2006-10-28 17:02:51 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2006-10-28 17:02:51 +0000 |
| commit | 3d28fa78360bec4a6a5f66b60e50790c12fb3192 (patch) | |
| tree | 41db56ee3df47c28a7fc6cfcd43233e8a1c9fb60 /include | |
| parent | 35a0d08a8cf22bd8e135ee819b54136ec5266324 (diff) | |
| download | xine-lib-3d28fa78360bec4a6a5f66b60e50790c12fb3192.tar.gz xine-lib-3d28fa78360bec4a6a5f66b60e50790c12fb3192.tar.bz2 | |
new visual type XINE_VISUAL_TYPE_X11_2 with configurable X11 locking.
allow developers to use special locking support of their plataform (like
QT library mutex).
note: only xshm has been ported.
based on Christoph Pfister's patch.
CVS patchset: 8350
CVS date: 2006/10/28 17:02:51
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine.h.in | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/include/xine.h.in b/include/xine.h.in index 0739e1e84..6802fc85a 100644 --- a/include/xine.h.in +++ b/include/xine.h.in @@ -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.h.in,v 1.158 2006/09/27 14:38:59 valtri Exp $ + * $Id: xine.h.in,v 1.159 2006/10/28 17:02:51 miguelfreitas Exp $ * * public xine-lib (libxine) interface and documentation * @@ -167,6 +167,7 @@ void xine_close_video_driver (xine_t *self, xine_video_port_t *driver) XINE_PRO /* valid visual types */ #define XINE_VISUAL_TYPE_NONE 0 #define XINE_VISUAL_TYPE_X11 1 +#define XINE_VISUAL_TYPE_X11_2 10 #define XINE_VISUAL_TYPE_AA 2 #define XINE_VISUAL_TYPE_FB 3 #define XINE_VISUAL_TYPE_GTK 4 @@ -1164,6 +1165,30 @@ typedef struct { double *dest_pixel_aspect, int *win_x, int *win_y); + /* + * lock display callback + * + * this callback is called when the video driver + * needs access to the x11 display connection + * + * note: to enable this you MUST use XINE_VISUAL_TYPE_X11_2 + * note: if display_lock or display_unlock is NULL, the fallback is used + * note: fallback for this function is XLockDisplay(display) + */ + void (*lock_display) (void *user_data); + + /* + * unlock display callback + * + * this callback is called when the video driver + * doesn't need access to the x11 display connection anymore + * + * note: to enable this you MUST use XINE_VISUAL_TYPE_X11_2 + * note: if display_lock or display_unlock is NULL, the fallback is used + * note: fallback for this function is XUnlockDisplay(display) + */ + void (*unlock_display) (void *user_data); + } x11_visual_t; /* |