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

r38181 - trunk/etc/codecs.conf
by compn 21 Feb '20

21 Feb '20

Author: compn Date: Fri Feb 21 09:54:35 2020 New Revision: 38181 Log: codecs.conf: add ffcanopus hqx codec, fixes trac #2327 Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Fri Feb 21 09:23:13 2020 (r38180) +++ trunk/etc/codecs.conf Fri Feb 21 09:54:35 2020 (r38181) @@ -2961,6 +2961,14 @@ videocodec ffcanopushq dll hq_hqa out 422P,422A +videocodec ffcanopushqx + status working + info "FFmpeg Canopus HQX Codec" + fourcc CHQX + driver ffmpeg + dll hqx + out 422P16,444P16 + videocodec canopusll status working info "Canopus Lossless Codec"

1 0

r38180 - trunk/etc/codecs.conf
by compn 21 Feb '20

21 Feb '20

Author: compn Date: Fri Feb 21 09:23:13 2020 New Revision: 38180 Log: codecs.conf: add ffsiren for vivo and msn audio files Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sun Feb 9 23:32:12 2020 (r38179) +++ trunk/etc/codecs.conf Fri Feb 21 09:23:13 2020 (r38180) @@ -6494,6 +6494,14 @@ audiocodec msnsiren driver acm dll "sirenacm.dll" +audiocodec ffsiren + info "ffmpeg siren audio codec" + status working + format 0x112 ; vivo siren + format 0x028E ; msn siren + driver ffmpeg + dll siren + audiocodec ffdvaudio info "FFmpeg Ulead DV" status working

1 0

r38179 - trunk/gui/wm/ws.c
by ib 09 Feb '20

09 Feb '20

Author: ib Date: Sun Feb 9 23:32:12 2020 New Revision: 38179 Log: Improve the X error messages. Be more detailed and be aware of extensions. Modified: trunk/gui/wm/ws.c Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Thu Feb 6 18:47:43 2020 (r38178) +++ trunk/gui/wm/ws.c Sun Feb 9 23:32:12 2020 (r38179) @@ -20,10 +20,12 @@ */ #include <stdint.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/ipc.h> #include <X11/Xatom.h> +#include <X11/Xlibint.h> #include "ws.h" #include "wsxdnd.h" @@ -311,12 +313,40 @@ void wsDone(void) static int wsErrorHandler(Display *display, XErrorEvent *event) { char type[128]; + _XExtension *ext = NULL; XGetErrorText(display, event->error_code, type, sizeof(type)); mp_msg(MSGT_GPLAYER, MSGL_ERR, "[ws] " MSGTR_GUI_MSG_X11Error); mp_msg(MSGT_GPLAYER, MSGL_ERR, "[ws] Error code: %d - %s\n", event->error_code, type); - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] Request code: %d (minor code: %d)\n", event->request_code, event->minor_code); + + if (event->request_code < 128) { + snprintf(type, sizeof(type), "%d", event->request_code); + XGetErrorDatabaseText(display, "XRequest", type, "?", type, sizeof(type)); + } else { + ext = display->ext_procs; + + while (ext && (ext->codes.major_opcode != event->request_code)) + ext = ext->next; + + if (ext) + snprintf(type, sizeof(type), "%s", ext->name); + else + strcpy(type, "?"); + } + + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] Request code: %d (%s)\n", event->request_code, type); + + if (event->request_code >= 128) { + if (ext) { + snprintf(type, sizeof(type), "%s.%d", ext->name, event->minor_code); + XGetErrorDatabaseText(display, "XRequest", type, "?", type, sizeof(type)); + } else + strcpy(type, "?"); + + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] Minor code: %d (%s)\n", event->minor_code, type); + } + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] MPlayer module: %s\n", current_module ? current_module : "(none)"); return 0;

1 0

r38178 - trunk/gui/dialog/preferences.c
by ib 06 Feb '20

06 Feb '20

Author: ib Date: Thu Feb 6 18:47:43 2020 New Revision: 38178 Log: Remove pcm from the GUI's audio driver list. Although this driver works with the GUI (even without additional configuration), the GUI does not get any events, which causes it to neither react nor be able to be stopped during playback. Modified: trunk/gui/dialog/preferences.c Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Thu Feb 6 18:41:51 2020 (r38177) +++ trunk/gui/dialog/preferences.c Thu Feb 6 18:47:43 2020 (r38178) @@ -1223,6 +1223,7 @@ void ShowPreferences( void ) { const ao_info_t *info = audio_out_drivers[i++]->info; if ( !strcmp( info->short_name,"mpegpes" ) ) continue; + if ( !strcmp( info->short_name,"pcm" ) ) continue; if ( !strcmp( info->short_name,"plugin" ) ) continue; if ( audio_driver_list ) {

