February 2021 - MPlayer-cvslog - lists.mplayerhq.hu

r38285 - in trunk: Makefile help/help_check.sh
by ib 28 Feb '21

28 Feb '21

Author: ib Date: Sun Feb 28 23:32:34 2021 New Revision: 38285 Log: Improve testing of the help message header files. Let the Makefile check them individually, but in parallel. Additionally, rename the target. Modified: trunk/Makefile trunk/help/help_check.sh Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Feb 28 23:31:10 2021 (r38284) +++ trunk/Makefile Sun Feb 28 23:32:34 2021 (r38285) @@ -766,8 +766,10 @@ config.mak: configure @echo "####### Please run ./configure again - it's changed! #######" @echo "############################################################" -checkhelp: help/help_mp*.h - help/help_check.sh $(CC) $^ +helpcheck: $(addsuffix elpcheck,$(wildcard help/help_mp-*.h)) + +%.helpcheck: %.h + help/help_check.sh $(CC) $< help_mp.h: help/help_mp-en.h $(HELP_FILE) help/help_create.sh $(HELP_FILE) $(CHARSET) @@ -1108,7 +1110,7 @@ dhahelperclean: -include $(DEP_FILES) $(DRIVER_DEP_FILES) $(TESTS_DEP_FILES) $(TOOLS_DEP_FILES) $(DHAHELPER_DEP_FILES) .PHONY: all doxygen *install* *tools drivers dhahelper* -.PHONY: checkheaders *clean tests check_checksums fatetest checkhelp +.PHONY: checkheaders *clean tests check_checksums fatetest helpcheck .PHONY: doc html-chunked* html-single* xmllint* # Disable suffix rules. Most of the builtin rules are suffix rules, Modified: trunk/help/help_check.sh ============================================================================== --- trunk/help/help_check.sh Sun Feb 28 23:31:10 2021 (r38284) +++ trunk/help/help_check.sh Sun Feb 28 23:32:34 2021 (r38285) @@ -2,7 +2,7 @@ # Check help message header files for conversion specifications and # valid string constant definitions. -CHECK=checkhelp +CHECK=helpcheck$$ SYMCONST_REGEX="[A-Za-z0-9_]\\+" CONVSPEC_REGEX="%[^diouxXeEfFgGaAcspn%]*[diouxXeEfFgGaAcspn%][0-9]*"

1 0

r38284 - trunk/gui/dialog/fileselect.c
by ib 28 Feb '21

28 Feb '21

Author: ib Date: Sun Feb 28 23:31:10 2021 New Revision: 38284 Log: Fix segmentation fault. Modified: trunk/gui/dialog/fileselect.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Sun Feb 28 23:29:54 2021 (r38283) +++ trunk/gui/dialog/fileselect.c Sun Feb 28 23:31:10 2021 (r38284) @@ -594,6 +594,9 @@ static void fs_Ok_released(GtkButton *bu (void)button; (void)user_data; + if (!fsSelectedFile) + fsSelectedFile = "."; + if (chdir(fsSelectedFile) == 0) { gchar *utf8dir;

1 0

r38283 - trunk/configure
by ib 28 Feb '21

28 Feb '21

Author: ib Date: Sun Feb 28 23:29:54 2021 New Revision: 38283 Log: Use also pkg-config to detect libenca. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Feb 26 17:53:11 2021 (r38282) +++ trunk/configure Sun Feb 28 23:29:54 2021 (r38283) @@ -6695,7 +6695,15 @@ echores "$_ass" echocheck "ENCA" if test "$_enca" = auto ; then _enca=no - statement_check enca.h 'enca_get_languages(NULL)' -lenca && _enca=yes + if statement_check enca.h 'enca_get_languages(NULL)' -lenca; then + _enca=yes + elif $_pkg_config --exists enca; then + if statement_check enca.h 'enca_get_languages(NULL)' $($_pkg_config --cflags --libs enca); then + _enca=yes + extra_cflags="$extra_cflags $($_pkg_config --cflags enca)" + extra_ldflags="$extra_ldflags $($_pkg_config --libs enca)" + fi + fi fi if test "$_enca" = yes ; then def_enca='#define CONFIG_ENCA 1'

1 0

r38282 - trunk/Changelog
by ib 26 Feb '21

26 Feb '21

Author: ib Date: Fri Feb 26 17:53:11 2021 New Revision: 38282 Log: Update Changelog. Modified: trunk/Changelog Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Fri Feb 26 17:51:32 2021 (r38281) +++ trunk/Changelog Fri Feb 26 17:53:11 2021 (r38282) @@ -13,6 +13,7 @@ MPlayer * Use correct visual in OpenGL video output driver for X11 * Provide a built-in skin so that the GUI can be used even without an installed skin + * Minor bug fixes Other: * Building on Arm now compiles for the ISA and extensions of the

1 0

r38281 - trunk/gui/dialog/skinbrowser.c
by ib 26 Feb '21

26 Feb '21

Author: ib Date: Fri Feb 26 17:51:32 2021 New Revision: 38281 Log: Make prevSelected static. This was mistakenly changed in svn r38273. Modified: trunk/gui/dialog/skinbrowser.c Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Fri Feb 26 17:39:43 2021 (r38280) +++ trunk/gui/dialog/skinbrowser.c Fri Feb 26 17:51:32 2021 (r38281) @@ -40,7 +40,7 @@ char * sbSelectedSkin=NULL; char * sbSkinDirInHome=NULL; char * sbSkinDirInData=NULL; -char *prevSelected; +static char *prevSelected; GtkWidget * SkinBrowser = NULL;

1 0

r38280 - trunk/gui/interface.c
by ib 26 Feb '21

26 Feb '21

Author: ib Date: Fri Feb 26 17:39:43 2021 New Revision: 38280 Log: Ensure that the message regarding the not installed skins will be read. Wait until the message box has been acknowledged. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Fri Feb 26 17:33:26 2021 (r38279) +++ trunk/gui/interface.c Fri Feb 26 17:39:43 2021 (r38280) @@ -292,7 +292,7 @@ void guiInit(void) if (skinRead("Noskin") != 0) mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); - gtkMessageBox(MSGBOX_WARNING, MSGTR_GUI_MSG_NoSkinInstalled); + gtkMessageBox(MSGBOX_WARNING | MSGBOX_WAIT, MSGTR_GUI_MSG_NoSkinInstalled); setdup(&skinName, ""); break; }

