April 2014 - MPlayer-cvslog - lists.mplayerhq.hu

r37129 - trunk/osdep/getch2.c
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 20:10:31 2014 New Revision: 37129 Log: Fix handling of overlong termcap strings entries. The previous code would silently truncate and then read out of bounds later in a memcmp. Modified: trunk/osdep/getch2.c Modified: trunk/osdep/getch2.c ============================================================================== --- trunk/osdep/getch2.c Sun Apr 6 19:57:33 2014 (r37128) +++ trunk/osdep/getch2.c Sun Apr 6 20:10:31 2014 (r37129) @@ -100,7 +100,12 @@ char *p=tgetstr(id,&term_p); if(!p) return; if(getch2_key_db>=MAX_KEYS) return; getch2_keys[getch2_key_db].len=strlen(p); - strncpy(getch2_keys[getch2_key_db].chars,p,8); + if (getch2_keys[getch2_key_db].len >= sizeof(getch2_keys[getch2_key_db].chars)) + { + printf("Key string entry more than 7 characters, ignoring\n"); + return; + } + strcpy(getch2_keys[getch2_key_db].chars,p); getch2_keys[getch2_key_db].code=code; ++getch2_key_db; /* printf("%s=%s\n",id,p); */

1 0

r37128 - trunk/libmenu/vf_menu.c
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 19:57:33 2014 New Revision: 37128 Log: vf_menu: try to make code more straight-forward. Modified: trunk/libmenu/vf_menu.c Modified: trunk/libmenu/vf_menu.c ============================================================================== --- trunk/libmenu/vf_menu.c Sun Apr 6 19:56:13 2014 (r37127) +++ trunk/libmenu/vf_menu.c Sun Apr 6 19:57:33 2014 (r37128) @@ -103,16 +103,14 @@ static int cmd_filter(mp_cmd_t* cmd, int return 1; } case MP_CMD_SET_MENU : { - char* menu = cmd->args[0].v.s; - menu_t* l = priv->current; - priv->current = menu_open(menu); - if(!priv->current) { - mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_FailedToOpenMenu,menu); - priv->current = l; - priv->current->show = 0; + const char *menu = cmd->args[0].v.s; + menu_t *new = menu_open(menu); + priv->current->show = new != NULL; + if (new) { + new->parent = priv->current; + priv->current = new; } else { - priv->current->show = 1; - priv->current->parent = l; + mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_FailedToOpenMenu,menu); } return 1; }

1 0

r37127 - in trunk/libmenu: menu.c menu.h
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 19:56:13 2014 New Revision: 37127 Log: menu: Add a few "const" to string arguments. Modified: trunk/libmenu/menu.c trunk/libmenu/menu.h Modified: trunk/libmenu/menu.c ============================================================================== --- trunk/libmenu/menu.c Sun Apr 6 19:17:42 2014 (r37126) +++ trunk/libmenu/menu.c Sun Apr 6 19:56:13 2014 (r37127) @@ -230,7 +230,7 @@ static int menu_parse_config(char* buffe #define BUF_STEP 1024 #define BUF_MIN 128 #define BUF_MAX BUF_STEP*1024 -int menu_init(struct MPContext *mpctx, char* cfg_file) { +int menu_init(struct MPContext *mpctx, const char* cfg_file) { char* buffer = NULL; int bl = BUF_STEP, br = 0; int f = 0, fd = -1; @@ -313,7 +313,7 @@ int menu_dflt_read_key(menu_t* menu,int return 0; } -menu_t* menu_open(char *name) { +menu_t* menu_open(const char *name) { menu_t* m; int i; Modified: trunk/libmenu/menu.h ============================================================================== --- trunk/libmenu/menu.h Sun Apr 6 19:17:42 2014 (r37126) +++ trunk/libmenu/menu.h Sun Apr 6 19:56:13 2014 (r37127) @@ -82,11 +82,11 @@ typedef struct menu_info_s { #define MENU_CMD_CLICK 11 /// Global init/uninit -int menu_init(struct MPContext *mpctx, char* cfg_file); +int menu_init(struct MPContext *mpctx, const char* cfg_file); void menu_uninit(void); /// Open a menu defined in the config file -menu_t* menu_open(char *name); +menu_t* menu_open(const char *name); void menu_draw(menu_t* menu,mp_image_t* mpi); void menu_read_cmd(menu_t* menu,int cmd);

1 0

r37126 - trunk/TOOLS/coverity.sh
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 19:17:42 2014 New Revision: 37126 Log: Add example/current default Coverity compile options. Suggestions for improvements welcome. Modified: trunk/TOOLS/coverity.sh Modified: trunk/TOOLS/coverity.sh ============================================================================== --- trunk/TOOLS/coverity.sh Sun Apr 6 16:28:12 2014 (r37125) +++ trunk/TOOLS/coverity.sh Sun Apr 6 19:17:42 2014 (r37126) @@ -1,3 +1,4 @@ +MPLAYER_COV_OPTS="--enable-xvmc --enable-menu --enable-gui --enable-mga --enable-bl --enable-joystick --enable-radio --enable-s3fb --enable-tdfxfb --enable-tdfxvid --enable-wii --yasm=nasm" rm -rf cov-int MPlayer.tgz make distclean svn up

1 0

r37125 - trunk/configure
by iive 06 Apr '14

06 Apr '14

Author: iive Date: Sun Apr 6 16:28:12 2014 New Revision: 37125 Log: Add support for synopsys design-ware ARC processors. Patch by Wayne Ren <Wei.Ren at synopsys com>. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Apr 4 15:55:57 2014 (r37124) +++ trunk/configure Sun Apr 6 16:28:12 2014 (r37125) @@ -2649,6 +2649,10 @@ EOF generic) arch='generic' ;; + arc) + arch='arc' + iproc='arc' + ;; *) echo "The architecture of your CPU ($host_arch) is not supported by this configure script"