1 0

r38177 - in trunk: Changelog libvo/vo_jpeg.c libvo/vo_md5sum.c libvo/vo_null.c libvo/vo_png.c libvo/vo_pnm.c libvo/vo_tga.c libvo/vo_yuv4mpeg.c
by ib 06 Feb '20

06 Feb '20

Author: ib Date: Thu Feb 6 18:41:51 2020 New Revision: 38177 Log: Revert r38168. Although these drivers work with the GUI (even without additional configuration), the GUI does not get any events, which causes it to neither react nor be able to be stopped during playback. Modified: trunk/Changelog trunk/libvo/vo_jpeg.c trunk/libvo/vo_md5sum.c trunk/libvo/vo_null.c trunk/libvo/vo_png.c trunk/libvo/vo_pnm.c trunk/libvo/vo_tga.c trunk/libvo/vo_yuv4mpeg.c Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Thu Feb 6 17:41:36 2020 (r38176) +++ trunk/Changelog Thu Feb 6 18:41:51 2020 (r38177) @@ -8,7 +8,6 @@ MPlayer * Fix wrongly sized video window after leaving fullscreen mode * Clear screen when switching to fullscreen mode using the x11 video output driver - * Enable video output drivers which write to files * 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 Modified: trunk/libvo/vo_jpeg.c ============================================================================== --- trunk/libvo/vo_jpeg.c Thu Feb 6 17:41:36 2020 (r38176) +++ trunk/libvo/vo_jpeg.c Thu Feb 6 18:41:51 2020 (r38177) @@ -396,8 +396,6 @@ static int control(uint32_t request, voi switch (request) { case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); - case VOCTRL_GUISUPPORT: - return VO_TRUE; } return VO_NOTIMPL; } Modified: trunk/libvo/vo_md5sum.c ============================================================================== --- trunk/libvo/vo_md5sum.c Thu Feb 6 17:41:36 2020 (r38176) +++ trunk/libvo/vo_md5sum.c Thu Feb 6 18:41:51 2020 (r38177) @@ -255,8 +255,6 @@ static int control(uint32_t request, voi return query_format(*((uint32_t*)data)); case VOCTRL_DRAW_IMAGE: return draw_image(data); - case VOCTRL_GUISUPPORT: - return VO_TRUE; } return VO_NOTIMPL; } Modified: trunk/libvo/vo_null.c ============================================================================== --- trunk/libvo/vo_null.c Thu Feb 6 17:41:36 2020 (r38176) +++ trunk/libvo/vo_null.c Thu Feb 6 18:41:51 2020 (r38177) @@ -100,8 +100,6 @@ static int control(uint32_t request, voi switch (request) { case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); - case VOCTRL_GUISUPPORT: - return VO_TRUE; } return VO_NOTIMPL; } Modified: trunk/libvo/vo_png.c ============================================================================== --- trunk/libvo/vo_png.c Thu Feb 6 17:41:36 2020 (r38176) +++ trunk/libvo/vo_png.c Thu Feb 6 18:41:51 2020 (r38177) @@ -262,8 +262,6 @@ static int control(uint32_t request, voi return draw_image(data); case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); - case VOCTRL_GUISUPPORT: - return VO_TRUE; } return VO_NOTIMPL; } Modified: trunk/libvo/vo_pnm.c ============================================================================== --- trunk/libvo/vo_pnm.c Thu Feb 6 17:41:36 2020 (r38176) +++ trunk/libvo/vo_pnm.c Thu Feb 6 18:41:51 2020 (r38177) @@ -532,8 +532,6 @@ static int control(uint32_t request, voi return query_format(*((uint32_t*)data)); case VOCTRL_DRAW_IMAGE: return draw_image(data); - case VOCTRL_GUISUPPORT: - return VO_TRUE; } return VO_NOTIMPL; } Modified: trunk/libvo/vo_tga.c ============================================================================== --- trunk/libvo/vo_tga.c Thu Feb 6 17:41:36 2020 (r38176) +++ trunk/libvo/vo_tga.c Thu Feb 6 18:41:51 2020 (r38177) @@ -219,9 +219,6 @@ static int control(uint32_t request, voi case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); - - case VOCTRL_GUISUPPORT: - return VO_TRUE; } return VO_NOTIMPL; } Modified: trunk/libvo/vo_yuv4mpeg.c ============================================================================== --- trunk/libvo/vo_yuv4mpeg.c Thu Feb 6 17:41:36 2020 (r38176) +++ trunk/libvo/vo_yuv4mpeg.c Thu Feb 6 18:41:51 2020 (r38177) @@ -301,8 +301,6 @@ static int control(uint32_t request, voi return query_format(*((uint32_t*)data)); case VOCTRL_DUPLICATE_FRAME: return write_last_frame(); - case VOCTRL_GUISUPPORT: - return VO_TRUE; } return VO_NOTIMPL; }

