Mercurial > mplayer.hg
comparison libvo/vo_x11.c @ 1110:71b8911ec3da
-Wall like cleanup
author | al3x |
---|---|
date | Tue, 12 Jun 2001 14:09:25 +0000 |
parents | db06ae8967eb |
children | 4c7b219e126c |
comparison
equal
deleted
inserted
replaced
1109:a013b2124f05 | 1110:71b8911ec3da |
---|---|
108 static uint32_t image_width; | 108 static uint32_t image_width; |
109 static uint32_t image_height; | 109 static uint32_t image_height; |
110 static uint32_t image_format; | 110 static uint32_t image_format; |
111 | 111 |
112 static void check_events(){ | 112 static void check_events(){ |
113 int e=vo_x11_check_events(mDisplay); | 113 vo_x11_check_events(mDisplay); |
114 } | 114 } |
115 | 115 |
116 static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format ) | 116 static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format ) |
117 { | 117 { |
118 int screen; | 118 // int screen; |
119 int fullscreen=0; | 119 int fullscreen=0; |
120 int interval, prefer_blank, allow_exp, nothing; | 120 // int interval, prefer_blank, allow_exp, nothing; |
121 unsigned int fg,bg; | 121 unsigned int fg,bg; |
122 char *hello=( title == NULL ) ? "X11 render" : title; | 122 char *hello=( title == NULL ) ? "X11 render" : title; |
123 // char *name=":0.0"; | 123 // char *name=":0.0"; |
124 XSizeHints hint; | 124 XSizeHints hint; |
125 XVisualInfo vinfo; | 125 XVisualInfo vinfo; |
146 | 146 |
147 #ifdef HAVE_XF86VM | 147 #ifdef HAVE_XF86VM |
148 if (fullscreen) { | 148 if (fullscreen) { |
149 unsigned int modeline_width, modeline_height, vm_event, vm_error; | 149 unsigned int modeline_width, modeline_height, vm_event, vm_error; |
150 unsigned int vm_ver, vm_rev; | 150 unsigned int vm_ver, vm_rev; |
151 int i,j,k,have_vm=0,X,Y; | 151 int i,j,have_vm=0,X,Y; |
152 | 152 |
153 int modecount; | 153 int modecount; |
154 | 154 |
155 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) { | 155 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) { |
156 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev); | 156 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev); |
417 } | 417 } |
418 | 418 |
419 void rgb15to16_mmx( char* s0,char* d0,int count ); | 419 void rgb15to16_mmx( char* s0,char* d0,int count ); |
420 | 420 |
421 static uint32_t draw_frame( uint8_t *src[] ){ | 421 static uint32_t draw_frame( uint8_t *src[] ){ |
422 int i; | |
423 int sbpp=( ( image_format&0xFF )+7 )/8; | 422 int sbpp=( ( image_format&0xFF )+7 )/8; |
424 int dbpp=( bpp+7 )/8; | 423 int dbpp=( bpp+7 )/8; |
425 char *d=ImageData; | 424 char *d=ImageData; |
426 char *s=src[0]; | 425 char *s=src[0]; |
427 //printf( "sbpp=%d dbpp=%d depth=%d bpp=%d\n",sbpp,dbpp,depth,bpp ); | 426 //printf( "sbpp=%d dbpp=%d depth=%d bpp=%d\n",sbpp,dbpp,depth,bpp ); |