1 0

r37124 - trunk/gui/skin/skin.c
by ib 04 Apr '14

04 Apr '14

Author: ib Date: Fri Apr 4 15:55:57 2014 New Revision: 37124 Log: Make the current item string as currItem global. Utilize this variable instead of using string constants. This allows naming the particular potmeter now. Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Fri Apr 4 15:16:53 2014 (r37123) +++ trunk/gui/skin/skin.c Fri Apr 4 15:55:57 2014 (r37124) @@ -49,6 +49,7 @@ char *skinDirInData; static guiItems *skin; static int linenumber; +static unsigned char currItem[32]; static unsigned char path[512]; static unsigned char currWinName[32]; @@ -182,7 +183,7 @@ static guiItem *next_item(void) static int item_section(char *in) { if (skin) { - skin_error(MSGTR_GUI_MSG_SkinErrorItem, "section"); + skin_error(MSGTR_GUI_MSG_SkinErrorItem, currItem); return 1; } @@ -193,7 +194,7 @@ static int item_section(char *in) return 1; } - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] section: %s\n", in); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %s: %s\n", currItem, in); return 0; } @@ -221,10 +222,10 @@ static int item_end(char *in) name = "section"; } - if (!section_item("end")) + if (!section_item(currItem)) return 1; - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %send (%s)\n", space, name); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %s%s (%s)\n", space, currItem, name); if (currWinName[0]) { currWinName[0] = 0; @@ -248,11 +249,11 @@ static int item_end(char *in) */ static int item_window(char *in) { - if (!section_item("window")) + if (!section_item(currItem)) return 1; if (currWinName[0]) { - skin_error(MSGTR_GUI_MSG_SkinErrorItem, "window"); + skin_error(MSGTR_GUI_MSG_SkinErrorItem, currItem); return 1; } @@ -287,7 +288,7 @@ static int item_window(char *in) av_strlcpy(currWinName, in, sizeof(currWinName)); - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] window: %s\n", currWinName); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %s: %s\n", currItem, currWinName); return 0; } @@ -309,7 +310,7 @@ static int item_base(char *in) int w = 0, h = 0; int is_video, is_bar, is_menu; - if (!window_item("base")) + if (!window_item(currItem)) return 1; is_video = (strcmp(currWinName, "video") == 0); @@ -388,7 +389,7 @@ static int item_base(char *in) */ static int item_background(char *in) { - if (!window_item("background")) + if (!window_item(currItem)) return 1; if (in_window("main")) @@ -402,7 +403,7 @@ static int item_background(char *in) currWin->G = cutInt(in, ',', 1); currWin->B = cutInt(in, ',', 2); - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] background color: #%02x%02x%02x\n", currWin->R, currWin->G, currWin->B); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %s color: #%02x%02x%02x\n", currItem, currWin->R, currWin->G, currWin->B); return 0; } @@ -424,7 +425,7 @@ static int item_button(char *in) char msg[32]; guiItem *item; - if (!window_item("button")) + if (!window_item(currItem)) return 1; if (in_window("video")) @@ -449,7 +450,7 @@ static int item_button(char *in) else skin_legacy("evSetURL", msg); - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] button image: %s %d,%d\n", fname, x, y); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %s image: %s %d,%d\n", currItem, 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); @@ -496,9 +497,9 @@ static int item_button(char *in) static int item_selected(char *in) { unsigned char file[512]; - guiItem *currItem; + guiItem *item; - if (!window_item("selected")) + if (!window_item(currItem)) return 1; if (in_window("main")) @@ -508,21 +509,21 @@ static int item_selected(char *in) if (in_window("playbar")) return 1; - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] image selected: %s\n", in); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] image %s: %s\n", currItem, in); - currItem = &skin->menuSelected; - currItem->type = itBase; + item = &skin->menuSelected; + item->type = itBase; av_strlcpy(file, path, sizeof(file)); av_strlcat(file, in, sizeof(file)); - if (skinImageRead(file, &currItem->Bitmap) != 0) + if (skinImageRead(file, &item->Bitmap) != 0) return 1; - currItem->width = currItem->Bitmap.Width; - currItem->height = currItem->Bitmap.Height; + item->width = item->Bitmap.Width; + item->height = item->Bitmap.Height; - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] bitmap: %dx%d\n", currItem->width, currItem->height); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] bitmap: %dx%d\n", item->width, item->height); return 0; } @@ -542,7 +543,7 @@ static int item_menu(char *in) char msg[32]; guiItem *item; - if (!window_item("menu")) + if (!window_item(currItem)) return 1; if (in_window("main")) @@ -605,7 +606,7 @@ static int parse_potmeter(guiItem *item, unsigned char buf[512]; int bwidth, bheight, num, d, x, y, w, h, message; - if (!window_item("h/v potmeter")) + if (!window_item(currItem)) return 1; if (in_window("video")) @@ -640,7 +641,7 @@ static int parse_potmeter(guiItem *item, else skin_legacy("evSetURL", buf); - 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] %s image: %s %d,%d %dx%d\n", currItem, phfname, x, y, w, h); mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] button image: %s %dx%d\n", bfname, bwidth, bheight); mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] numphases: %d, default: %d%%\n", num, d); mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", buf, message); @@ -670,7 +671,7 @@ static int parse_potmeter(guiItem *item, if (skinImageRead(buf, &item->Bitmap) != 0) return 1; - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] (potmeter bitmap: %ux%u)\n", item->Bitmap.Width, item->Bitmap.Height); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] (%s bitmap: %ux%u)\n", currItem, item->Bitmap.Width, item->Bitmap.Height); } item->Mask.Image = NULL; @@ -750,7 +751,7 @@ static int item_potmeter(char *in) char param[256]; // legacy - skin_legacy("potmeter", "hpotmeter"); + skin_legacy(currItem, "hpotmeter"); snprintf(param, sizeof(param), "NULL,0,0,%s", in); @@ -773,7 +774,7 @@ static int item_pimage(char *in) int num, d, x, y, w, h, message; guiItem *item; - if (!window_item("pimage")) + if (!window_item(currItem)) return 1; if (in_window("video")) @@ -805,7 +806,7 @@ static int item_pimage(char *in) else skin_legacy("evSetURL", buf); - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] pimage image: %s %d,%d %dx%d\n", phfname, x, y, w, h); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %s image: %s %d,%d %dx%d\n", currItem, phfname, x, y, w, h); mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] numphases: %d, default: %d%%\n", num, d); mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", buf, message); @@ -856,7 +857,7 @@ static int item_font(char *in) { char fnt[256]; - if (!window_item("font")) + if (!window_item(currItem)) return 1; if (in_window("video")) @@ -887,7 +888,7 @@ static int item_font(char *in) return 1; } - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] font: %s (#%d)\n", fnt, fntFindID(fnt)); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %s: %s (#%d)\n", currItem, fnt, fntFindID(fnt)); return 0; } @@ -908,7 +909,7 @@ static int item_slabel(char *in) char txt[256]; guiItem *item; - if (!window_item("slabel")) + if (!window_item(currItem)) return 1; if (in_window("video")) @@ -922,7 +923,7 @@ static int item_slabel(char *in) cutStr(in, txt, ',', 3); cutStr(txt, txt, '"', 1); - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] slabel: \"%s\"\n", txt); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %s: \"%s\"\n", currItem, txt); mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] pos: %d,%d\n", x, y); id = fntFindID(fnt); @@ -971,7 +972,7 @@ static int item_dlabel(char *in) char txt[256]; guiItem *item; - if (!window_item("dlabel")) + if (!window_item(currItem)) return 1; if (in_window("video")) @@ -990,7 +991,7 @@ static int item_dlabel(char *in) // legacy skin_legacy("$l", txt); - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] dlabel: \"%s\"\n", txt); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %s: \"%s\"\n", currItem, 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); @@ -1036,7 +1037,7 @@ static int item_dlabel(char *in) */ static int item_decoration(char *in) { - if (!window_item("decoration")) + if (!window_item(currItem)) return 1; if (in_window("video")) @@ -1055,7 +1056,7 @@ static int item_decoration(char *in) skin->mainDecoration = (strcmp(in, "enable") == 0); - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] decoration: %s\n", in); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %s: %s\n", currItem, in); return 0; } @@ -1151,7 +1152,6 @@ int skinRead(char *sname) char *skinfname; FILE *skinfile; unsigned char line[256]; - unsigned char item[32]; unsigned char param[256]; unsigned int i; @@ -1184,12 +1184,12 @@ int skinRead(char *sname) if (!*line) continue; - cutStr(line, item, '=', 0); + cutStr(line, currItem, '=', 0); cutStr(line, param, '=', 1); - strlower(item); + strlower(currItem); for (i = 0; i < FF_ARRAY_ELEMS(skinItem); i++) { - if (!strcmp(item, skinItem[i].name)) { + if (!strcmp(currItem, skinItem[i].name)) { if (skinItem[i].func(param) != 0) { fclose(skinfile); return -2; @@ -1199,7 +1199,7 @@ int skinRead(char *sname) } if (i == FF_ARRAY_ELEMS(skinItem)) { - skin_error(MSGTR_GUI_MSG_SkinUnknownItem, item); + skin_error(MSGTR_GUI_MSG_SkinUnknownItem, currItem); fclose(skinfile); return -2; }

