March 2011 - MPlayer-cvslog - lists.mplayerhq.hu

r32777 - in trunk: DOCS/man/en/mplayer.1 help/help_mp-cs.h help/help_mp-de.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help/help_mp-it.h help/help_mp-pl.h help/help_mp...
by cboesch 18 Jun '11

18 Jun '11

Author: cboesch Date: Mon Jan 10 20:18:51 2011 New Revision: 32777 Log: Add size based support for -endpos in MPlayer. Modified: trunk/mplayer.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-en.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-pl.h trunk/help/help_mp-ru.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/mplayer.c Mon Jan 10 20:18:51 2011 (r32777) @@ -3654,11 +3654,6 @@ if (seek_to_sec) { end_at.pos += seek_to_sec; } -if (end_at.type == END_AT_SIZE) { - mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_MPEndposNoSizeBased); - end_at.type = END_AT_NONE; -} - #ifdef CONFIG_DVDNAV mp_dvdnav_context_free(mpctx); if (mpctx->stream->type == STREAMTYPE_DVDNAV) { @@ -3702,7 +3697,8 @@ if(!mpctx->sh_video) { if(!quiet) print_status(a_pos, 0, 0); - if(end_at.type == END_AT_TIME && end_at.pos < a_pos) + if(end_at.type == END_AT_TIME && end_at.pos < a_pos || + end_at.type == END_AT_SIZE && end_at.pos < stream_tell(mpctx->stream)) mpctx->eof = PT_NEXT_ENTRY; update_subtitles(NULL, a_pos, mpctx->d_sub, 0); update_osd_msg(); @@ -3810,10 +3806,9 @@ if(auto_quality>0){ if (play_n_frames <= 0) mpctx->eof = PT_NEXT_ENTRY; } - -// FIXME: add size based support for -endpos - if (end_at.type == END_AT_TIME && - !frame_time_remaining && end_at.pos <= mpctx->sh_video->pts) + if (!frame_time_remaining && + ((end_at.type == END_AT_TIME && mpctx->sh_video->pts >= end_at.pos) || + (end_at.type == END_AT_SIZE && stream_tell(mpctx->stream) >= end_at.pos))) mpctx->eof = PT_NEXT_ENTRY; } // end if(mpctx->sh_video)

4 9

r33168 - trunk/gui/skin/skin.c
by ib 01 Apr '11

01 Apr '11