1 0

r38176 - in trunk: gui/wm/ws.c libvo/gl_common.c libvo/gl_common.h libvo/vo_gl_tiled.c
by ib 06 Feb '20

06 Feb '20

Author: ib Date: Thu Feb 6 17:41:36 2020 New Revision: 38176 Log: Rename gl_vinfo gui_vinfo. This rather clarifies the purpose of the variable. Modified: trunk/gui/wm/ws.c trunk/libvo/gl_common.c trunk/libvo/gl_common.h trunk/libvo/vo_gl_tiled.c Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Thu Feb 6 17:36:06 2020 (r38175) +++ trunk/gui/wm/ws.c Thu Feb 6 17:41:36 2020 (r38176) @@ -64,7 +64,7 @@ int wsOrgX; // int wsOrgY; // Screen origin y. Display *wsDisplay; -XVisualInfo *gl_vinfo; +XVisualInfo *gui_vinfo; static int wsScreen; static Window wsRootWin; @@ -830,7 +830,7 @@ void wsWindowCreate(wsWindow *win, int x XMatchVisualInfo(wsDisplay, wsScreen, depth, TrueColor, &win->VisualInfo); - gl_vinfo = &win->VisualInfo; + gui_vinfo = &win->VisualInfo; mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] visual: ID %#lx\n", win->VisualInfo.visualid); Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Thu Feb 6 17:36:06 2020 (r38175) +++ trunk/libvo/gl_common.c Thu Feb 6 17:41:36 2020 (r38176) @@ -2781,8 +2781,8 @@ int mpglcontext_create_window(MPGLContex #ifdef CONFIG_GUI int value; - if (gl_vinfo && glXGetConfig(mDisplay, gl_vinfo, GLX_USE_GL, &value) == 0 && value == True) - vinfo = gl_vinfo; + if (gui_vinfo && glXGetConfig(mDisplay, gui_vinfo, GLX_USE_GL, &value) == 0 && value == True) + vinfo = gui_vinfo; #endif if (flags & VOFLAG_STEREO) { #ifdef CONFIG_GUI Modified: trunk/libvo/gl_common.h ============================================================================== --- trunk/libvo/gl_common.h Thu Feb 6 17:36:06 2020 (r38175) +++ trunk/libvo/gl_common.h Thu Feb 6 17:41:36 2020 (r38176) @@ -316,6 +316,6 @@ extern void (GLAPIENTRY *mpglTexImage3D) extern void* (GLAPIENTRY *mpglAllocateMemoryMESA)(void *, int, size_t, float, float, float); extern void (GLAPIENTRY *mpglFreeMemoryMESA)(void *, int, void *); -extern XVisualInfo *gl_vinfo; +extern XVisualInfo *gui_vinfo; #endif /* MPLAYER_GL_COMMON_H */ Modified: trunk/libvo/vo_gl_tiled.c ============================================================================== --- trunk/libvo/vo_gl_tiled.c Thu Feb 6 17:36:06 2020 (r38175) +++ trunk/libvo/vo_gl_tiled.c Thu Feb 6 17:41:36 2020 (r38176) @@ -464,9 +464,9 @@ static int choose_glx_visual(Display *dp #ifdef CONFIG_GUI int value; - if (gl_vinfo) { - if (glXGetConfig(mDisplay, gl_vinfo, GLX_USE_GL, &value) == 0 && value == True) { - *res_vi = *gl_vinfo; + if (gui_vinfo) { + if (glXGetConfig(mDisplay, gui_vinfo, GLX_USE_GL, &value) == 0 && value == True) { + *res_vi = *gui_vinfo; return 0; } else return -1;

