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

r37116 - in trunk/gui: app/app.h skin/skin.c ui/render.c
by ib 31 Mar '14

31 Mar '14

Author: ib Date: Mon Mar 31 11:44:52 2014 New Revision: 37116 Log: Rename guiItem's members pwidth and pheight. Add a 'b' to indicate that they refer to the potmeter button. Modified: trunk/gui/app/app.h trunk/gui/skin/skin.c trunk/gui/ui/render.c Modified: trunk/gui/app/app.h ============================================================================== --- trunk/gui/app/app.h Mon Mar 31 10:56:34 2014 (r37115) +++ trunk/gui/app/app.h Mon Mar 31 11:44:52 2014 (r37116) @@ -129,7 +129,7 @@ typedef struct { int align; char *label; - int pwidth, pheight; + int pbwidth, pbheight; int numphases; float value; Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Mon Mar 31 10:56:34 2014 (r37115) +++ trunk/gui/skin/skin.c Mon Mar 31 11:44:52 2014 (r37116) @@ -649,8 +649,8 @@ static int item_hpotmeter(char *in) item->y = y; item->width = w; item->height = h; - item->pwidth = bwidth; - item->pheight = bheight; + item->pbwidth = bwidth; + item->pbheight = bheight; item->numphases = num; item->value = (float)d; item->message = message; Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Mon Mar 31 10:56:34 2014 (r37115) +++ trunk/gui/ui/render.c Mon Mar 31 11:44:52 2014 (r37116) @@ -470,13 +470,13 @@ void RenderAll(wsWindow *window, guiItem case itHPotmeter: PutImage(item->x, item->y, db, dw, &item->Bitmap, item->numphases, (item->numphases - 1) * item->value / 100.0, True); - PutImage(item->x + (item->width - item->pwidth) * item->value / 100.0, item->y, db, dw, &item->Mask, 3, index, True); + PutImage(item->x + (item->width - item->pbwidth) * item->value / 100.0, item->y, db, dw, &item->Mask, 3, index, True); break; case itVPotmeter: PutImage(item->x, item->y, db, dw, &item->Bitmap, item->numphases, (item->numphases - 1) * item->value / 100.0, False); - PutImage(item->x, item->y + (item->height - item->pheight) * (1.0 - item->value / 100.0), db, dw, &item->Mask, 3, index, True); + PutImage(item->x, item->y + (item->height - item->pbheight) * (1.0 - item->value / 100.0), db, dw, &item->Mask, 3, index, True); break; case itSLabel:

1 0

r37115 - trunk/gui/win32/widgetrender.c
by ib 31 Mar '14

31 Mar '14

