[MPlayer-cvslog] r34073 - in trunk/gui: cfg.c interface.c skin/font.c skin/skin.c util/bitmap.c wm/ws.c
ib
subversion at mplayerhq.hu
Tue Sep 6 17:28:53 CEST 2011
Author: ib
Date: Tue Sep 6 17:28:53 2011
New Revision: 34073
Log:
Replace all mp_dbg() calls by mp_msg().
These messages are useful to track down error causes and should
be available even in a non-debug version of the GUI.
Additionally, remove #ifdef MP_DEBUG which isn't longer needed
in skin.c now.
Modified:
trunk/gui/cfg.c
trunk/gui/interface.c
trunk/gui/skin/font.c
trunk/gui/skin/skin.c
trunk/gui/util/bitmap.c
trunk/gui/wm/ws.c
Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c Tue Sep 6 17:10:01 2011 (r34072)
+++ trunk/gui/cfg.c Tue Sep 6 17:28:53 2011 (r34073)
@@ -274,7 +274,7 @@ int cfg_read(void)
cfg = get_path("gui.conf");
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[cfg] file: %s\n", cfg);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[cfg] file: %s\n", cfg);
gui_conf = m_config_new();
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Tue Sep 6 17:10:01 2011 (r34072)
+++ trunk/gui/interface.c Tue Sep 6 17:28:53 2011 (r34073)
@@ -104,8 +104,8 @@ void guiInit(void)
skinDirInHome = get_path("skins");
skinMPlayerDir = MPLAYER_DATADIR "/skins";
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #1: %s\n", skinDirInHome);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #2: %s\n", skinMPlayerDir);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #1: %s\n", skinDirInHome);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #2: %s\n", skinMPlayerDir);
if (!skinName)
skinName = strdup("default");
@@ -175,9 +175,9 @@ void guiInit(void)
wsSetShape(&guiApp.mainWindow, guiApp.main.Mask.Image);
wsXDNDMakeAwareness(&guiApp.mainWindow);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] screen depth: %d\n", wsDepthOnScreen);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] mainWindow ID: 0x%x\n", (int)guiApp.mainWindow.WindowID);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] subWindow ID: 0x%x\n", (int)guiApp.subWindow.WindowID);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] screen depth: %d\n", wsDepthOnScreen);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] mainWindow ID: 0x%x\n", (int)guiApp.mainWindow.WindowID);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] subWindow ID: 0x%x\n", (int)guiApp.subWindow.WindowID);
guiApp.mainWindow.ReDraw = (void *)uiMainDraw;
guiApp.mainWindow.MouseHandler = uiMainMouseHandle;
@@ -372,7 +372,7 @@ int gui(int what, void *data)
case GUI_RUN_COMMAND:
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] GUI_RUN_COMMAND: %d\n", (int)data);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] GUI_RUN_COMMAND: %d\n", (int)data);
switch ((int)data) {
case MP_CMD_VO_FULLSCREEN:
@@ -840,7 +840,7 @@ static int import_file_into_gui(char *te
else
pathname[strlen(pathname) - strlen(filename)] = 0;
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] playtree, add: %s/%s\n", pathname, filename);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] playtree, add: %s/%s\n", pathname, filename);
item = calloc(1, sizeof(plItem));
Modified: trunk/gui/skin/font.c
==============================================================================
--- trunk/gui/skin/font.c Tue Sep 6 17:10:01 2011 (r34072)
+++ trunk/gui/skin/font.c Tue Sep 6 17:28:53 2011 (r34073)
@@ -173,12 +173,12 @@ int fntRead(char *path, char *fname)
cutItem(param, buf, ',', 3);
Fonts[id]->Fnt[i].sy = atoi(buf);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[font] char: '%s' params: %d,%d %dx%d\n", item, Fonts[id]->Fnt[i].x, Fonts[id]->Fnt[i].y, Fonts[id]->Fnt[i].sx, Fonts[id]->Fnt[i].sy);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[font] char: '%s' params: %d,%d %dx%d\n", item, Fonts[id]->Fnt[i].x, Fonts[id]->Fnt[i].y, Fonts[id]->Fnt[i].sx, Fonts[id]->Fnt[i].sy);
} else if (!strcmp(item, "image")) {
av_strlcpy(buf, path, sizeof(buf));
av_strlcat(buf, param, sizeof(buf));
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[font] image file: %s\n", buf);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[font] image file: %s\n", buf);
if (skinImageRead(buf, &Fonts[id]->Bitmap) != 0) {
bpFree(&Fonts[id]->Bitmap);
Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c Tue Sep 6 17:10:01 2011 (r34072)
+++ trunk/gui/skin/skin.c Tue Sep 6 17:28:53 2011 (r34073)
@@ -199,7 +199,7 @@ static int item_section(char *in)
return 1;
}
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] section: %s\n", in);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] section: %s\n", in);
return 0;
}
@@ -217,7 +217,8 @@ static int item_end(char *in)
{
char *space, *name;
-#ifdef MP_DEBUG
+ (void)in;
+
if (currWinName[0]) {
space = " ";
name = currWinName;
@@ -225,14 +226,11 @@ static int item_end(char *in)
space = "";
name = "section";
}
-#endif
-
- (void)in;
if (!section_item("end"))
return 1;
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %send (%s)\n", space, name);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %send (%s)\n", space, name);
if (currWinName[0]) {
currWinName[0] = 0;
@@ -289,7 +287,7 @@ static int item_window(char *in)
av_strlcpy(currWinName, in, sizeof(currWinName));
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] window: %s\n", currWinName);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] window: %s\n", currWinName);
return 0;
}
@@ -324,7 +322,7 @@ static int item_base(char *in)
w = cutItemToInt(in, ',', 3);
h = cutItemToInt(in, ',', 4);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] image: %s", fname);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] image: %s", fname);
currWin->type = itBase;
@@ -332,10 +330,10 @@ static int item_base(char *in)
currWin->x = x;
currWin->y = y;
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, " %d,%d", x, y);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, " %d,%d", x, y);
}
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "\n");
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "\n");
av_strlcpy(file, path, sizeof(file));
av_strlcat(file, fname, sizeof(file));
@@ -353,7 +351,7 @@ static int item_base(char *in)
}
}
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] bitmap: %dx%d\n", currWin->width, currWin->height);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] bitmap: %dx%d\n", currWin->width, currWin->height);
if (!is_sub) {
#ifdef CONFIG_XSHAPE
@@ -361,7 +359,7 @@ static int item_base(char *in)
skin_error(MSGTR_SKIN_NotEnoughMemory);
return 1;
}
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] mask: %lux%lu\n", currWin->Mask.Width, currWin->Mask.Height);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] mask: %lux%lu\n", currWin->Mask.Width, currWin->Mask.Height);
#else
currWin->Mask.Image = NULL;
#endif
@@ -400,7 +398,7 @@ static int item_background(char *in)
currWin->G = cutItemToInt(in, ',', 1);
currWin->B = cutItemToInt(in, ',', 2);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] background color: #%02x%02x%02x\n", currWin->R, currWin->G, currWin->B);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] background color: #%02x%02x%02x\n", currWin->R, currWin->G, currWin->B);
return 0;
}
@@ -444,9 +442,9 @@ static int item_button(char *in)
return 1;
}
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] button image: %s %d,%d\n", fname, x, y);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", msg, message);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] size: %dx%d\n", w, h);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] button image: %s %d,%d\n", fname, x, y);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", msg, message);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] size: %dx%d\n", w, h);
item = next_item();
@@ -473,7 +471,7 @@ static int item_button(char *in)
if (skinImageRead(file, &item->Bitmap) != 0)
return 1;
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] (bitmap: %lux%lu)\n", item->Bitmap.Width, item->Bitmap.Height);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] (bitmap: %lux%lu)\n", item->Bitmap.Width, item->Bitmap.Height);
}
return 0;
@@ -503,7 +501,7 @@ static int item_selected(char *in)
if (in_window("playbar"))
return 1;
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] image selected: %s\n", in);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] image selected: %s\n", in);
currItem = &skin->menuSelected;
currItem->type = itBase;
@@ -517,7 +515,7 @@ static int item_selected(char *in)
currItem->width = currItem->Bitmap.Width;
currItem->height = currItem->Bitmap.Height;
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] bitmap: %dx%d\n", currItem->width, currItem->height);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] bitmap: %dx%d\n", currItem->width, currItem->height);
return 0;
}
@@ -572,8 +570,8 @@ static int item_menu(char *in)
item->height = h;
item->message = message;
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] item #%d: %d,%d %dx%d\n", *currWinItemIdx, x, y, w, h);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", msg, message);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] item #%d: %d,%d %dx%d\n", *currWinItemIdx, x, y, w, h);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", msg, message);
item->Bitmap.Image = NULL;
@@ -624,10 +622,10 @@ static int item_hpotmeter(char *in)
return 1;
}
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] h/v potmeter image: %s %d,%d %dx%d\n", phfname, x, y, w, h);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] button image: %s %dx%d\n", pfname, pwidth, pheight);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] numphases: %d, default: %d%%\n", ph, d);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", buf, message);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] h/v potmeter image: %s %d,%d %dx%d\n", phfname, x, y, w, h);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] button image: %s %dx%d\n", pfname, pwidth, pheight);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] numphases: %d, default: %d%%\n", ph, d);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", buf, message);
item = next_item();
@@ -655,7 +653,7 @@ static int item_hpotmeter(char *in)
if (skinImageRead(buf, &item->Bitmap) != 0)
return 1;
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] (potmeter bitmap: %lux%lu)\n", item->Bitmap.Width, item->Bitmap.Height);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] (potmeter bitmap: %lux%lu)\n", item->Bitmap.Width, item->Bitmap.Height);
}
item->Mask.Image = NULL;
@@ -667,7 +665,7 @@ static int item_hpotmeter(char *in)
if (skinImageRead(buf, &item->Mask) != 0)
return 1;
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] (button bitmap: %lux%lu)\n", item->Mask.Width, item->Mask.Height);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] (button bitmap: %lux%lu)\n", item->Mask.Width, item->Mask.Height);
}
return 0;
@@ -737,9 +735,9 @@ static int item_potmeter(char *in)
return 1;
}
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] potmeter image: %s %d,%d %dx%d\n", phfname, x, y, w, h);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] numphases: %d, default: %d%%\n", ph, d);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", buf, message);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] potmeter image: %s %d,%d %dx%d\n", phfname, x, y, w, h);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] numphases: %d, default: %d%%\n", ph, d);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", buf, message);
item = next_item();
@@ -764,7 +762,7 @@ static int item_potmeter(char *in)
if (skinImageRead(buf, &item->Bitmap) != 0)
return 1;
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] (bitmap: %lux%lu)\n", item->Bitmap.Width, item->Bitmap.Height);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] (bitmap: %lux%lu)\n", item->Bitmap.Width, item->Bitmap.Height);
}
return 0;
@@ -811,7 +809,7 @@ static int item_font(char *in)
return 1;
}
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] font: %s (#%d)\n", fnt, fntFindID(fnt));
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] font: %s (#%d)\n", fnt, fntFindID(fnt));
return 0;
}
@@ -846,8 +844,8 @@ static int item_slabel(char *in)
cutItem(in, txt, ',', 3);
cutItem(txt, txt, '"', 1);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] slabel: \"%s\"\n", txt);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] pos: %d,%d\n", x, y);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] slabel: \"%s\"\n", txt);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] pos: %d,%d\n", x, y);
id = fntFindID(fnt);
@@ -856,7 +854,7 @@ static int item_slabel(char *in)
return 1;
}
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] font: %s (#%d)\n", fnt, id);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] font: %s (#%d)\n", fnt, id);
item = next_item();
@@ -911,9 +909,9 @@ static int item_dlabel(char *in)
cutItem(in, txt, ',', 5);
cutItem(txt, txt, '"', 1);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] dlabel: \"%s\"\n", txt);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] pos: %d,%d\n", x, y);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] width: %d, align: %d\n", w, a);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] dlabel: \"%s\"\n", txt);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] pos: %d,%d\n", x, y);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] width: %d, align: %d\n", w, a);
id = fntFindID(fnt);
@@ -922,7 +920,7 @@ static int item_dlabel(char *in)
return 1;
}
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] font: %s (#%d)\n", fnt, id);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] font: %s (#%d)\n", fnt, id);
item = next_item();
@@ -976,7 +974,7 @@ static int item_decoration(char *in)
skin->mainDecoration = (strcmp(in, "enable") == 0);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] decoration: %s\n", in);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] decoration: %s\n", in);
return 0;
}
@@ -1053,7 +1051,7 @@ int skinRead(char *sname)
}
}
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] configuration file: %s\n", skinfname);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] configuration file: %s\n", skinfname);
appFreeStruct();
Modified: trunk/gui/util/bitmap.c
==============================================================================
--- trunk/gui/util/bitmap.c Tue Sep 6 17:10:01 2011 (r34072)
+++ trunk/gui/util/bitmap.c Tue Sep 6 17:28:53 2011 (r34073)
@@ -130,9 +130,9 @@ static int pngRead(const char *fname, gu
bpl = img->Width * (img->Bpp / 8);
img->ImageSize = bpl * img->Height;
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] file: %s\n", fname);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] size: %lux%lu, color depth: %u\n", img->Width, img->Height, img->Bpp);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] image size: %lu\n", img->ImageSize);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] file: %s\n", fname);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] size: %lux%lu, color depth: %u\n", img->Width, img->Height, img->Bpp);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] image size: %lu\n", img->ImageSize);
img->Image = malloc(img->ImageSize);
@@ -173,11 +173,11 @@ static int Convert24to32(guiImage *img)
if (!img->Image) {
free(orgImage);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] not enough memory: %lu\n", img->ImageSize);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] not enough memory: %lu\n", img->ImageSize);
return 0;
}
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] 32 bpp conversion size: %lu\n", img->ImageSize);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] 32 bpp conversion size: %lu\n", img->ImageSize);
for (c = 0, i = 0; c < img->ImageSize; c += 4, i += 3)
*(uint32_t *)&img->Image[c] = ALPHA_OPAQUE | AV_RB24(&orgImage[i]);
@@ -235,12 +235,12 @@ int bpRead(const char *fname, guiImage *
r = pngRead(fname, img);
if (r != 0) {
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] read error #%d: %s\n", r, fname);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] read error #%d: %s\n", r, fname);
return -5;
}
if (img->Bpp < 24) {
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] bpp too low: %u\n", img->Bpp);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] bpp too low: %u\n", img->Bpp);
return -1;
}
@@ -284,7 +284,7 @@ int bpRenderMask(const guiImage *in, gui
out->Image = calloc(1, out->ImageSize);
if (!out->Image) {
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] not enough memory: %lu\n", out->ImageSize);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] not enough memory: %lu\n", out->ImageSize);
return 0;
}
@@ -312,7 +312,7 @@ int bpRenderMask(const guiImage *in, gui
if (!shaped)
bpFree(out);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] 1 bpp conversion size: %lu\n", out->ImageSize);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] 1 bpp conversion size: %lu\n", out->ImageSize);
return 1;
}
Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c Tue Sep 6 17:10:01 2011 (r34072)
+++ trunk/gui/wm/ws.c Tue Sep 6 17:28:53 2011 (r34073)
@@ -225,7 +225,7 @@ void wsXInit(Display *mDisplay)
wsUseXShm = 0;
}
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[ws] display name: %s => %s display.\n", dispname, localdisp ? "local" : "REMOTE");
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] display name: %s => %s display.\n", dispname, localdisp ? "local" : "REMOTE");
if (!localdisp)
mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_WS_RemoteDisplay);
@@ -282,23 +282,23 @@ void wsXInit(Display *mDisplay)
wsGetDepthOnScreen();
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[ws] Screen depth: %d\n", wsDepthOnScreen);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[ws] size: %dx%d\n", wsMaxX, wsMaxY);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] Screen depth: %d\n", wsDepthOnScreen);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] size: %dx%d\n", wsMaxX, wsMaxY);
#ifdef CONFIG_XINERAMA
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[ws] origin: +%d+%d\n", wsOrgX, wsOrgY);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] origin: +%d+%d\n", wsOrgX, wsOrgY);
#endif
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[ws] red mask: 0x%x\n", wsRedMask);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[ws] green mask: 0x%x\n", wsGreenMask);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[ws] blue mask: 0x%x\n", wsBlueMask);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] red mask: 0x%x\n", wsRedMask);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] green mask: 0x%x\n", wsGreenMask);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] blue mask: 0x%x\n", wsBlueMask);
#ifdef MP_DEBUG
if (wsUseXShm) {
int minor, major, shp;
XShmQueryVersion(wsDisplay, &major, &minor, &shp);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[ws] XShm version is %d.%d\n", major, minor);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] XShm version is %d.%d\n", major, minor);
}
#ifdef CONFIG_XSHAPE
@@ -306,7 +306,7 @@ void wsXInit(Display *mDisplay)
int minor, major;
XShapeQueryVersion(wsDisplay, &major, &minor);
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[ws] XShape version is %d.%d\n", major, minor);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] XShape version is %d.%d\n", major, minor);
}
#endif
#endif
@@ -564,7 +564,7 @@ void wsCreateWindow(wsTWindow *win, int
win->Idle = NULL;
win->MouseHandler = NULL;
win->KeyHandler = NULL;
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[ws] window is created. ( %s ).\n", label);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] window is created. ( %s ).\n", label);
}
void wsDestroyWindow(wsTWindow *win)
@@ -1502,10 +1502,10 @@ void wsScreenSaverOff(Display *mDisplay)
if (onoff) {
Status stat;
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "Disabling DPMS.\n");
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "Disabling DPMS.\n");
dpms_disabled = 1;
stat = DPMSDisable(mDisplay); // monitor powersave off
- mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "stat: %d.\n", stat);
+ mp_msg(MSGT_GPLAYER, MSGL_DBG2, "stat: %d.\n", stat);
}
}
More information about the MPlayer-cvslog
mailing list