1 0

r38175 - in trunk/libvo: gl_common.c vo_gl_tiled.c
by ib 06 Feb '20

06 Feb '20

Author: ib Date: Thu Feb 6 17:36:06 2020 New Revision: 38175 Log: Fix passing visual information to OpenGL video output driver for X11. Enabling the GUI and starting the plain MPlayer causes a segmentation fault. Modified: trunk/libvo/gl_common.c trunk/libvo/vo_gl_tiled.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Tue Feb 4 20:21:39 2020 (r38174) +++ trunk/libvo/gl_common.c Thu Feb 6 17:36:06 2020 (r38175) @@ -2769,13 +2769,6 @@ int mpglcontext_create_window(MPGLContex #endif #ifdef CONFIG_GL_X11 if (ctx->type == GLTYPE_X11) { - XVisualInfo *vinfo = NULL; -#ifdef CONFIG_GUI - int value; - - if (glXGetConfig(mDisplay, gl_vinfo, GLX_USE_GL, &value) == 0 && value == True) - vinfo = gl_vinfo; -#else int default_glx_attribs[] = { GLX_RGBA, GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1, GLX_BLUE_SIZE, 1, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, (flags & VOFLAG_DEPTH) ? 1 : 0, None @@ -2784,7 +2777,21 @@ int mpglcontext_create_window(MPGLContex GLX_RGBA, GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1, GLX_BLUE_SIZE, 1, GLX_DOUBLEBUFFER, GLX_STEREO, None }; + XVisualInfo *vinfo = NULL; +#ifdef CONFIG_GUI + int value; + + if (gl_vinfo && glXGetConfig(mDisplay, gl_vinfo, GLX_USE_GL, &value) == 0 && value == True) + vinfo = gl_vinfo; +#endif if (flags & VOFLAG_STEREO) { +#ifdef CONFIG_GUI + if (vinfo) { + if (glXGetConfig(mDisplay, vinfo, GLX_STEREO, &value) != 0 || value == False) + vinfo = NULL; + } + else +#endif vinfo = glXChooseVisual(mDisplay, mScreen, stereo_glx_attribs); if (!vinfo) mp_msg(MSGT_VO, MSGL_ERR, "[gl] Could not find a stereo visual, " @@ -2792,7 +2799,6 @@ int mpglcontext_create_window(MPGLContex } if (!vinfo) vinfo = glXChooseVisual(mDisplay, mScreen, default_glx_attribs); -#endif if (!vinfo) { mp_msg(MSGT_VO, MSGL_ERR, "[gl] no GLX support present\n"); return -1; Modified: trunk/libvo/vo_gl_tiled.c ============================================================================== --- trunk/libvo/vo_gl_tiled.c Tue Feb 4 20:21:39 2020 (r38174) +++ trunk/libvo/vo_gl_tiled.c Thu Feb 6 17:36:06 2020 (r38175) @@ -458,17 +458,20 @@ static void draw_alpha(int x0,int y0, in #ifdef CONFIG_GL_X11 static int choose_glx_visual(Display *dpy, int scr, XVisualInfo *res_vi) { + XVisualInfo template, *vi_list; + int vi_num, i, best_i, best_weight; + #ifdef CONFIG_GUI int value; - if (glXGetConfig(mDisplay, gl_vinfo, GLX_USE_GL, &value) == 0 && value == True) { - *res_vi = *gl_vinfo; - return 0; - } else - return -1; -#else - XVisualInfo template, *vi_list; - int vi_num, i, best_i, best_weight; + if (gl_vinfo) { + if (glXGetConfig(mDisplay, gl_vinfo, GLX_USE_GL, &value) == 0 && value == True) { + *res_vi = *gl_vinfo; + return 0; + } else + return -1; + } +#endif template.screen = scr; vi_list = XGetVisualInfo(dpy, VisualScreenMask, &template, &vi_num); @@ -519,7 +522,6 @@ static int choose_glx_visual(Display *dp if (best_weight < 1000000) *res_vi = vi_list[best_i]; XFree(vi_list); return (best_weight < 1000000) ? 0 : -1; -#endif } static int config_glx(uint32_t d_width, uint32_t d_height, uint32_t flags, char *title) {

1 0

r38174 - in trunk: Changelog gui/wm/ws.c libvo/gl_common.c libvo/gl_common.h libvo/vo_gl_tiled.c
by ib 04 Feb '20

04 Feb '20

Author: ib Date: Tue Feb 4 20:21:39 2020 New Revision: 38174 Log: Pass visual information to OpenGL video output driver for X11. The GUI and the OpenGL video output driver for X11 choose different visuals which results in a BadMatch error from XChangeWindowAttributes() in x11_common.c. Since the GUI has to choose the visual first to create its main window, it is necessary to tell it the drivers so that they can use this same (hopefully suitable) visual. Modified: trunk/Changelog trunk/gui/wm/ws.c trunk/libvo/gl_common.c trunk/libvo/gl_common.h trunk/libvo/vo_gl_tiled.c Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Tue Feb 4 16:03:18 2020 (r38173) +++ trunk/Changelog Tue Feb 4 20:21:39 2020 (r38174) @@ -11,6 +11,7 @@ MPlayer * Enable video output drivers which write to files * 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 1.4: "SubCounter" April 18, 2019 Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Tue Feb 4 16:03:18 2020 (r38173) +++ trunk/gui/wm/ws.c Tue Feb 4 20:21:39 2020 (r38174) @@ -64,6 +64,8 @@ int wsOrgX; // int wsOrgY; // Screen origin y. Display *wsDisplay; +XVisualInfo *gl_vinfo; + static int wsScreen; static Window wsRootWin; @@ -828,6 +830,8 @@ void wsWindowCreate(wsWindow *win, int x XMatchVisualInfo(wsDisplay, wsScreen, depth, TrueColor, &win->VisualInfo); + gl_vinfo = &win->VisualInfo; + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] visual: ID %#lx\n", win->VisualInfo.visualid); /* --- */ Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Tue Feb 4 16:03:18 2020 (r38173) +++ trunk/libvo/gl_common.c Tue Feb 4 20:21:39 2020 (r38174) @@ -2769,6 +2769,13 @@ int mpglcontext_create_window(MPGLContex #endif #ifdef CONFIG_GL_X11 if (ctx->type == GLTYPE_X11) { + XVisualInfo *vinfo = NULL; +#ifdef CONFIG_GUI + int value; + + if (glXGetConfig(mDisplay, gl_vinfo, GLX_USE_GL, &value) == 0 && value == True) + vinfo = gl_vinfo; +#else int default_glx_attribs[] = { GLX_RGBA, GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1, GLX_BLUE_SIZE, 1, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, (flags & VOFLAG_DEPTH) ? 1 : 0, None @@ -2777,7 +2784,6 @@ int mpglcontext_create_window(MPGLContex GLX_RGBA, GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1, GLX_BLUE_SIZE, 1, GLX_DOUBLEBUFFER, GLX_STEREO, None }; - XVisualInfo *vinfo = NULL; if (flags & VOFLAG_STEREO) { vinfo = glXChooseVisual(mDisplay, mScreen, stereo_glx_attribs); if (!vinfo) @@ -2786,6 +2792,7 @@ int mpglcontext_create_window(MPGLContex } if (!vinfo) vinfo = glXChooseVisual(mDisplay, mScreen, default_glx_attribs); +#endif if (!vinfo) { mp_msg(MSGT_VO, MSGL_ERR, "[gl] no GLX support present\n"); return -1; Modified: trunk/libvo/gl_common.h ============================================================================== --- trunk/libvo/gl_common.h Tue Feb 4 16:03:18 2020 (r38173) +++ trunk/libvo/gl_common.h Tue Feb 4 20:21:39 2020 (r38174) @@ -316,4 +316,6 @@ extern void (GLAPIENTRY *mpglTexImage3D) extern void* (GLAPIENTRY *mpglAllocateMemoryMESA)(void *, int, size_t, float, float, float); extern void (GLAPIENTRY *mpglFreeMemoryMESA)(void *, int, void *); +extern XVisualInfo *gl_vinfo; + #endif /* MPLAYER_GL_COMMON_H */ Modified: trunk/libvo/vo_gl_tiled.c ============================================================================== --- trunk/libvo/vo_gl_tiled.c Tue Feb 4 16:03:18 2020 (r38173) +++ trunk/libvo/vo_gl_tiled.c Tue Feb 4 20:21:39 2020 (r38174) @@ -458,6 +458,15 @@ static void draw_alpha(int x0,int y0, in #ifdef CONFIG_GL_X11 static int choose_glx_visual(Display *dpy, int scr, XVisualInfo *res_vi) { +#ifdef CONFIG_GUI + int value; + + if (glXGetConfig(mDisplay, gl_vinfo, GLX_USE_GL, &value) == 0 && value == True) { + *res_vi = *gl_vinfo; + return 0; + } else + return -1; +#else XVisualInfo template, *vi_list; int vi_num, i, best_i, best_weight; @@ -510,6 +519,7 @@ static int choose_glx_visual(Display *dp if (best_weight < 1000000) *res_vi = vi_list[best_i]; XFree(vi_list); return (best_weight < 1000000) ? 0 : -1; +#endif } static int config_glx(uint32_t d_width, uint32_t d_height, uint32_t flags, char *title) { @@ -520,6 +530,8 @@ static int config_glx(uint32_t d_width, return -1; } + mp_msg(MSGT_VO, MSGL_V, "[gl_tiled] GLX chose visual with ID 0x%x\n", (int)vinfo->visualid); + vo_x11_create_vo_window(vinfo, vo_dx, vo_dy, d_width, d_height, flags, vo_x11_create_colormap(vinfo), "gl_tiled", title);

1 0

r38173 - trunk/libvo/vo_matrixview.c
by ib 04 Feb '20

04 Feb '20

Author: ib Date: Tue Feb 4 16:03:18 2020 New Revision: 38173 Log: Add VOCTRL_GUISUPPORT. The video output driver supports it. Modified: trunk/libvo/vo_matrixview.c Modified: trunk/libvo/vo_matrixview.c ============================================================================== --- trunk/libvo/vo_matrixview.c Tue Feb 4 15:58:41 2020 (r38172) +++ trunk/libvo/vo_matrixview.c Tue Feb 4 16:03:18 2020 (r38173) @@ -286,6 +286,8 @@ static int control(uint32_t request, voi case VOCTRL_UPDATE_SCREENINFO: glctx.update_xinerama_info(); return VO_TRUE; + case VOCTRL_GUISUPPORT: + return VO_TRUE; } return VO_NOTIMPL; }

