comparison libvo/vo_xvmc.c @ 27377:d58d06eafe83

Change a bunch of X11-specific preprocessor directives. Switch from a HAVE_ prefix to a CONFIG_ prefix.

27376:d1192f8e7df4

#endif

#include "libavutil/common.h"

//no chance for xinerama to be supported in the near future
#undef HAVE_XINERAMA

#undef NDEBUG 
#include <assert.h>

XGCValues xgcv;
XSetWindowAttributes xswa;
XWindowAttributes attribs;
unsigned long xswamask;
int depth;
#ifdef HAVE_XF86VM
int vm=0;
unsigned int modeline_width, modeline_height;
static uint32_t vm_width;
static uint32_t vm_height;
#endif

skip_surface_allocation:

   vo_mouse_autohide = 1;

#ifdef HAVE_XF86VM
   if( flags&VOFLAG_MODESWITCHING ) vm = 1;
#endif

#ifdef CONFIG_GUI
   if(use_gui)

   {
      hint.x = vo_dx;
      hint.y = vo_dy;
      hint.width = d_width;
      hint.height = d_height;
#ifdef HAVE_XF86VM
      if ( vm )
      {
	 if ((d_width==0) && (d_height==0))
	    { vm_width=image_width; vm_height=image_height; }
	 else

      XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);

      if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc );
      vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &xgcv);
      XSync(mDisplay, False);
#ifdef HAVE_XF86VM
      if ( vm )
      {
      /* Grab the mouse pointer in our window */
         if(vo_grabpointer)
         XGrabPointer(mDisplay, vo_window, True, 0,

static void uninit(void){
   if( mp_msg_test(MSGT_VO,MSGL_DBG4) ) {
      printf("vo_xvmc: uninit called\n"); }
   xvmc_free();
 //from vo_xv
#ifdef HAVE_XF86VM
   vo_vm_close(mDisplay);
#endif
   vo_x11_uninit();
}

27377:d58d06eafe83

#endif

#include "libavutil/common.h"

//no chance for xinerama to be supported in the near future
#undef CONFIG_XINERAMA

#undef NDEBUG 
#include <assert.h>

XGCValues xgcv;
XSetWindowAttributes xswa;
XWindowAttributes attribs;
unsigned long xswamask;
int depth;
#ifdef CONFIG_XF86VM
int vm=0;
unsigned int modeline_width, modeline_height;
static uint32_t vm_width;
static uint32_t vm_height;
#endif

skip_surface_allocation:

   vo_mouse_autohide = 1;

#ifdef CONFIG_XF86VM
   if( flags&VOFLAG_MODESWITCHING ) vm = 1;
#endif

#ifdef CONFIG_GUI
   if(use_gui)

   {
      hint.x = vo_dx;
      hint.y = vo_dy;
      hint.width = d_width;
      hint.height = d_height;
#ifdef CONFIG_XF86VM
      if ( vm )
      {
	 if ((d_width==0) && (d_height==0))
	    { vm_width=image_width; vm_height=image_height; }
	 else

      XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);

      if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc );
      vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &xgcv);
      XSync(mDisplay, False);
#ifdef CONFIG_XF86VM
      if ( vm )
      {
      /* Grab the mouse pointer in our window */
         if(vo_grabpointer)
         XGrabPointer(mDisplay, vo_window, True, 0,

static void uninit(void){
   if( mp_msg_test(MSGT_VO,MSGL_DBG4) ) {
      printf("vo_xvmc: uninit called\n"); }
   xvmc_free();
 //from vo_xv
#ifdef CONFIG_XF86VM
   vo_vm_close(mDisplay);
#endif
   vo_x11_uninit();
}