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

r37172 - trunk/gui/interface.c
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 15:20:58 2014 New Revision: 37172 Log: Cosmetic: Adjust indent. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 15:17:00 2014 (r37171) +++ trunk/gui/interface.c Thu Apr 24 15:20:58 2014 (r37172) @@ -294,8 +294,8 @@ static void add_vf(const char *vf, const return; vf_settings = settings; - vf_settings[i].name = strdup(vf); - vf_settings[i].attribs = listDup(argvf); + vf_settings[i].name = strdup(vf); + vf_settings[i].attribs = listDup(argvf); memset(&vf_settings[i + 1], 0, sizeof(m_obj_settings_t)); } } else {

1 0

r37171 - trunk/gui/interface.c
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 15:17:00 2014 New Revision: 37171 Log: Rewrite add_vf(). Add a parameter in order to pass options to a video filter to be added. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 15:08:38 2014 (r37170) +++ trunk/gui/interface.c Thu Apr 24 15:17:00 2014 (r37171) @@ -275,7 +275,7 @@ void guiDone(void) mp_msg(MSGT_GPLAYER, MSGL_V, "GUI done.\n"); } -static void add_vf(const char *vf) +static void add_vf(const char *vf, const char *const *argvf) { if (vf_settings) { int i = 0; @@ -295,7 +295,7 @@ static void add_vf(const char *vf) vf_settings = settings; vf_settings[i].name = strdup(vf); - vf_settings[i].attribs = NULL; + vf_settings[i].attribs = listDup(argvf); memset(&vf_settings[i + 1], 0, sizeof(m_obj_settings_t)); } } else { @@ -305,7 +305,7 @@ static void add_vf(const char *vf) return; vf_settings[0].name = strdup(vf); - vf_settings[0].attribs = NULL; + vf_settings[0].attribs = listDup(argvf); } mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_AddingVideoFilter, vf); @@ -505,10 +505,10 @@ int gui(int what, void *data) if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3")) if (guiInfo.StreamType != STREAMTYPE_DVD && guiInfo.StreamType != STREAMTYPE_VCD) if (gtkVfLAVC) - add_vf("lavc"); + add_vf("lavc", NULL); if (gtkVfPP) - add_vf("pp"); + add_vf("pp", NULL); /* audio opts */

1 0

r37170 - trunk/gui/interface.c
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 15:08:38 2014 New Revision: 37170 Log: Rewrite add_vf(). Avoid confusing usage of i = -1 to indicate that a video filter has been found. Check vf_settings[i].name instead. As a result, the index of the video filter found won't be destroyed. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 14:58:40 2014 (r37169) +++ trunk/gui/interface.c Thu Apr 24 15:08:38 2014 (r37170) @@ -281,13 +281,13 @@ static void add_vf(const char *vf) int i = 0; while (vf_settings[i].name) { - if (strcmp(vf_settings[i++].name, vf) == 0) { - i = -1; + if (strcmp(vf_settings[i].name, vf) == 0) break; - } + + i++; } - if (i != -1) { + if (!vf_settings[i].name) { void *settings = realloc(vf_settings, (i + 2) * sizeof(m_obj_settings_t)); if (!settings)

1 0