1 0

r38279 - in trunk/gui/dialog: dialog.c dialog.h
by ib 26 Feb '21

26 Feb '21

Author: ib Date: Fri Feb 26 17:33:26 2021 New Revision: 38279 Log: Add the message box type MSGBOX_WAIT. This allows all message box types (and not only MSGBOX_FATAL) to be defined as "blocking", i.e. program execution is suspended until the message box has been acknowledged. Modified: trunk/gui/dialog/dialog.c trunk/gui/dialog/dialog.h Modified: trunk/gui/dialog/dialog.c ============================================================================== --- trunk/gui/dialog/dialog.c Fri Feb 26 17:29:26 2021 (r38278) +++ trunk/gui/dialog/dialog.c Fri Feb 26 17:33:26 2021 (r38279) @@ -191,12 +191,13 @@ void gtkMessageBox(int type, const gchar } else gtk_label_set_line_wrap(GTK_LABEL(gtkMessageBoxText), FALSE); - switch (type) { + switch (type & ~MSGBOX_WAIT) { case MSGBOX_FATAL: gtk_window_set_title(GTK_WINDOW(MessageBox), MSGTR_GUI_ErrorFatal); gtk_widget_hide(InformationImage); gtk_widget_hide(WarningImage); gtk_widget_show(ErrorImage); + type |= MSGBOX_WAIT; break; case MSGBOX_ERROR: @@ -224,7 +225,7 @@ void gtkMessageBox(int type, const gchar gtk_widget_show(MessageBox); gtkSetLayer(MessageBox); - if (type == MSGBOX_FATAL) { + if (type & MSGBOX_WAIT) { while (MessageBox) { gtk_main_iteration_do(FALSE); usec_sleep(5000); Modified: trunk/gui/dialog/dialog.h ============================================================================== --- trunk/gui/dialog/dialog.h Fri Feb 26 17:29:26 2021 (r38278) +++ trunk/gui/dialog/dialog.h Fri Feb 26 17:33:26 2021 (r38279) @@ -29,7 +29,8 @@ enum { MSGBOX_INFORMATION, MSGBOX_WARNING, MSGBOX_ERROR, - MSGBOX_FATAL + MSGBOX_FATAL, + MSGBOX_WAIT // must be a power of 2! }; typedef struct {

1 0

r38278 - trunk/gui/dialog/dialog.c
by ib 26 Feb '21

26 Feb '21

Author: ib Date: Fri Feb 26 17:29:26 2021 New Revision: 38278 Log: Improve the readability of message boxes with long texts. Align the text left and set a box width. Modified: trunk/gui/dialog/dialog.c Modified: trunk/gui/dialog/dialog.c ============================================================================== --- trunk/gui/dialog/dialog.c Fri Feb 26 17:25:20 2021 (r38277) +++ trunk/gui/dialog/dialog.c Fri Feb 26 17:29:26 2021 (r38278) @@ -184,11 +184,11 @@ void gtkMessageBox(int type, const gchar ShowMessageBox(str); gtk_label_set_text(GTK_LABEL(gtkMessageBoxText), str); - /* enable linewrapping by alex */ -// GTK_LABEL(gtkMessageBoxText)->max_width = 80; - if (strlen(str) > 80) + if (strlen(str) > 80) { gtk_label_set_line_wrap(GTK_LABEL(gtkMessageBoxText), TRUE); - else + gtk_label_set_justify(GTK_LABEL(gtkMessageBoxText), GTK_JUSTIFY_LEFT); + gtk_widget_set_size_request(gtkMessageBoxText, 415, -1); + } else gtk_label_set_line_wrap(GTK_LABEL(gtkMessageBoxText), FALSE); switch (type) {

1 0

r38277 - trunk/gui/interface.c
by ib 26 Feb '21

26 Feb '21

Author: ib Date: Fri Feb 26 17:25:20 2021 New Revision: 38277 Log: Cosmetic: Adjust indent. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Fri Feb 26 17:23:07 2021 (r38276) +++ trunk/gui/interface.c Fri Feb 26 17:25:20 2021 (r38277) @@ -286,8 +286,8 @@ void guiInit(void) switch (ret) { case -1: if (skin) { - gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_SkinCfgNotFound, skinName); - mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); + gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_SkinCfgNotFound, skinName); + mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); } else { if (skinRead("Noskin") != 0) mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);

1 0

r38276 - in trunk: Changelog DOCS/xml/de/install.xml DOCS/xml/de/skin.xml DOCS/xml/en/install.xml gui/interface.c gui/skin/skin.c help/help_mp-de.h help/help_mp-en.h
by ib 26 Feb '21

26 Feb '21

Author: ib Date: Fri Feb 26 17:23:07 2021 New Revision: 38276 Log: Provide a built-in skin for the X11/GTK GUI. It is unpleasant that the GUI requires the installation of a skin to be able to run. Without a skin the GUI terminates. Now, without any installed skin, the GUI at least provides a video window that allows simple control with the always available context menu. However, the user is informed that the installation of a skin is still strongly advised for comfortable control and for the display of additional information. Additionally, update the documentation. Modified: trunk/Changelog trunk/gui/interface.c trunk/gui/skin/skin.c Changes in other areas also in this revision: Modified: trunk/DOCS/xml/de/install.xml trunk/DOCS/xml/de/skin.xml trunk/DOCS/xml/en/install.xml trunk/help/help_mp-de.h trunk/help/help_mp-en.h Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Fri Feb 26 17:02:23 2021 (r38275) +++ trunk/Changelog Fri Feb 26 17:23:07 2021 (r38276) @@ -11,6 +11,8 @@ MPlayer * Command line option -fs is now recognized in addition to the GUI option load_fullscreen * Use correct visual in OpenGL video output driver for X11 + * Provide a built-in skin so that the GUI can be used even + without an installed skin Other: * Building on Arm now compiles for the ISA and extensions of the Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Fri Feb 26 17:02:23 2021 (r38275) +++ trunk/gui/interface.c Fri Feb 26 17:23:07 2021 (r38276) @@ -78,6 +78,7 @@ guiInterface_t guiInfo = { .PlaylistNext = True }; +static int skin; static int current_volume; static int guiInitialized; static int orig_fontconfig; @@ -268,7 +269,9 @@ void guiInit(void) 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", skinDirInData); - if (!skinName) + skin = (skinName != NULL); + + if (!skin) skinName = strdup("default"); ret = skinRead(skinName); @@ -282,8 +285,17 @@ void guiInit(void) switch (ret) { case -1: + if (skin) { gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_SkinCfgNotFound, skinName); mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); + } else { + if (skinRead("Noskin") != 0) + mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); + + gtkMessageBox(MSGBOX_WARNING, MSGTR_GUI_MSG_NoSkinInstalled); + setdup(&skinName, ""); + break; + } case -2: gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_SkinCfgError, skinName); Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Fri Feb 26 17:02:23 2021 (r38275) +++ trunk/gui/skin/skin.c Fri Feb 26 17:23:07 2021 (r38276) @@ -1285,6 +1285,9 @@ int skinRead(char *sname) unsigned char param[256]; unsigned int i; + if (*sname == 0 || strcmp(sname, "Noskin") == 0) + return skinNoskin(); + skinfname = setname(skinDirInHome, sname); if ((skinfile = fopen(skinfname, "rt")) == NULL) {

1 0