1 0

r37123 - trunk/gui/skin/skin.c
by ib 04 Apr '14

04 Apr '14

Author: ib Date: Fri Apr 4 15:16:53 2014 New Revision: 37123 Log: Don't use item_hpotmeter() for vpotmeter parsing. Add a new function parse_potmeter() as a common parser for all potmeters. Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Thu Apr 3 13:30:53 2014 (r37122) +++ trunk/gui/skin/skin.c Fri Apr 4 15:16:53 2014 (r37123) @@ -589,21 +589,21 @@ static int item_menu(char *in) } /** - * @brief Parse a @a hpotmeter definition. + * @brief Parse a hpotmeter or vpotmeter definition. * - * Syntax: hpotmeter=button,bwidth,bheight,phases,numphases,default,x,y,width,height,message + * Parameters: button,bwidth,bheight,phases,numphases,default,x,y,width,height,message * + * @param item pointer to item to store the parameters in * @param in definition to be analyzed * * @return 0 (ok) or 1 (error) */ -static int item_hpotmeter(char *in) +static int parse_potmeter(guiItem *item, char *in) { unsigned char bfname[256]; unsigned char phfname[256]; unsigned char buf[512]; int bwidth, bheight, num, d, x, y, w, h, message; - guiItem *item; if (!window_item("h/v potmeter")) return 1; @@ -645,12 +645,6 @@ static int item_hpotmeter(char *in) mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] numphases: %d, default: %d%%\n", num, d); mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", buf, message); - item = next_item(); - - if (!item) - return 1; - - item->type = itHPotmeter; item->x = x; item->y = y; item->width = w; @@ -695,6 +689,29 @@ static int item_hpotmeter(char *in) } /** + * @brief Parse a @a hpotmeter definition. + * + * Syntax: hpotmeter=button,bwidth,bheight,phases,numphases,default,x,y,width,height,message + * + * @param in definition to be analyzed + * + * @return 0 (ok) or 1 (error) + */ +static int item_hpotmeter(char *in) +{ + guiItem *item; + + item = next_item(); + + if (!item) + return 1; + + item->type = itHPotmeter; + + return parse_potmeter(item, in); +} + +/** * @brief Parse a @a vpotmeter definition. * * Syntax: vpotmeter=button,bwidth,bheight,phases,numphases,default,x,y,width,height,message @@ -705,17 +722,16 @@ static int item_hpotmeter(char *in) */ static int item_vpotmeter(char *in) { - int r; guiItem *item; - r = item_hpotmeter(in); + item = next_item(); - if (r == 0) { - item = &currWinItems[*currWinItemIdx]; - item->type = itVPotmeter; - } + if (!item) + return 1; - return r; + item->type = itVPotmeter; + + return parse_potmeter(item, in); } /**