1 0

r38172 - in trunk: Changelog DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 DOCS/man/es/mplayer.1 DOCS/man/it/mplayer.1 DOCS/man/zh_CN/mplayer.1 gui/app/cfg.c gui/app/cfg.h gui/dialog/preferences.c gu...
by ib 04 Feb '20

04 Feb '20

Author: ib Date: Tue Feb 4 15:58:41 2020 New Revision: 38172 Log: Replace variable gtkLoadFullscreen by MPlayer's fullscreen. This allows using command line option -fs in addition to GUI option load_fullscreen. Modified: trunk/Changelog trunk/gui/app/cfg.c trunk/gui/app/cfg.h trunk/gui/dialog/preferences.c trunk/gui/interface.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/de/mplayer.1 trunk/DOCS/man/en/mplayer.1 trunk/DOCS/man/es/mplayer.1 trunk/DOCS/man/it/mplayer.1 trunk/DOCS/man/zh_CN/mplayer.1 Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Tue Feb 4 15:54:39 2020 (r38171) +++ trunk/Changelog Tue Feb 4 15:58:41 2020 (r38172) @@ -9,6 +9,8 @@ MPlayer * Clear screen when switching to fullscreen mode using the x11 video output driver * Enable video output drivers which write to files + * Command line option -fs is now recognized in addition to the + GUI option load_fullscreen 1.4: "SubCounter" April 18, 2019 Modified: trunk/gui/app/cfg.c ============================================================================== --- trunk/gui/app/cfg.c Tue Feb 4 15:54:39 2020 (r38171) +++ trunk/gui/app/cfg.c Tue Feb 4 15:58:41 2020 (r38172) @@ -93,8 +93,7 @@ gtkASS_t gtkASS; int gtkReplayGainOn; int gtkReplayGainAdjustment; -int gtkEnablePlayBar = True; -int gtkLoadFullscreen; +int gtkEnablePlayBar = True; int gtkShowVideoWindow = True; int gui_save_pos = True; @@ -179,7 +178,7 @@ static const m_option_t gui_opts[] = { { "replay_gain_adjustment", &gtkReplayGainAdjustment, CONF_TYPE_INT, CONF_RANGE, -30, 10, NULL }, { "playbar", &gtkEnablePlayBar, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "load_fullscreen", &gtkLoadFullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "load_fullscreen", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "show_videowin", &gtkShowVideoWindow, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG, 0, 0, 1, NULL }, Modified: trunk/gui/app/cfg.h ============================================================================== --- trunk/gui/app/cfg.h Tue Feb 4 15:54:39 2020 (r38171) +++ trunk/gui/app/cfg.h Tue Feb 4 15:58:41 2020 (r38172) @@ -84,7 +84,6 @@ extern int gtkReplayGainOn; extern int gtkReplayGainAdjustment; extern int gtkEnablePlayBar; -extern int gtkLoadFullscreen; extern int gtkShowVideoWindow; extern int gui_save_pos; Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Tue Feb 4 15:54:39 2020 (r38171) +++ trunk/gui/dialog/preferences.c Tue Feb 4 15:58:41 2020 (r38172) @@ -376,7 +376,7 @@ static void prButton( GtkButton * button /* 6th page */ gtkVfPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) ); - gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) ); + fullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) ); gui_save_pos=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ) ); gtkShowVideoWindow=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) ); stop_xscreensaver=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ) ); @@ -1398,7 +1398,7 @@ void ShowPreferences( void ) /* 6th page */ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPostprocess ),gtkVfPP ); - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ),gtkLoadFullscreen ); + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ),fullscreen ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ),gui_save_pos ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ),!gtkShowVideoWindow ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ),stop_xscreensaver ); Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Tue Feb 4 15:54:39 2020 (r38171) +++ trunk/gui/interface.c Tue Feb 4 15:58:41 2020 (r38172) @@ -339,12 +339,12 @@ void guiInit(void) guiInfo.VideoWindow = True; - if (gtkLoadFullscreen) + if (fullscreen) uiFullScreen(); } else wsWindowBackground(&guiApp.videoWindow, 0, 0, 0); - if (gtkLoadFullscreen) { + if (fullscreen) { guiApp.videoWindow.isFullScreen = True; btnSet(evFullScreen, btnPressed); } @@ -979,20 +979,14 @@ int gui(int what, void *data) if (guiInfo.Start) uiAbsSeek(guiInfo.Start); - // These must be done here (in the last call from MPlayer before - // playback starts) and not in GUI_SETUP_VIDEO_WINDOW, because... - - // ...without video there will be no call to GUI_SETUP_VIDEO_WINDOW + // This must be done here (in the last call from MPlayer before + // playback starts) and not in GUI_SETUP_VIDEO_WINDOW, because + // without video there will be no call to GUI_SETUP_VIDEO_WINDOW if (!guiInfo.VideoWindow) { wsWindowVisibility(&guiApp.videoWindow, wsHideWindow); - btnSet(evFullScreen, gtkLoadFullscreen ? btnPressed : btnReleased); + btnSet(evFullScreen, fullscreen ? btnPressed : btnReleased); } - // ...option variable fullscreen determines whether MPlayer will handle - // the window given by WinID as fullscreen window (and will do aspect - // scaling then) or not - quite rubbish - fullscreen = gtkLoadFullscreen; - break; case GUI_SET_VOLUME_BALANCE: @@ -1027,7 +1021,7 @@ int gui(int what, void *data) wsWindowVisibility(&guiApp.videoWindow, wsShowWindow); } - if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen) + if (fullscreen ^ guiApp.videoWindow.isFullScreen) uiEvent(evFullScreen, True); if (guiWinID >= 0) @@ -1141,12 +1135,12 @@ int gui(int what, void *data) if (!guiApp.videoWindow.Mapped) wsWindowVisibility(&guiApp.videoWindow, wsShowWindow); - if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen) + if (fullscreen ^ guiApp.videoWindow.isFullScreen) uiEvent(evFullScreen, -1); } else { wsWindowVisibility(&guiApp.videoWindow, wsHideWindow); guiInfo.VideoWindow = False; - btnSet(evFullScreen, gtkLoadFullscreen ? btnPressed : btnReleased); + btnSet(evFullScreen, fullscreen ? btnPressed : btnReleased); } gui(GUI_SET_STATE, (void *)GUI_STOP);

1 0