Author: ib Date: Thu Mar 31 12:56:42 2011 New Revision: 33168 Log: (Almost entirely) cosmetic: Use more appropriate variable names. The new names make code more intelligible. In setname() path is now completely received from skinfname. Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Thu Mar 31 12:13:47 2011 (r33167) +++ trunk/gui/skin/skin.c Thu Mar 31 12:56:42 2011 (r33168) @@ -851,41 +851,41 @@ static _item skinItem[] = { { "menu", cmd_menu } }; -static char *setname(char *item1, char *item2) +static char *setname(char *dir, char *sname) { - static char fn[512]; + static char skinfname[512]; - av_strlcpy(fn, item1, sizeof(fn)); - av_strlcat(fn, "/", sizeof(fn)); - av_strlcat(fn, item2, sizeof(fn)); - av_strlcpy(path, fn, sizeof(path)); - av_strlcat(path, "/", sizeof(path)); - av_strlcat(fn, "/skin", sizeof(fn)); + av_strlcpy(skinfname, dir, sizeof(skinfname)); + av_strlcat(skinfname, "/", sizeof(skinfname)); + av_strlcat(skinfname, sname, sizeof(skinfname)); + av_strlcat(skinfname, "/", sizeof(skinfname)); + av_strlcpy(path, skinfname, sizeof(path)); + av_strlcat(skinfname, "skin", sizeof(skinfname)); - return fn; + return skinfname; } -int skinRead(char *dname) +int skinRead(char *sname) { - char *fn; + char *skinfname; FILE *skinFile; - unsigned char tmp[256]; + unsigned char line[256]; unsigned char item[32]; unsigned char param[256]; unsigned int i; - fn = setname(skinDirInHome, dname); + skinfname = setname(skinDirInHome, sname); - if ((skinFile = fopen(fn, "rt")) == NULL) { - fn = setname(skinMPlayerDir, dname); + if ((skinFile = fopen(skinfname, "rt")) == NULL) { + skinfname = setname(skinMPlayerDir, sname); - if ((skinFile = fopen(fn, "rt")) == NULL) { - mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_SkinFileNotFound, fn); + if ((skinFile = fopen(skinfname, "rt")) == NULL) { + mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_SkinFileNotFound, skinfname); return -1; } } - mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] configuration file: %s\n", fn); + mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] configuration file: %s\n", skinfname); appFreeStruct(); @@ -893,19 +893,19 @@ int skinRead(char *dname) currWinName[0] = 0; linenumber = 0; - while (fgets(tmp, sizeof(tmp), skinFile)) { + while (fgets(line, sizeof(line), skinFile)) { linenumber++; - tmp[strcspn(tmp, "\n\r")] = 0; // remove any kind of newline, if any - strswap(tmp, '\t', ' '); - trim(tmp); - decomment(tmp); + line[strcspn(line, "\n\r")] = 0; // remove any kind of newline, if any + strswap(line, '\t', ' '); + trim(line); + decomment(line); - if (!*tmp) + if (!*line) continue; - cutItem(tmp, item, '=', 0); - cutItem(tmp, param, '=', 1); + cutItem(line, item, '=', 0); + cutItem(line, param, '=', 1); strlower(item); for (i = 0; i < FF_ARRAY_ELEMS(skinItem); i++) { @@ -924,7 +924,7 @@ int skinRead(char *dname) } if (linenumber == 0) { - mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_SkinFileNotReadable, fn); + mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_SkinFileNotReadable, skinfname); return -1; }

2 1

r33171 - in trunk/gui: app.c app.h mplayer/menu.c mplayer/play.c skin/skin.c
by ib 31 Mar '11

31 Mar '11

Author: ib Date: Thu Mar 31 14:25:32 2011 New Revision: 33171 Log: Cosmetic: Rename menuBase menu. The new name corresponds better to the names of the other wItems and statements using it are more intelligible. Modified: trunk/gui/app.c trunk/gui/app.h trunk/gui/mplayer/menu.c trunk/gui/mplayer/play.c trunk/gui/skin/skin.c Modified: trunk/gui/app.c ============================================================================== --- trunk/gui/app.c Thu Mar 31 14:03:54 2011 (r33170) +++ trunk/gui/app.c Thu Mar 31 14:25:32 2011 (r33171) @@ -106,7 +106,7 @@ void appFreeStruct(void) appClearItem(&appMPlayer.bar); appMPlayer.barIsPresent = 0; - appClearItem(&appMPlayer.menuBase); + appClearItem(&appMPlayer.menu); appClearItem(&appMPlayer.menuSelected); appMPlayer.menuIsPresent = 0; Modified: trunk/gui/app.h ============================================================================== --- trunk/gui/app.h Thu Mar 31 14:03:54 2011 (r33170) +++ trunk/gui/app.h Thu Mar 31 14:25:32 2011 (r33171) @@ -175,7 +175,7 @@ typedef struct { wsTWindow barWindow; int barIsPresent; - wItem menuBase; + wItem menu; wItem menuSelected; wsTWindow menuWindow; int menuIsPresent; Modified: trunk/gui/mplayer/menu.c ============================================================================== --- trunk/gui/mplayer/menu.c Thu Mar 31 14:03:54 2011 (r33170) +++ trunk/gui/mplayer/menu.c Thu Mar 31 14:25:32 2011 (r33171) @@ -41,12 +41,12 @@ static void mplMenuDraw( void ) uint32_t * drw = NULL; int x,y,tmp; - if ( !appMPlayer.menuIsPresent || !appMPlayer.menuBase.Bitmap.Image ) return; + if ( !appMPlayer.menuIsPresent || !appMPlayer.menu.Bitmap.Image ) return; if ( !mplMenuRender && !appMPlayer.menuWindow.Visible ) return; if ( mplMenuRender || mplMenuItem != mplOldMenuItem ) { - memcpy( mplMenuDrawBuffer,appMPlayer.menuBase.Bitmap.Image,appMPlayer.menuBase.Bitmap.ImageSize ); + memcpy( mplMenuDrawBuffer,appMPlayer.menu.Bitmap.Image,appMPlayer.menu.Bitmap.ImageSize ); // --- if ( mplMenuItem != -1 ) { @@ -56,12 +56,12 @@ static void mplMenuDraw( void ) for ( x=appMPlayer.menuItems[ mplMenuItem ].x; x < appMPlayer.menuItems[ mplMenuItem ].x + appMPlayer.menuItems[ mplMenuItem ].width; x++ ) { tmp=drw[ y * appMPlayer.menuSelected.width + x ]; - if ( tmp != 0x00ff00ff ) buf[ y * appMPlayer.menuBase.width + x ]=tmp; + if ( tmp != 0x00ff00ff ) buf[ y * appMPlayer.menu.width + x ]=tmp; } } mplOldMenuItem=mplMenuItem; // --- - wsConvert( &appMPlayer.menuWindow,mplMenuDrawBuffer,appMPlayer.menuBase.Bitmap.ImageSize ); + wsConvert( &appMPlayer.menuWindow,mplMenuDrawBuffer,appMPlayer.menu.Bitmap.ImageSize ); mplMenuRender=0; } wsPutImage( &appMPlayer.menuWindow ); @@ -71,12 +71,12 @@ void mplMenuMouseHandle( int X,int Y,int { int x,y,i; - if ( !appMPlayer.menuBase.Bitmap.Image ) return; + if ( !appMPlayer.menu.Bitmap.Image ) return; mplMenuItem=-1; x=RX - appMPlayer.menuWindow.X; y=RY - appMPlayer.menuWindow.Y; - if ( ( x < 0 ) || ( y < 0 ) || ( x > appMPlayer.menuBase.width ) || ( y > appMPlayer.menuBase.height ) ) + if ( ( x < 0 ) || ( y < 0 ) || ( x > appMPlayer.menu.width ) || ( y > appMPlayer.menu.height ) ) { wsPostRedisplay( &appMPlayer.menuWindow ); return; @@ -95,7 +95,7 @@ void mplShowMenu( int mx,int my ) { int x,y; - if ( !appMPlayer.menuIsPresent || !appMPlayer.menuBase.Bitmap.Image ) return; + if ( !appMPlayer.menuIsPresent || !appMPlayer.menu.Bitmap.Image ) return; x=mx; if ( x + appMPlayer.menuWindow.Width > wsMaxX ) x=wsMaxX - appMPlayer.menuWindow.Width - 1 + wsOrgX; @@ -118,7 +118,7 @@ void mplHideMenu( int mx,int my,int w ) { int x,y,i=mplMenuItem; - if ( !appMPlayer.menuIsPresent || !appMPlayer.menuBase.Bitmap.Image ) return; + if ( !appMPlayer.menuIsPresent || !appMPlayer.menu.Bitmap.Image ) return; x=mx-mplMenuX; y=my-mplMenuY; @@ -143,12 +143,12 @@ void mplHideMenu( int mx,int my,int w ) void mplMenuInit( void ) { - if ( mplMenuIsInitialized || !appMPlayer.menuIsPresent || !appMPlayer.menuBase.Bitmap.Image ) return; + if ( mplMenuIsInitialized || !appMPlayer.menuIsPresent || !appMPlayer.menu.Bitmap.Image ) return; - appMPlayer.menuBase.x=0; - appMPlayer.menuBase.y=0; + appMPlayer.menu.x=0; + appMPlayer.menu.y=0; - if ( ( mplMenuDrawBuffer = calloc( 1,appMPlayer.menuBase.Bitmap.ImageSize ) ) == NULL ) + if ( ( mplMenuDrawBuffer = calloc( 1,appMPlayer.menu.Bitmap.ImageSize ) ) == NULL ) { #ifdef DEBUG mp_msg( MSGT_GPLAYER,MSGL_DBG2,MSGTR_NEMFMR ); @@ -158,10 +158,10 @@ void mplMenuInit( void ) } wsCreateWindow( &appMPlayer.menuWindow, - appMPlayer.menuBase.x,appMPlayer.menuBase.y,appMPlayer.menuBase.width,appMPlayer.menuBase.height, + appMPlayer.menu.x,appMPlayer.menu.y,appMPlayer.menu.width,appMPlayer.menu.height, wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsOverredirect|wsHideFrame|wsMaxSize|wsMinSize|wsHideWindow,"MPlayer menu" ); - wsSetShape( &appMPlayer.menuWindow,appMPlayer.menuBase.Mask.Image ); + wsSetShape( &appMPlayer.menuWindow,appMPlayer.menu.Mask.Image ); #ifdef DEBUG mp_msg( MSGT_GPLAYER,MSGL_DBG2,"menu: 0x%x\n",(int)appMPlayer.menuWindow.WindowID ); Modified: trunk/gui/mplayer/play.c ============================================================================== --- trunk/gui/mplayer/play.c Thu Mar 31 14:03:54 2011 (r33170) +++ trunk/gui/mplayer/play.c Thu Mar 31 14:25:32 2011 (r33171) @@ -214,16 +214,16 @@ void ChangeSkin(char *name) if (prev && appMPlayer.menuIsPresent) { free(mplMenuDrawBuffer); - mplMenuDrawBuffer = calloc(1, appMPlayer.menuBase.Bitmap.ImageSize); + mplMenuDrawBuffer = calloc(1, appMPlayer.menu.Bitmap.ImageSize); if (!mplMenuDrawBuffer) { mp_msg(MSGT_GPLAYER, MSGL_STATUS, MSGTR_NEMDB); return; } - wsResizeWindow(&appMPlayer.menuWindow, appMPlayer.menuBase.width, appMPlayer.menuBase.height); - wsResizeImage(&appMPlayer.menuWindow, appMPlayer.menuBase.width, appMPlayer.menuBase.height); - wsSetShape(&appMPlayer.menuWindow, appMPlayer.menuBase.Mask.Image); + wsResizeWindow(&appMPlayer.menuWindow, appMPlayer.menu.width, appMPlayer.menu.height); + wsResizeImage(&appMPlayer.menuWindow, appMPlayer.menu.width, appMPlayer.menu.height); + wsSetShape(&appMPlayer.menuWindow, appMPlayer.menu.Mask.Image); wsVisibleWindow(&appMPlayer.menuWindow, wsHideWindow); } else mplMenuInit(); Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Thu Mar 31 14:03:54 2011 (r33170) +++ trunk/gui/skin/skin.c Thu Mar 31 14:25:32 2011 (r33171) @@ -194,7 +194,7 @@ static int cmd_window(char *in) currWinItemIdx = &appMPlayer.IndexOfBarItems; currWinItems = appMPlayer.barItems; } else if (strcmp(in, "menu") == 0) { - currWin = &appMPlayer.menuBase; + currWin = &appMPlayer.menu; currWinItemIdx = &appMPlayer.IndexOfMenuItems; currWinItems = appMPlayer.menuItems; } else { @@ -280,24 +280,24 @@ static int cmd_base(char *in) mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] image: %s\n", fname); skin->menuIsPresent = 1; - skin->menuBase.type = itBase; + skin->menu.type = itBase; av_strlcpy(tmp, path, sizeof(tmp)); av_strlcat(tmp, fname, sizeof(tmp)); - if (skinBPRead(tmp, &skin->menuBase.Bitmap) != 0) + if (skinBPRead(tmp, &skin->menu.Bitmap) != 0) return 1; - skin->menuBase.width = skin->menuBase.Bitmap.Width; - skin->menuBase.height = skin->menuBase.Bitmap.Height; + skin->menu.width = skin->menu.Bitmap.Width; + skin->menu.height = skin->menu.Bitmap.Height; - mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] bitmap: %dx%d\n", skin->menuBase.width, skin->menuBase.height); + mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] bitmap: %dx%d\n", skin->menu.width, skin->menu.height); #ifdef CONFIG_XSHAPE - Convert32to1(&skin->menuBase.Bitmap, &skin->menuBase.Mask, 0x00ff00ff); - mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] mask: %lux%lu\n", skin->menuBase.Mask.Width, skin->menuBase.Mask.Height); + Convert32to1(&skin->menu.Bitmap, &skin->menu.Mask, 0x00ff00ff); + mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] mask: %lux%lu\n", skin->menu.Mask.Width, skin->menu.Mask.Height); #else - skin->menuBase.Mask.Image = NULL; + skin->menu.Mask.Image = NULL; #endif }

1 0

r33170 - trunk/gui/skin/skin.c
by ib 31 Mar '11

31 Mar '11

Author: ib Date: Thu Mar 31 14:03:54 2011 New Revision: 33170 Log: Clean up cmd_window(). Assign currWinName only after it has been checked. Compare window name in full. Add currWinItemIdx and currWinItems assignments for sub windows. Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Thu Mar 31 13:38:30 2011 (r33169) +++ trunk/gui/skin/skin.c Thu Mar 31 14:03:54 2011 (r33170) @@ -179,19 +179,21 @@ static int cmd_window(char *in) return 1; } - av_strlcpy(currWinName, strlower(in), sizeof(currWinName)); + strlower(in); - if (!strncmp(in, "main", 4)) { + if (strcmp(in, "main") == 0) { currWin = &appMPlayer.main; currWinItemIdx = &appMPlayer.IndexOfMainItems; currWinItems = appMPlayer.mainItems; - } else if (!strncmp(in, "sub", 3)) + } else if (strcmp(in, "sub") == 0) { currWin = &appMPlayer.sub; - else if (!strncmp(in, "playbar", 7)) { + currWinItemIdx = NULL; + currWinItems = NULL; + } else if (strcmp(in, "playbar") == 0) { currWin = &appMPlayer.bar; currWinItemIdx = &appMPlayer.IndexOfBarItems; currWinItems = appMPlayer.barItems; - } else if (!strncmp(in, "menu", 4)) { + } else if (strcmp(in, "menu") == 0) { currWin = &appMPlayer.menuBase; currWinItemIdx = &appMPlayer.IndexOfMenuItems; currWinItems = appMPlayer.menuItems; @@ -200,6 +202,8 @@ static int cmd_window(char *in) return 1; } + av_strlcpy(currWinName, in, sizeof(currWinName)); + mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] window: %s\n", currWinName); return 0;

1 0

r33169 - trunk/gui/skin/font.c
by ib 31 Mar '11

31 Mar '11

Author: ib Date: Thu Mar 31 13:38:30 2011 New Revision: 33169 Log: Cosmetic: Use more appropriate variable names. The new names make code more intelligible. Modified: trunk/gui/skin/font.c Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Thu Mar 31 12:56:42 2011 (r33168) +++ trunk/gui/skin/font.c Thu Mar 31 13:38:30 2011 (r33169) @@ -75,8 +75,8 @@ void fntFreeFont(void) int fntRead(char *path, char *fname) { FILE *f; - unsigned char tmp[512]; - unsigned char command[32]; + unsigned char buf[512]; + unsigned char item[32]; unsigned char param[256]; int id, n, i; @@ -85,41 +85,41 @@ int fntRead(char *path, char *fname) if (id < 0) return id; - av_strlcpy(tmp, path, sizeof(tmp)); - av_strlcat(tmp, fname, sizeof(tmp)); - av_strlcat(tmp, ".fnt", sizeof(tmp)); - f = fopen(tmp, "rt"); + av_strlcpy(buf, path, sizeof(buf)); + av_strlcat(buf, fname, sizeof(buf)); + av_strlcat(buf, ".fnt", sizeof(buf)); + f = fopen(buf, "rt"); if (!f) { gfree((void **)&Fonts[id]); return -3; } - while (fgets(tmp, sizeof(tmp), f)) { - tmp[strcspn(tmp, "\n\r")] = 0; // remove any kind of newline, if any - strswap(tmp, '\t', ' '); - trim(tmp); - decomment(tmp); + while (fgets(buf, sizeof(buf), f)) { + buf[strcspn(buf, "\n\r")] = 0; // remove any kind of newline, if any + strswap(buf, '\t', ' '); + trim(buf); + decomment(buf); - if (!*tmp) + if (!*buf) continue; - n = (strncmp(tmp, "\"=", 2) == 0 ? 1 : 0); - cutItem(tmp, command, '=', n); - cutItem(tmp, param, '=', n + 1); + n = (strncmp(buf, "\"=", 2) == 0 ? 1 : 0); + cutItem(buf, item, '=', n); + cutItem(buf, param, '=', n + 1); - if (command[0] == '"') { - if (!command[1]) - command[0] = '='; - else if (command[1] == '"') - command[1] = 0; + if (item[0] == '"') { + if (!item[1]) + item[0] = '='; + else if (item[1] == '"') + item[1] = 0; else - cutItem(command, command, '"', 1); + cutItem(item, item, '"', 1); - if (command[0] & 0x80) { + if (item[0] & 0x80) { for (i = 0; i < EXTRA_CHRS; i++) { if (!Fonts[id]->nonASCIIidx[i][0]) { - strncpy(Fonts[id]->nonASCIIidx[i], command, UTF8LENGTH); + strncpy(Fonts[id]->nonASCIIidx[i], item, UTF8LENGTH); break; } } @@ -129,28 +129,28 @@ int fntRead(char *path, char *fname) i += ASCII_CHRS; } else - i = command[0]; + i = item[0]; - cutItem(param, tmp, ',', 0); - Fonts[id]->Fnt[i].x = atoi(tmp); + cutItem(param, buf, ',', 0); + Fonts[id]->Fnt[i].x = atoi(buf); - cutItem(param, tmp, ',', 1); - Fonts[id]->Fnt[i].y = atoi(tmp); + cutItem(param, buf, ',', 1); + Fonts[id]->Fnt[i].y = atoi(buf); - cutItem(param, tmp, ',', 2); - Fonts[id]->Fnt[i].sx = atoi(tmp); + cutItem(param, buf, ',', 2); + Fonts[id]->Fnt[i].sx = atoi(buf); - cutItem(param, tmp, ',', 3); - Fonts[id]->Fnt[i].sy = atoi(tmp); + 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", command, Fonts[id]->Fnt[i].x, Fonts[id]->Fnt[i].y, Fonts[id]->Fnt[i].sx, Fonts[id]->Fnt[i].sy); - } else if (!strcmp(command, "image")) { - av_strlcpy(tmp, path, sizeof(tmp)); - av_strlcat(tmp, param, sizeof(tmp)); + 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); + } 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", tmp); + mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[font] image file: %s\n", buf); - if (skinBPRead(tmp, &Fonts[id]->Bitmap) != 0) { + if (skinBPRead(buf, &Fonts[id]->Bitmap) != 0) { bpFree(&Fonts[id]->Bitmap); gfree((void **)&Fonts[id]); fclose(f);

1 0

r33167 - in trunk: DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml gui/util/string.c
by ib 31 Mar '11

31 Mar '11

Author: ib Date: Thu Mar 31 12:13:47 2011 New Revision: 33167 Log: Allow number sign as comment character. This is practice in some skins and should not lead to an error message now that unknown items are reported. Update documentation. Modified: trunk/gui/util/string.c Changes in other areas also in this revision: Modified: trunk/DOCS/xml/de/skin.xml trunk/DOCS/xml/en/skin.xml Modified: trunk/gui/util/string.c ============================================================================== --- trunk/gui/util/string.c Thu Mar 31 11:38:03 2011 (r33166) +++ trunk/gui/util/string.c Thu Mar 31 12:13:47 2011 (r33167) @@ -75,6 +75,9 @@ char *decomment(char *in) p = in; + if (*p == '#') + *p = 0; + while (*p) { if (*p == '"') nap = !nap;

1 0

r33166 - trunk/gui/skin/skin.c
by ib 31 Mar '11

31 Mar '11

Author: ib Date: Thu Mar 31 11:38:03 2011 New Revision: 33166 Log: Cosmetic: Adjust indent. Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Thu Mar 31 11:37:12 2011 (r33165) +++ trunk/gui/skin/skin.c Thu Mar 31 11:38:03 2011 (r33166) @@ -891,7 +891,7 @@ int skinRead(char *dname) skin = NULL; currWinName[0] = 0; - linenumber = 0; + linenumber = 0; while (fgets(tmp, sizeof(tmp), skinFile)) { linenumber++;

1 0

r33165 - trunk/gui/skin/skin.c
by ib 31 Mar '11

31 Mar '11

Author: ib Date: Thu Mar 31 11:37:12 2011 New Revision: 33165 Log: Reset skin pointer and window name. After freeing the guiItems structure, these internal variables must be reset, too. Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Thu Mar 31 11:09:54 2011 (r33164) +++ trunk/gui/skin/skin.c Thu Mar 31 11:37:12 2011 (r33165) @@ -889,6 +889,8 @@ int skinRead(char *dname) appFreeStruct(); + skin = NULL; + currWinName[0] = 0; linenumber = 0; while (fgets(tmp, sizeof(tmp), skinFile)) {

1 0

r33164 - in trunk: gui/skin/skin.c help/help_mp-de.h help/help_mp-en.h
by ib 31 Mar '11

31 Mar '11

Author: ib Date: Thu Mar 31 11:09:54 2011 New Revision: 33164 Log: Add a check for unknown items. Issue error message in case of an unknown skin item. Modified: trunk/gui/skin/skin.c Changes in other areas also in this revision: Modified: trunk/help/help_mp-de.h trunk/help/help_mp-en.h Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Thu Mar 31 11:03:53 2011 (r33163) +++ trunk/gui/skin/skin.c Thu Mar 31 11:09:54 2011 (r33164) @@ -914,6 +914,11 @@ int skinRead(char *dname) break; } } + + if (i == FF_ARRAY_ELEMS(skinItem)) { + skin_error(MSGTR_SKIN_UNKNOWN_ITEM, item); + return -2; + } } if (linenumber == 0) {

1 0

r33163 - trunk/gui/skin/skin.c
by ib 31 Mar '11

31 Mar '11

Author: ib Date: Thu Mar 31 11:03:53 2011 New Revision: 33163 Log: Leave loop after item function has been found and called. Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Thu Mar 31 10:56:52 2011 (r33162) +++ trunk/gui/skin/skin.c Thu Mar 31 11:03:53 2011 (r33163) @@ -906,10 +906,14 @@ int skinRead(char *dname) cutItem(tmp, param, '=', 1); strlower(item); - for (i = 0; i < FF_ARRAY_ELEMS(skinItem); i++) - if (!strcmp(item, skinItem[i].name)) + for (i = 0; i < FF_ARRAY_ELEMS(skinItem); i++) { + if (!strcmp(item, skinItem[i].name)) { if (skinItem[i].func(param) != 0) return -2; + else + break; + } + } } if (linenumber == 0) {

1 0