1 0

r37122 - in trunk/gui: app/app.c ui/main.c ui/playbar.c util/misc.c util/misc.h
by ib 03 Apr '14

03 Apr '14

Author: ib Date: Thu Apr 3 13:30:53 2014 New Revision: 37122 Log: Constrain an item's value to be in the range of 0 to 100. Add function contrain() and replace checking the bounds by it. Add it for mouse wheeling, too, where it has been missing so far. Modified: trunk/gui/app/app.c trunk/gui/ui/main.c trunk/gui/ui/playbar.c trunk/gui/util/misc.c trunk/gui/util/misc.h Modified: trunk/gui/app/app.c ============================================================================== --- trunk/gui/app/app.c Thu Apr 3 12:16:01 2014 (r37121) +++ trunk/gui/app/app.c Thu Apr 3 13:30:53 2014 (r37122) @@ -24,6 +24,7 @@ #include "app.h" #include "gui.h" #include "gui/skin/font.h" +#include "gui/util/misc.h" #include "libavutil/common.h" @@ -190,25 +191,13 @@ void btnModify(int event, float value) for (i = 0; i <= guiApp.IndexOfMainItems; i++) if (guiApp.mainItems[i].message == event) - if (hasValue(guiApp.mainItems[i])) { - if (value < 0.0f) - value = 0.0f; - if (value > 100.0f) - value = 100.0f; - - guiApp.mainItems[i].value = value; - } + if (hasValue(guiApp.mainItems[i])) + guiApp.mainItems[i].value = constrain(value); for (i = 0; i <= guiApp.IndexOfPlaybarItems; i++) if (guiApp.playbarItems[i].message == event) - if (hasValue(guiApp.playbarItems[i])) { - if (value < 0.0f) - value = 0.0f; - if (value > 100.0f) - value = 100.0f; - - guiApp.playbarItems[i].value = value; - } + if (hasValue(guiApp.playbarItems[i])) + guiApp.playbarItems[i].value = constrain(value); } /** Modified: trunk/gui/ui/main.c ============================================================================== --- trunk/gui/ui/main.c Thu Apr 3 12:16:01 2014 (r37121) +++ trunk/gui/ui/main.c Thu Apr 3 13:30:53 2014 (r37122) @@ -32,6 +32,7 @@ #include "gui/skin/skin.h" #include "gui/util/list.h" #include "gui/util/mem.h" +#include "gui/util/misc.h" #include "gui/util/string.h" #include "gui/wm/ws.h" #include "gui/wm/wsxdnd.h" @@ -171,7 +172,7 @@ rollerhandled: item=&guiApp.mainItems[currentselected]; if ( ( item->type == itHPotmeter )||( item->type == itVPotmeter ) ) { - item->value+=value; + item->value=constrain(item->value + value); uiEvent( item->message,item->value ); } } @@ -189,13 +190,12 @@ rollerhandled: if (guiApp.menuIsPresent) guiApp.menuWindow.MouseHandler( 0,RX,RY,0,0 ); break; case itVPotmeter: - item->value=100.0 - 100.0 * ( Y - item->y ) / item->height; + value=100.0 - 100.0 * ( Y - item->y ) / item->height; goto potihandled; case itHPotmeter: - item->value=100.0 * ( X - item->x ) / item->width; + value=100.0 * ( X - item->x ) / item->width; potihandled: - if ( item->value > 100.0f ) item->value=100.0f; - if ( item->value < 0.0f ) item->value=0.0f; + item->value=constrain(value); uiEvent( item->message,item->value ); break; } Modified: trunk/gui/ui/playbar.c ============================================================================== --- trunk/gui/ui/playbar.c Thu Apr 3 12:16:01 2014 (r37121) +++ trunk/gui/ui/playbar.c Thu Apr 3 13:30:53 2014 (r37122) @@ -30,6 +30,7 @@ #include "gui/skin/font.h" #include "gui/skin/skin.h" #include "gui/util/mem.h" +#include "gui/util/misc.h" #include "gui/wm/ws.h" #include "help_mp.h" @@ -196,7 +197,7 @@ rollerhandled: item=&guiApp.playbarItems[currentselected]; if ( ( item->type == itHPotmeter )||( item->type == itVPotmeter ) ) { - item->value+=value; + item->value=constrain(item->value + value); uiEvent( item->message,item->value ); } } @@ -210,13 +211,12 @@ rollerhandled: if (guiApp.menuIsPresent) guiApp.menuWindow.MouseHandler( 0,RX,RY,0,0 ); break; case itVPotmeter: - item->value=100.0 - 100.0 * ( Y - item->y ) / item->height; + value=100.0 - 100.0 * ( Y - item->y ) / item->height; goto potihandled; case itHPotmeter: - item->value=100.0 * ( X - item->x ) / item->width; + value=100.0 * ( X - item->x ) / item->width; potihandled: - if ( item->value > 100.0f ) item->value=100.0f; - if ( item->value < 0.0f ) item->value=0.0f; + item->value=constrain(value); uiEvent( item->message,item->value ); break; } Modified: trunk/gui/util/misc.c ============================================================================== --- trunk/gui/util/misc.c Thu Apr 3 12:16:01 2014 (r37121) +++ trunk/gui/util/misc.c Thu Apr 3 13:30:53 2014 (r37122) @@ -47,3 +47,20 @@ char *fgetstr(char *str, int size, FILE return s; } + +/** + * @brief Constrain a @a value to be in the range of 0 to 100. + * + * @param value value to be checked + * + * @return a value in the range of 0 to 100 + */ +float constrain(float value) +{ + if (value < 0.0f) + return 0.0f; + if (value > 100.0f) + return 100.0f; + + return value; +} Modified: trunk/gui/util/misc.h ============================================================================== --- trunk/gui/util/misc.h Thu Apr 3 12:16:01 2014 (r37121) +++ trunk/gui/util/misc.h Thu Apr 3 13:30:53 2014 (r37122) @@ -21,6 +21,7 @@ #include <stdio.h> +float constrain(float value); char *fgetstr(char *str, int size, FILE *file); #endif /* MPLAYER_GUI_MISC_H */