Author: ib Date: Mon Mar 31 10:56:34 2014 New Revision: 37115 Log: Make TranslateFilename() static. It only has file scope. This avoids a compiler warning. Modified: trunk/gui/win32/widgetrender.c Modified: trunk/gui/win32/widgetrender.c ============================================================================== --- trunk/gui/win32/widgetrender.c Mon Mar 31 10:40:53 2014 (r37114) +++ trunk/gui/win32/widgetrender.c Mon Mar 31 10:56:34 2014 (r37115) @@ -132,7 +132,7 @@ static void stringreplace(char *dest, co * * @return pointer to @a fname buffer */ -char *TranslateFilename (int how, char *fname, size_t maxlen) +static char *TranslateFilename (int how, char *fname, size_t maxlen) { char *p; size_t len;

1 0

r37114 - trunk/gui/win32/widgetrender.c
by ib 31 Mar '14

31 Mar '14

Author: ib Date: Mon Mar 31 10:40:53 2014 New Revision: 37114 Log: Fix some compilation errors in Win32 GUI. These have crept in by absent-minded copy and paste. Patch by Stephen Sheldon, sfsheldo gmail com. Modified: trunk/gui/win32/widgetrender.c Modified: trunk/gui/win32/widgetrender.c ============================================================================== --- trunk/gui/win32/widgetrender.c Sat Mar 29 15:30:40 2014 (r37113) +++ trunk/gui/win32/widgetrender.c Mon Mar 31 10:40:53 2014 (r37114) @@ -34,7 +34,7 @@ #include "access_mpcontext.h" #include "help_mp.h" #include "libavutil/avstring.h" -#include "stream/stream.h +#include "stream/stream.h" #define MAX_LABELSIZE 250 @@ -258,7 +258,7 @@ static char *generatetextfromlabel(widge if(guiInfo.AudioChannels == 0) stringreplace(text, "$a", "n"); else if(guiInfo.AudioChannels == 1) stringreplace(text, "$a", "m"); - else if(guiInfo.AudioChannels == 2) stringreplace(text, "$a", (guiInfo.AudioPassthrough ? : "r": "t")); + else if(guiInfo.AudioChannels == 2) stringreplace(text, "$a", (guiInfo.AudioPassthrough ? "r" : "t")); else stringreplace(text, "$a", "r"); if(guiInfo.StreamType == STREAMTYPE_FILE)

1 0

r37113 - trunk/gui/ui/render.c
by ib 29 Mar '14

29 Mar '14

Author: ib Date: Sat Mar 29 15:30:40 2014 New Revision: 37113 Log: Add doxygen comments. Modified: trunk/gui/ui/render.c Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Sat Mar 29 15:27:19 2014 (r37112) +++ trunk/gui/ui/render.c Sat Mar 29 15:30:40 2014 (r37113) @@ -16,6 +16,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/** + * @file + * @brief GUI rendering + */ + #include <stdint.h> #include <stdio.h> #include <stdlib.h> @@ -359,6 +364,19 @@ MMMM_SS: snprintf(trans, sizeof(t return translation; } +/** + * @brief Put a part of a #guiImage image into a (window's) draw buffer. + * + * @param x x position where to start in the draw buffer + * @param y y position where to start in the draw buffer + * @param drawbuf draw buffer where the image should be put in + * @param drawbuf_width width of the draw buffer + * @param img image (containing several phases, i.e. image parts) + * @param parts number of parts in the image + * @param index index of the part of the image to be drawn + * @param below flag indicating whether the image parts are arranged + * below each other or side by side + */ static void PutImage(int x, int y, uint32_t *drawbuf, int drawbuf_width, guiImage *img, int parts, int index, int below) { register int i, ic, yc; @@ -400,6 +418,15 @@ static void PutImage(int x, int y, uint3 } } +/** + * @brief Render all GUI items in a window, i.e. copy the respective images + * into the draw buffer. + * + * @param window pointer to a ws window structure of the window to be rendered + * @param items pointer to the array of items + * @param till maximum index in use for the @a items, i.e. number of last item in array + * @param drawbuf pointer to the @a window's draw buffer + */ void RenderAll(wsWindow *window, guiItem *items, int till, char *drawbuf) { uint32_t *db;

1 0

r37112 - trunk/gui/ui/render.c
by ib 29 Mar '14

29 Mar '14

Author: ib Date: Sat Mar 29 15:27:19 2014 New Revision: 37112 Log: Change comment into doxygen comment. Modified: trunk/gui/ui/render.c Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Sat Mar 29 15:23:55 2014 (r37111) +++ trunk/gui/ui/render.c Sat Mar 29 15:27:19 2014 (r37112) @@ -33,7 +33,11 @@ #include "osdep/timer.h" #include "stream/stream.h" -#define DLABEL_DELAY 2500 // in milliseconds +/** + * @brief Time in milliseconds a scrolling dlabel stops + * when reaching the left margin until scrolling starts over + */ +#define DLABEL_DELAY 2500 /** * @brief Convert #guiInfo member Filename.

1 0

r37111 - trunk/gui/ui/render.c
by ib 29 Mar '14

29 Mar '14

Author: ib Date: Sat Mar 29 15:23:55 2014 New Revision: 37111 Log: Cosmetic: Rename variable. This should make its purpose more obvious. Modified: trunk/gui/ui/render.c Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Sat Mar 29 15:21:45 2014 (r37110) +++ trunk/gui/ui/render.c Sat Mar 29 15:23:55 2014 (r37111) @@ -402,7 +402,7 @@ void RenderAll(wsWindow *window, guiItem guiItem *item; guiImage *image = NULL; int dw, i, index, x; - char *t; + char *trans; unsigned int d; db = (uint32_t *)drawbuf; @@ -462,12 +462,12 @@ void RenderAll(wsWindow *window, guiItem case itDLabel: - t = TranslateVariables(item->label); + trans = TranslateVariables(item->label); - if (!item->text || (strcmp(item->text, t) != 0)) { + if (!item->text || (strcmp(item->text, trans) != 0)) { free(item->text); - item->text = strdup(t); - item->textwidth = fntTextWidth(item->fontid, t); + item->text = strdup(trans); + item->textwidth = fntTextWidth(item->fontid, trans); item->starttime = GetTimerMS(); item->last_x = 0; } @@ -491,7 +491,7 @@ void RenderAll(wsWindow *window, guiItem } } - image = fntTextRender(item, x, t); + image = fntTextRender(item, x, trans); if (image) PutImage(item->x, item->y, db, dw, image, 1, 0, True);

1 0

r37110 - trunk/gui/ui/render.c
by ib 29 Mar '14

29 Mar '14

Author: ib Date: Sat Mar 29 15:21:45 2014 New Revision: 37110 Log: Simplify string termination. Modified: trunk/gui/ui/render.c Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Sat Mar 29 15:09:14 2014 (r37109) +++ trunk/gui/ui/render.c Sat Mar 29 15:21:45 2014 (r37110) @@ -483,7 +483,7 @@ void RenderAll(wsWindow *window, guiItem l = (item->textwidth ? item->textwidth : item->width); x = (l ? l - ((d - DLABEL_DELAY) / 20) % l - 1 : 0); c[0] = *item->text; - c[1] = '\0'; + c[1] = 0; if (x < (fntTextWidth(item->fontid, c) + 1) >> 1) { item->starttime = GetTimerMS(); // stop again

1 0

r37109 - trunk/gui/ui/render.c
by ib 29 Mar '14

29 Mar '14

Author: ib Date: Sat Mar 29 15:09:14 2014 New Revision: 37109 Log: Cosmetic: Add blank line and adjust indent. Modified: trunk/gui/ui/render.c Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Sat Mar 29 14:59:45 2014 (r37108) +++ trunk/gui/ui/render.c Sat Mar 29 15:09:14 2014 (r37109) @@ -461,6 +461,7 @@ void RenderAll(wsWindow *window, guiItem break; case itDLabel: + t = TranslateVariables(item->label); if (!item->text || (strcmp(item->text, t) != 0)) { @@ -474,7 +475,7 @@ void RenderAll(wsWindow *window, guiItem d = GetTimerMS() - item->starttime; if (d < DLABEL_DELAY) - x = item->last_x; // don't scroll yet + x = item->last_x; // don't scroll yet else { int l; char c[2]; @@ -485,8 +486,8 @@ void RenderAll(wsWindow *window, guiItem c[1] = '\0'; if (x < (fntTextWidth(item->fontid, c) + 1) >> 1) { - item->starttime = GetTimerMS(); // stop again - item->last_x = x; // at current x pos + item->starttime = GetTimerMS(); // stop again + item->last_x = x; // at current x pos } }

1 0

r37108 - trunk/gui/ui/render.c
by ib 29 Mar '14

29 Mar '14

Author: ib Date: Sat Mar 29 14:59:45 2014 New Revision: 37108 Log: Remove braces. As a result, move up variable declarations. Modified: trunk/gui/ui/render.c Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Sat Mar 29 14:49:26 2014 (r37107) +++ trunk/gui/ui/render.c Sat Mar 29 14:59:45 2014 (r37108) @@ -401,7 +401,9 @@ void RenderAll(wsWindow *window, guiItem uint32_t *db; guiItem *item; guiImage *image = NULL; - int dw, i, index; + int dw, i, index, x; + char *t; + unsigned int d; db = (uint32_t *)drawbuf; dw = window->Width; @@ -459,10 +461,7 @@ void RenderAll(wsWindow *window, guiItem break; case itDLabel: - { - int x; - unsigned int d; - char *t = TranslateVariables(item->label); + t = TranslateVariables(item->label); if (!item->text || (strcmp(item->text, t) != 0)) { free(item->text); @@ -492,7 +491,6 @@ void RenderAll(wsWindow *window, guiItem } image = fntTextRender(item, x, t); - } if (image) PutImage(item->x, item->y, db, dw, image, 1, 0, True);

1 0

r37107 - in trunk/gui/ui: render.c render.h
by ib 29 Mar '14

29 Mar '14

Author: ib Date: Sat Mar 29 14:49:26 2014 New Revision: 37107 Log: Rename parameter. It isn't the number of items but the last index in use. Rewrite the condition in order ro reflect this. Modified: trunk/gui/ui/render.c trunk/gui/ui/render.h Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Fri Mar 28 20:03:59 2014 (r37106) +++ trunk/gui/ui/render.c Sat Mar 29 14:49:26 2014 (r37107) @@ -396,7 +396,7 @@ static void PutImage(int x, int y, uint3 } } -void RenderAll(wsWindow *window, guiItem *items, int nrItems, char *drawbuf) +void RenderAll(wsWindow *window, guiItem *items, int till, char *drawbuf) { uint32_t *db; guiItem *item; @@ -406,7 +406,7 @@ void RenderAll(wsWindow *window, guiItem db = (uint32_t *)drawbuf; dw = window->Width; - for (i = 0; i < nrItems + 1; i++) { + for (i = 0; i <= till; i++) { item = &items[i]; switch (item->pressed) { Modified: trunk/gui/ui/render.h ============================================================================== --- trunk/gui/ui/render.h Fri Mar 28 20:03:59 2014 (r37106) +++ trunk/gui/ui/render.h Sat Mar 29 14:49:26 2014 (r37107) @@ -22,6 +22,6 @@ #include "gui/app/app.h" #include "gui/wm/ws.h" -void RenderAll(wsWindow *window, guiItem *items, int nrItems, char *drawbuf); +void RenderAll(wsWindow *window, guiItem *items, int till, char *drawbuf); #endif /* MPLAYER_GUI_RENDER_H */

1 0