Mercurial > mplayer.hg

comparison gui/skin/skin.c @ 27377:d58d06eafe83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change a bunch of X11-specific preprocessor directives. Switch from a HAVE_ prefix to a CONFIG_ prefix.
author diego
date Mon, 04 Aug 2008 06:16:23 +0000
parents b0a7b35b78d2
children 0f1b5b68af32
comparison
equal deleted inserted replaced
27376:d1192f8e7df4 27377:d58d06eafe83
167 defList->main.type=itBase; 167 defList->main.type=itBase;
168 av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp )); 168 av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
169 if ( skinBPRead( tmp,&defList->main.Bitmap ) ) return 1; 169 if ( skinBPRead( tmp,&defList->main.Bitmap ) ) return 1;
170 defList->main.width=defList->main.Bitmap.Width; 170 defList->main.width=defList->main.Bitmap.Width;
171 defList->main.height=defList->main.Bitmap.Height; 171 defList->main.height=defList->main.Bitmap.Height;
172 #ifdef HAVE_XSHAPE 172 #ifdef CONFIG_XSHAPE
173 Convert32to1( &defList->main.Bitmap,&defList->main.Mask,0x00ff00ff ); 173 Convert32to1( &defList->main.Bitmap,&defList->main.Mask,0x00ff00ff );
174 mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->main.Mask.Width,defList->main.Mask.Height ); 174 mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->main.Mask.Width,defList->main.Mask.Height );
175 #else 175 #else
176 defList->main.Mask.Image=NULL; 176 defList->main.Mask.Image=NULL;
177 #endif 177 #endif
199 defList->menuBase.type=itBase; 199 defList->menuBase.type=itBase;
200 av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp )); 200 av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
201 if ( skinBPRead( tmp,&defList->menuBase.Bitmap ) ) return 1; 201 if ( skinBPRead( tmp,&defList->menuBase.Bitmap ) ) return 1;
202 defList->menuBase.width=defList->menuBase.Bitmap.Width; 202 defList->menuBase.width=defList->menuBase.Bitmap.Width;
203 defList->menuBase.height=defList->menuBase.Bitmap.Height; 203 defList->menuBase.height=defList->menuBase.Bitmap.Height;
204 #ifdef HAVE_XSHAPE 204 #ifdef CONFIG_XSHAPE
205 Convert32to1( &defList->menuBase.Bitmap,&defList->menuBase.Mask,0x00ff00ff ); 205 Convert32to1( &defList->menuBase.Bitmap,&defList->menuBase.Mask,0x00ff00ff );
206 mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->menuBase.Mask.Width,defList->menuBase.Mask.Height ); 206 mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->menuBase.Mask.Width,defList->menuBase.Mask.Height );
207 #else 207 #else
208 defList->menuBase.Mask.Image=NULL; 208 defList->menuBase.Mask.Image=NULL;
209 #endif 209 #endif
217 defList->bar.type=itBase; 217 defList->bar.type=itBase;
218 av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp )); 218 av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
219 if ( skinBPRead( tmp,&defList->bar.Bitmap ) ) return 1; 219 if ( skinBPRead( tmp,&defList->bar.Bitmap ) ) return 1;
220 defList->bar.width=defList->bar.Bitmap.Width; 220 defList->bar.width=defList->bar.Bitmap.Width;
221 defList->bar.height=defList->bar.Bitmap.Height; 221 defList->bar.height=defList->bar.Bitmap.Height;
222 #ifdef HAVE_XSHAPE 222 #ifdef CONFIG_XSHAPE
223 Convert32to1( &defList->bar.Bitmap,&defList->bar.Mask,0x00ff00ff ); 223 Convert32to1( &defList->bar.Bitmap,&defList->bar.Mask,0x00ff00ff );
224 mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->bar.Mask.Width,defList->bar.Mask.Height ); 224 mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->bar.Mask.Width,defList->bar.Mask.Height );
225 #else 225 #else
226 defList->bar.Mask.Image=NULL; 226 defList->bar.Mask.Image=NULL;
227 #endif 227 #endif