1 0

r37121 - in trunk: gui/skin/skin.c help/help_mp-de.h help/help_mp-en.h
by ib 03 Apr '14

03 Apr '14

Author: ib Date: Thu Apr 3 12:16:01 2014 New Revision: 37121 Log: Check potmeter and pimage default value in skin configuration file. The value has to be in the range of 0 to 100. 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 Apr 3 11:47:41 2014 (r37120) +++ trunk/gui/skin/skin.c Thu Apr 3 12:16:01 2014 (r37121) @@ -625,6 +625,11 @@ static int item_hpotmeter(char *in) h = cutInt(in, ',', 9); cutStr(in, buf, ',', 10); + if (d < 0 || d > 100) { + skin_error(MSGTR_GUI_MSG_SkinErrorDefault, d); + return 1; + } + message = appFindMessage(buf); if (message == -1) { @@ -769,6 +774,11 @@ static int item_pimage(char *in) h = cutInt(in, ',', 6); cutStr(in, buf, ',', 7); + if (d < 0 || d > 100) { + skin_error(MSGTR_GUI_MSG_SkinErrorDefault, d); + return 1; + } + message = appFindMessage(buf); if (message == -1) {

1 0

r37120 - in trunk: Makefile gui/app/cfg.c gui/skin/font.c gui/skin/skin.c gui/util/misc.c gui/util/misc.h gui/util/string.c gui/util/string.h
by ib 03 Apr '14

03 Apr '14

Author: ib Date: Thu Apr 3 11:47:41 2014 New Revision: 37120 Log: Add a file for miscellaneous auxiliary functions. Move fgetstr() from string.c there. Added: trunk/gui/util/misc.c trunk/gui/util/misc.h Modified: trunk/Makefile trunk/gui/app/cfg.c trunk/gui/skin/font.c trunk/gui/skin/skin.c trunk/gui/util/string.c trunk/gui/util/string.h Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Thu Apr 3 09:55:12 2014 (r37119) +++ trunk/Makefile Thu Apr 3 11:47:41 2014 (r37120) @@ -523,6 +523,7 @@ SRCS_MPLAYER-$(GUI_GTK) += gui/app/ gui/ui/playbar.c \ gui/ui/render.c \ gui/ui/video.c \ + gui/util/misc.c \ gui/wm/ws.c \ gui/wm/wsxdnd.c \ Modified: trunk/gui/app/cfg.c ============================================================================== --- trunk/gui/app/cfg.c Thu Apr 3 09:55:12 2014 (r37119) +++ trunk/gui/app/cfg.c Thu Apr 3 11:47:41 2014 (r37120) @@ -24,6 +24,7 @@ #include "gui.h" #include "gui/interface.h" #include "gui/util/list.h" +#include "gui/util/misc.h" #include "gui/util/string.h" #include "config.h" Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Thu Apr 3 09:55:12 2014 (r37119) +++ trunk/gui/skin/font.c Thu Apr 3 11:47:41 2014 (r37120) @@ -29,6 +29,7 @@ #include "font.h" #include "skin.h" #include "gui/util/mem.h" +#include "gui/util/misc.h" #include "gui/util/string.h" #include "mp_msg.h" Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Thu Apr 3 09:55:12 2014 (r37119) +++ trunk/gui/skin/skin.c Thu Apr 3 11:47:41 2014 (r37120) @@ -30,6 +30,7 @@ #include "gui/app/app.h" #include "gui/app/gui.h" #include "gui/dialog/dialog.h" +#include "gui/util/misc.h" #include "gui/util/string.h" #include "help_mp.h" Added: trunk/gui/util/misc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/util/misc.c Thu Apr 3 11:47:41 2014 (r37120) @@ -0,0 +1,49 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/** + * @file + * @brief Miscellaneous utilities + */ + +#include <string.h> + +#include "misc.h" + +/** + * @brief Read characters from @a file. + * + * @param str pointer to a buffer to receive the read characters + * @param size number of characters read at the most (including a terminating null-character) + * @param file file to read from + * + * @return str (success) or NULL (error) + * + * @note Reading stops with an end-of-line character or at end of file. + */ +char *fgetstr(char *str, int size, FILE *file) +{ + char *s; + + s = fgets(str, size, file); + + if (s) + s[strcspn(s, "\n\r")] = 0; + + return s; +} Added: trunk/gui/util/misc.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/util/misc.h Thu Apr 3 11:47:41 2014 (r37120) @@ -0,0 +1,26 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_GUI_MISC_H +#define MPLAYER_GUI_MISC_H + +#include <stdio.h> + +char *fgetstr(char *str, int size, FILE *file); + +#endif /* MPLAYER_GUI_MISC_H */ Modified: trunk/gui/util/string.c ============================================================================== --- trunk/gui/util/string.c Thu Apr 3 09:55:12 2014 (r37119) +++ trunk/gui/util/string.c Thu Apr 3 11:47:41 2014 (r37120) @@ -21,6 +21,7 @@ * @brief String utilities */ +#include <stdio.h> #include <stdlib.h> #include <string.h> @@ -317,26 +318,3 @@ void setddup(char **old, const char *dir if (*old) sprintf(*old, "%s/%s", dir, name); } - -/** - * @brief Read characters from @a file. - * - * @param str pointer to a buffer to receive the read characters - * @param size number of characters read at the most (including a terminating null-character) - * @param file file to read from - * - * @return str (success) or NULL (error) - * - * @note Reading stops with an end-of-line character or at end of file. - */ -char *fgetstr(char *str, int size, FILE *file) -{ - char *s; - - s = fgets(str, size, file); - - if (s) - s[strcspn(s, "\n\r")] = 0; - - return s; -} Modified: trunk/gui/util/string.h ============================================================================== --- trunk/gui/util/string.h Thu Apr 3 09:55:12 2014 (r37119) +++ trunk/gui/util/string.h Thu Apr 3 11:47:41 2014 (r37120) @@ -20,7 +20,6 @@ #define MPLAYER_GUI_STRING_H #include <stddef.h> -#include <stdio.h> /** * @brief Wraps #cutString(): @@ -32,7 +31,6 @@ int cutInt(char *in, char sep, int num); void cutString(char *in, char *out, char sep, int num, size_t maxout); char *decomment(char *in); -char *fgetstr(char *str, int size, FILE *file); char *gstrchr(const char *str, int c); int gstrcmp(const char *a, const char *b); char *gstrdup(const char *str);

1 0