Mercurial > mplayer.hg

comparison gui/skin/skin.c @ 32958:80087dd00035

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some debug messages. Avoid debug code if debugging isn't asked for and don't use debug messages in such a way with control structures that there may be compiler warnings.
author ib
date Tue, 08 Mar 2011 09:57:04 +0000
parents c11e65fcb818
children 4905f5a87357
comparison
equal deleted inserted replaced
32957:ad8d85c1310f 32958:80087dd00035
161 } 161 }
162 162
163 // end 163 // end
164 static int cmd_end(char *in) 164 static int cmd_end(char *in)
165 { 165 {
166 #ifdef MP_DEBUG
166 char *space, *name; 167 char *space, *name;
167
168 (void)in;
169 168
170 if (window_name[0]) { 169 if (window_name[0]) {
171 space = " "; 170 space = " ";
172 name = window_name; 171 name = window_name;
173 } else { 172 } else {
174 space = ""; 173 space = "";
175 name = "section"; 174 name = "section";
176 } 175 }
176 #endif
177
178 (void)in;
177 179
178 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %send (%s)\n", space, name); 180 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %send (%s)\n", space, name);
179 181
180 if (strlen(window_name)) { 182 if (strlen(window_name)) {
181 window_name[0] = 0; 183 window_name[0] = 0;
232 x = cutItemToInt(in, ',', 1); 234 x = cutItemToInt(in, ',', 1);
233 y = cutItemToInt(in, ',', 2); 235 y = cutItemToInt(in, ',', 2);
234 sx = cutItemToInt(in, ',', 3); 236 sx = cutItemToInt(in, ',', 3);
235 sy = cutItemToInt(in, ',', 4); 237 sy = cutItemToInt(in, ',', 4);
236 238
237 if (!strcmp(window_name, "menu")) 239 if (!strcmp(window_name, "main")) {
238 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] image: %s\n", fname);
239 else
240 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] image: %s %d,%d\n", fname, x, y); 240 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] image: %s %d,%d\n", fname, x, y);
241 241
242 if (!strcmp(window_name, "main")) {
243 skin->main.x = x; 242 skin->main.x = x;
244 skin->main.y = y; 243 skin->main.y = y;
245 skin->main.type = itBase; 244 skin->main.type = itBase;
246 245
247 av_strlcpy(tmp, path, sizeof(tmp)); 246 av_strlcpy(tmp, path, sizeof(tmp));
262 skin->main.Mask.Image = NULL; 261 skin->main.Mask.Image = NULL;
263 #endif 262 #endif
264 } 263 }
265 264
266 if (!strcmp(window_name, "sub")) { 265 if (!strcmp(window_name, "sub")) {
266 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] image: %s %d,%d\n", fname, x, y);
267
267 skin->sub.type = itBase; 268 skin->sub.type = itBase;
268 269
269 av_strlcpy(tmp, path, sizeof(tmp)); 270 av_strlcpy(tmp, path, sizeof(tmp));
270 av_strlcat(tmp, fname, sizeof(tmp)); 271 av_strlcat(tmp, fname, sizeof(tmp));
271 272
284 285
285 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] bitmap: %dx%d\n", skin->sub.width, skin->sub.height); 286 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] bitmap: %dx%d\n", skin->sub.width, skin->sub.height);
286 } 287 }
287 288
288 if (!strcmp(window_name, "menu")) { 289 if (!strcmp(window_name, "menu")) {
290 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] image: %s\n", fname);
291
289 skin->menuIsPresent = 1; 292 skin->menuIsPresent = 1;
290 skin->menuBase.type = itBase; 293 skin->menuBase.type = itBase;
291 294
292 av_strlcpy(tmp, path, sizeof(tmp)); 295 av_strlcpy(tmp, path, sizeof(tmp));
293 av_strlcat(tmp, fname, sizeof(tmp)); 296 av_strlcat(tmp, fname, sizeof(tmp));
307 skin->menuBase.Mask.Image = NULL; 310 skin->menuBase.Mask.Image = NULL;
308 #endif 311 #endif
309 } 312 }
310 313
311 if (!strcmp(window_name, "playbar")) { 314 if (!strcmp(window_name, "playbar")) {
315 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] image: %s %d,%d\n", fname, x, y);
316
312 skin->barIsPresent = 1; 317 skin->barIsPresent = 1;
313 skin->bar.x = x; 318 skin->bar.x = x;
314 skin->bar.y = y; 319 skin->bar.y = y;
315 skin->bar.type = itBase; 320 skin->bar.type = itBase;
316 321