r37169 - trunk/gui/interface.c
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 14:58:40 2014 New Revision: 37169 Log: Fix bug in r37165. The incrementation has got lost there. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 14:50:14 2014 (r37168) +++ trunk/gui/interface.c Thu Apr 24 14:58:40 2014 (r37169) @@ -281,7 +281,7 @@ static void add_vf(const char *vf) int i = 0; while (vf_settings[i].name) { - if (strcmp(vf_settings[i].name, vf) == 0) { + if (strcmp(vf_settings[i++].name, vf) == 0) { i = -1; break; }

1 0

r37167 - trunk/gui/interface.c
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 14:44:33 2014 New Revision: 37167 Log: Rewrite add_vf(). Use memset() in order to clear vf_settings[i + 1] completely. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 14:39:37 2014 (r37166) +++ trunk/gui/interface.c Thu Apr 24 14:44:33 2014 (r37167) @@ -296,7 +296,7 @@ static void add_vf(const char *vf) vf_settings = settings; vf_settings[i].name = strdup(vf); vf_settings[i].attribs = NULL; - vf_settings[i + 1].name = NULL; + memset(&vf_settings[i + 1], 0, sizeof(m_obj_settings_t)); } } else { vf_settings = malloc(2 * sizeof(m_obj_settings_t));

1 0

r37166 - trunk/gui/interface.c
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 14:39:37 2014 New Revision: 37166 Log: Rewrite add_vf(). Move variable to scope where it is used. Additionally, rename it. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 14:29:30 2014 (r37165) +++ trunk/gui/interface.c Thu Apr 24 14:39:37 2014 (r37166) @@ -277,8 +277,6 @@ void guiDone(void) static void add_vf(const char *vf) { - void *p; - if (vf_settings) { int i = 0; @@ -290,12 +288,12 @@ static void add_vf(const char *vf) } if (i != -1) { - p = realloc(vf_settings, (i + 2) * sizeof(m_obj_settings_t)); + void *settings = realloc(vf_settings, (i + 2) * sizeof(m_obj_settings_t)); - if (!p) + if (!settings) return; - vf_settings = p; + vf_settings = settings; vf_settings[i].name = strdup(vf); vf_settings[i].attribs = NULL; vf_settings[i + 1].name = NULL;

1 0

r37165 - trunk/gui/interface.c
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 14:29:30 2014 New Revision: 37165 Log: Rewrite add_vf(). Prefer strcmp() to gstrcmp() since vf_settings[i].name has been checked not to be NULL. Additionally, rephrase the condition. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 14:22:09 2014 (r37164) +++ trunk/gui/interface.c Thu Apr 24 14:29:30 2014 (r37165) @@ -283,7 +283,7 @@ static void add_vf(const char *vf) int i = 0; while (vf_settings[i].name) { - if (!gstrcmp(vf_settings[i++].name, vf)) { + if (strcmp(vf_settings[i].name, vf) == 0) { i = -1; break; }

1 0

r37164 - trunk/gui/interface.c
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 14:22:09 2014 New Revision: 37164 Log: Rewrite add_vf(). Rename parameter and make it const. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 14:09:37 2014 (r37163) +++ trunk/gui/interface.c Thu Apr 24 14:22:09 2014 (r37164) @@ -275,7 +275,7 @@ void guiDone(void) mp_msg(MSGT_GPLAYER, MSGL_V, "GUI done.\n"); } -static void add_vf(char *str) +static void add_vf(const char *vf) { void *p; @@ -283,7 +283,7 @@ static void add_vf(char *str) int i = 0; while (vf_settings[i].name) { - if (!gstrcmp(vf_settings[i++].name, str)) { + if (!gstrcmp(vf_settings[i++].name, vf)) { i = -1; break; } @@ -296,18 +296,18 @@ static void add_vf(char *str) return; vf_settings = p; - vf_settings[i].name = strdup(str); + vf_settings[i].name = strdup(vf); vf_settings[i].attribs = NULL; vf_settings[i + 1].name = NULL; } } else { vf_settings = malloc(2 * sizeof(m_obj_settings_t)); - vf_settings[0].name = strdup(str); + vf_settings[0].name = strdup(vf); vf_settings[0].attribs = NULL; vf_settings[1].name = NULL; } - mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_AddingVideoFilter, str); + mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_AddingVideoFilter, vf); } /**

1 0

r37163 - in trunk/gui/util: list.c list.h
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 14:09:37 2014 New Revision: 37163 Log: Add listDup(). (Currently unused, but we will need it soon.) Modified: trunk/gui/util/list.c trunk/gui/util/list.h Modified: trunk/gui/util/list.c ============================================================================== --- trunk/gui/util/list.c Thu Apr 24 13:56:18 2014 (r37162) +++ trunk/gui/util/list.c Thu Apr 24 14:09:37 2014 (r37163) @@ -350,6 +350,36 @@ void listRepl(char ***list, const char * } /** + * @brief Duplicate a string list (by allocating new memory). + * + * @note The list must be NULL-terminated. + * + * @param list string list to be duplicated + * + * @return duplicated list + */ +char **listDup(const char *const *list) +{ + char **dup = NULL; + + if (list) { + int i = 0; + + while (list[i]) + i++; + + dup = calloc(i + 1, sizeof(char *)); + + if (dup) { + while (--i >= 0) + dup[i] = strdup(list[i]); + } + } + + return dup; +} + +/** * @brief Append or insert a file to the playlist. * * @param what file to be added Modified: trunk/gui/util/list.h ============================================================================== --- trunk/gui/util/list.h Thu Apr 24 13:56:18 2014 (r37162) +++ trunk/gui/util/list.h Thu Apr 24 14:09:37 2014 (r37163) @@ -54,6 +54,7 @@ void *listMgr(int cmd, void *data); /// @name String list operations //@{ +char **listDup(const char *const *list); void listFree(char ***list); void listRepl(char ***list, const char *search, const char *replace); void listSet(char ***list, const char *entry);

1 0

r37162 - in trunk/gui/util: list.c list.h
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 13:56:18 2014 New Revision: 37162 Log: Add listFree(). Use it in listSet(). (This is the only purpose of use at the moment, but we will need listFree() later which is the reason behind setting the pointer to NULL after freeing.) Modified: trunk/gui/util/list.c trunk/gui/util/list.h Modified: trunk/gui/util/list.c ============================================================================== --- trunk/gui/util/list.c Thu Apr 24 13:31:31 2014 (r37161) +++ trunk/gui/util/list.c Thu Apr 24 13:56:18 2014 (r37162) @@ -26,6 +26,7 @@ #include <string.h> #include "list.h" +#include "mem.h" #include "string.h" #include "gui/app/gui.h" @@ -269,14 +270,11 @@ void *listMgr(int cmd, void *data) } /** - * @brief Set string list to @a entry. + * @brief Free a string list. * * @param list pointer to the string list - * @param entry the new (and only) element of the list - * - * @note Actually, a new list will be created and the old list will be freed. */ -void listSet(char ***list, const char *entry) +void listFree(char ***list) { if (*list) { char **l = *list; @@ -286,8 +284,21 @@ void listSet(char ***list, const char *e l++; } - free(*list); + nfree(*list); } +} + +/** + * @brief Set string list to @a entry. + * + * @param list pointer to the string list + * @param entry the new (and only) element of the list + * + * @note Actually, a new list will be created and the old list will be freed. + */ +void listSet(char ***list, const char *entry) +{ + listFree(list); *list = malloc(2 * sizeof(char *)); Modified: trunk/gui/util/list.h ============================================================================== --- trunk/gui/util/list.h Thu Apr 24 13:31:31 2014 (r37161) +++ trunk/gui/util/list.h Thu Apr 24 13:56:18 2014 (r37162) @@ -54,6 +54,7 @@ void *listMgr(int cmd, void *data); /// @name String list operations //@{ +void listFree(char ***list); void listRepl(char ***list, const char *search, const char *replace); void listSet(char ***list, const char *entry); //@}

1 0