May 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r36273 - trunk/configure
by reimar 16 May '13

16 May '13

Author: reimar Date: Thu May 16 20:22:53 2013 New Revision: 36273 Log: Disable -pie on Windows, it causes issues without any advantages I know of. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu May 16 20:22:52 2013 (r36272) +++ trunk/configure Thu May 16 20:22:53 2013 (r36273) @@ -2768,6 +2768,9 @@ if test $relocatable = "auto" ; then if test -n "$ld_static" ; then relocatable=no res_comment="PIE + static assumed to be broken" + elif win32 && ! wine ; then + relocatable=no + res_comment="unnecessary and broken on win32" elif x86_32 && cflag_check -pie ; then extra_ldflags="$extra_ldflags -pie" relocatable=yes

1 0

r36272 - trunk/configure
by reimar 16 May '13

16 May '13

Author: reimar Date: Thu May 16 20:22:52 2013 New Revision: 36272 Log: Enable atomics. Fixes compilation without pthreads and should improve threading speed with pthreads. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu May 16 20:22:51 2013 (r36271) +++ trunk/configure Thu May 16 20:22:52 2013 (r36272) @@ -9086,6 +9086,8 @@ $def_truncf #define HAVE_ALIGNED_STACK 1 #define HAVE_ASM_MOD_Q 1 +#define HAVE_ATOMICS_GCC 1 +#define HAVE_ATOMICS_NATIVE 1 #define HAVE_ATTRIBUTE_PACKED 1 #define HAVE_GETHRTIME 0 #define HAVE_INLINE_ASM 1

1 0

r36271 - trunk/Changelog
by reimar 16 May '13

16 May '13

Author: reimar Date: Thu May 16 20:22:51 2013 New Revision: 36271 Log: Fix -monitor-orientation option name in changelog. Modified: trunk/Changelog Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Wed May 15 11:54:40 2013 (r36270) +++ trunk/Changelog Thu May 16 20:22:51 2013 (r36271) @@ -10,7 +10,7 @@ MPlayer * -vo gl now supports OSD (not EOSD though) with GLES backend. * GLES backend now uses GLES v2 with YUV support via shaders * -vo gl supports rotated display without needing video filters via - -rotate command-line option. + -monitor-orientation command-line option. * -vo gl now has an OSX/Cocoa backend, so it should be a better alternative to -vo corevideo now. * -vo gl2 renamed to -vo gl_tiled to stop people from assuming it is

1 0

r36270 - trunk/etc/codecs.conf
by cehoyos 15 May '13

15 May '13

Author: cehoyos Date: Wed May 15 11:54:40 2013 New Revision: 36270 Log: Support audio in GameCube rsd files. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Wed May 15 11:28:41 2013 (r36269) +++ trunk/etc/codecs.conf Wed May 15 11:54:40 2013 (r36270) @@ -4701,6 +4701,13 @@ audiocodec ffadpcmdtk driver ffmpeg dll adpcm_dtk +audiocodec ffadpcmimarad + info "FFmpeg ADPCM IMA Radical" + status working + fourcc RADP + driver ffmpeg + dll adpcm_ima_rad + audiocodec ffadpcmimadk4 info "FFmpeg DK4 IMA ADPCM audio" status working @@ -4898,6 +4905,7 @@ audiocodec ffadpcmthp info "FFmpeg THP ADPCM audio" status working fourcc THPA + fourcc GADP ; rsd files driver ffmpeg dll adpcm_thp @@ -5058,6 +5066,7 @@ audiocodec pcm fourcc 23ni ; (MOV files) fourcc lpcm ; (MOV files) fourcc FL32 ; (aiff files) + fourcc "PCM ",PCMB ; rsd files ;;;; these are for hardware support only: (alaw,ulaw,ima-adpcm,mpeg,ac3) ; format 0x6 ; format 0x7

1 0

r36269 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c
by cehoyos 15 May '13

15 May '13

Author: cehoyos Date: Wed May 15 11:28:41 2013 New Revision: 36269 Log: Support Nintendo Gamecube DTK files. Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Mon May 13 21:34:44 2013 (r36268) +++ trunk/etc/codecs.conf Wed May 15 11:28:41 2013 (r36269) @@ -4694,6 +4694,13 @@ audiocodec ffadpcmafc driver ffmpeg dll adpcm_afc +audiocodec ffadpcmdtk + info "FFmpeg ADPCM Nintendo Gamecube DTK" + status working + fourcc "DTK " ; internal MPlayer FourCC + driver ffmpeg + dll adpcm_dtk + audiocodec ffadpcmimadk4 info "FFmpeg DK4 IMA ADPCM audio" status working Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Mon May 13 21:34:44 2013 (r36268) +++ trunk/libmpdemux/mp_taglists.c Wed May 15 11:28:41 2013 (r36269) @@ -31,6 +31,7 @@ static const struct AVCodecTag mp_wav_ta { AV_CODEC_ID_ADPCM_ADX, MKTAG('S', 'a', 'd', 'x') }, #if LIBAVUTIL_VERSION_MICRO >= 100 { AV_CODEC_ID_ADPCM_AFC, MKTAG('A', 'F', 'C', ' ') }, + { AV_CODEC_ID_ADPCM_DTK, MKTAG('D', 'T', 'K', ' ') }, #endif { AV_CODEC_ID_ADPCM_IMA_APC, MKTAG('A', 'P', 'C', 'A') }, { AV_CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A') },

1 0

r36267 - in trunk: Changelog DOCS/man/en/mplayer.1 cfg-mplayer.h libvo/aspect.c libvo/video_out.c libvo/video_out.h libvo/vo_gl.c
by reimar 13 May '13

13 May '13

Author: reimar Date: Mon May 13 21:34:43 2013 New Revision: 36267 Log: Add support for rotating the video via OpenGL. Modified: trunk/Changelog trunk/cfg-mplayer.h trunk/libvo/aspect.c trunk/libvo/video_out.c trunk/libvo/video_out.h trunk/libvo/vo_gl.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Mon May 13 21:34:40 2013 (r36266) +++ trunk/Changelog Mon May 13 21:34:43 2013 (r36267) @@ -9,6 +9,8 @@ MPlayer * support for XYZ color space in -vo gl * -vo gl now supports OSD (not EOSD though) with GLES backend. * GLES backend now uses GLES v2 with YUV support via shaders + * -vo gl supports rotated display without needing video filters via + -rotate command-line option. * -vo gl now has an OSX/Cocoa backend, so it should be a better alternative to -vo corevideo now. * -vo gl2 renamed to -vo gl_tiled to stop people from assuming it is Modified: trunk/cfg-mplayer.h ============================================================================== --- trunk/cfg-mplayer.h Mon May 13 21:34:40 2013 (r36266) +++ trunk/cfg-mplayer.h Mon May 13 21:34:43 2013 (r36267) @@ -173,6 +173,7 @@ const m_option_t mplayer_opts[]={ {"novsync", &vo_vsync, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"panscan", &vo_panscan, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, {"panscanrange", &vo_panscanrange, CONF_TYPE_FLOAT, CONF_RANGE, -19.0, 99.0, NULL}, + {"monitor-orientation", &vo_rotate, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL}, {"grabpointer", &vo_grabpointer, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nograbpointer", &vo_grabpointer, CONF_TYPE_FLAG, 0, 1, 0, NULL}, Modified: trunk/libvo/aspect.c ============================================================================== --- trunk/libvo/aspect.c Mon May 13 21:34:40 2013 (r36266) +++ trunk/libvo/aspect.c Mon May 13 21:34:43 2013 (r36267) @@ -46,25 +46,44 @@ static struct { int orgh; // real height int prew; // prescaled width int preh; // prescaled height + int orgw_norot; + int orgh_norot; + int prew_norot; + int preh_norot; int scrw; // horizontal resolution int scrh; // vertical resolution float asp; } aspdat; +static void aspect_rotate(void) { + int i; + if (vo_rotate & 1) { + aspdat.orgw = aspdat.orgh_norot; + aspdat.orgh = aspdat.orgw_norot; + aspdat.prew = aspdat.preh_norot; + aspdat.preh = aspdat.prew_norot; + } else { + aspdat.orgw = aspdat.orgw_norot; + aspdat.orgh = aspdat.orgh_norot; + aspdat.prew = aspdat.prew_norot; + aspdat.preh = aspdat.preh_norot; + } +} + void aspect_save_orig(int orgw, int orgh){ #ifdef ASPECT_DEBUG printf("aspect_save_orig %dx%d \n",orgw,orgh); #endif - aspdat.orgw = orgw; - aspdat.orgh = orgh; + aspdat.orgw_norot = orgw; + aspdat.orgh_norot = orgh; } void aspect_save_prescale(int prew, int preh){ #ifdef ASPECT_DEBUG printf("aspect_save_prescale %dx%d \n",prew,preh); #endif - aspdat.prew = prew; - aspdat.preh = preh; + aspdat.prew_norot = prew; + aspdat.preh_norot = preh; } void aspect_save_screenres(int scrw, int scrh){ @@ -92,6 +111,7 @@ void aspect_save_screenres(int scrw, int void aspect_fit(int *srcw, int *srch, int fitw, int fith){ int tmpw; + aspect_rotate(); #ifdef ASPECT_DEBUG printf("aspect(0) fitin: %dx%d screenaspect: %.2f\n",aspdat.scrw,aspdat.scrh, monitor_aspect); @@ -139,6 +159,7 @@ static void get_max_dims(int *w, int *h, void aspect(int *srcw, int *srch, int zoom){ int fitw; int fith; + aspect_rotate(); get_max_dims(&fitw, &fith, zoom); if( !zoom && geometry_wh_changed ) { #ifdef ASPECT_DEBUG @@ -161,6 +182,7 @@ static void panscan_calc_internal(int zo int fwidth,fheight; int vo_panscan_area; int max_w, max_h; + aspect_rotate(); get_max_dims(&max_w, &max_h, zoom); if (vo_panscanrange > 0) { Modified: trunk/libvo/video_out.c ============================================================================== --- trunk/libvo/video_out.c Mon May 13 21:34:40 2013 (r36266) +++ trunk/libvo/video_out.c Mon May 13 21:34:43 2013 (r36267) @@ -65,6 +65,7 @@ int vo_vsync = 0; int vo_fs = 0; int vo_fsmode = 0; float vo_panscan = 0.0f; +int vo_rotate; int vo_ontop = 0; int vo_adapter_num=0; int vo_refresh_rate=0; Modified: trunk/libvo/video_out.h ============================================================================== --- trunk/libvo/video_out.h Mon May 13 21:34:40 2013 (r36266) +++ trunk/libvo/video_out.h Mon May 13 21:34:43 2013 (r36267) @@ -30,6 +30,13 @@ #include "libmpcodecs/img_format.h" //#include "vidix/vidix.h" + +#define ROTATE(t, x, y) do { \ + t rot_tmp = x; \ + x = y; \ + y = -rot_tmp; \ +} while(0) + #define VO_EVENT_EXPOSE 1 #define VO_EVENT_RESIZE 2 #define VO_EVENT_KEYPRESS 4 @@ -225,6 +232,7 @@ extern int vo_vsync; extern int vo_fs; extern int vo_fsmode; extern float vo_panscan; +extern int vo_rotate; extern int vo_adapter_num; extern int vo_refresh_rate; extern int vo_keepaspect; Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Mon May 13 21:34:40 2013 (r36266) +++ trunk/libvo/vo_gl.c Mon May 13 21:34:43 2013 (r36267) @@ -120,6 +120,7 @@ static int yuvconvtype; static int use_rectangle; static int using_tex_rect; static int err_shown; +static int draw_width, draw_height; static uint32_t image_width; static uint32_t image_height; static uint32_t image_format; @@ -176,8 +177,12 @@ static int did_render; static void redraw(void); static float video_matrix[16]; +static float osd_matrix[16]; static void resize(void) { + int i; + draw_width = (vo_rotate & 1) ? vo_dheight : vo_dwidth; + draw_height = (vo_rotate & 1) ? vo_dwidth : vo_dheight; // simple orthogonal projection for 0-image_width;0-image_height memset(video_matrix, 0, sizeof(video_matrix)); video_matrix[0] = 2.0/image_width; @@ -185,6 +190,12 @@ static void resize(void) { video_matrix[12] = -1; video_matrix[13] = 1; video_matrix[15] = 1; + memcpy(osd_matrix, video_matrix, sizeof(osd_matrix)); + if (!scaled_osd) { + // simple orthogonal projection for 0-vo_dwidth;0-vo_dheight + osd_matrix[0] = 2.0/draw_width; + osd_matrix[5] = -2.0/draw_height; + } mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n", vo_dwidth, vo_dheight); if (WinID >= 0) { int left = 0, top = 0, w = vo_dwidth, h = vo_dheight; @@ -194,6 +205,14 @@ static void resize(void) { } else mpglViewport(0, 0, vo_dwidth, vo_dheight); + for (i = 0; i < (vo_rotate & 3); i++) { + int j; + for (j = 0; j < 16; j += 4) { + ROTATE(float, video_matrix[j], video_matrix[j+1]); + ROTATE(float, osd_matrix[j], osd_matrix[j+1]); + } + } + ass_border_x = ass_border_y = 0; if (aspect_scaling() && use_aspect) { int new_w, new_h; @@ -205,11 +224,16 @@ static void resize(void) { scale_x = (double)new_w / (double)vo_dwidth; scale_y = (double)new_h / (double)vo_dheight; video_matrix[0] *= scale_x; + video_matrix[4] *= scale_x; video_matrix[12] *= scale_x; + video_matrix[1] *= scale_y; video_matrix[5] *= scale_y; video_matrix[13] *= scale_y; - ass_border_x = (vo_dwidth - new_w) / 2; - ass_border_y = (vo_dheight - new_h) / 2; + if (vo_rotate & 1) { + int tmp = new_w; new_w = new_h; new_h = tmp; + } + ass_border_x = (draw_width - new_w) / 2; + ass_border_y = (draw_height - new_h) / 2; } mpglLoadMatrixf(video_matrix); @@ -831,16 +855,7 @@ static void do_render_osd(int type) { if (!draw_osd && !draw_eosd) return; // set special rendering parameters - if (!scaled_osd) { - // simple orthogonal projection for 0-vo_dwidth;0-vo_dheight - float matrix[16] = { - 2.0/vo_dwidth, 0, 0, 0, - 0, -2.0/vo_dheight, 0, 0, - 0, 0, 0, 0, - -1, 1, 0, 1 - }; - mpglLoadMatrixf(matrix); - } + mpglLoadMatrixf(osd_matrix); mpglEnable(GL_BLEND); if (draw_eosd) { mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); @@ -874,8 +889,7 @@ static void do_render_osd(int type) { } // set rendering parameters back to defaults mpglDisable(GL_BLEND); - if (!scaled_osd) - mpglLoadMatrixf(video_matrix); + mpglLoadMatrixf(video_matrix); mpglBindTexture(gl_target, 0); } @@ -885,8 +899,8 @@ static void draw_osd(void) if (vo_osd_changed(0)) { int osd_h, osd_w; clearOSD(); - osd_w = scaled_osd ? image_width : vo_dwidth; - osd_h = scaled_osd ? image_height : vo_dheight; + osd_w = scaled_osd ? image_width : draw_width; + osd_h = scaled_osd ? image_height : draw_height; vo_draw_text_ext(osd_w, osd_h, ass_border_x, ass_border_y, ass_border_x, ass_border_y, image_width, image_height, create_osd_texture); } @@ -1463,7 +1477,7 @@ static int control(uint32_t request, voi case VOCTRL_GET_EOSD_RES: { struct mp_eosd_settings *r = data; - r->w = vo_dwidth; r->h = vo_dheight; + r->w = draw_width; r->h = draw_height; r->srcw = image_width; r->srch = image_height; r->mt = r->mb = r->ml = r->mr = 0; if (scaled_osd) {r->w = image_width; r->h = image_height;}

2 1

r36268 - in trunk: fmt-conversion.c libmpcodecs/ae_lavc.c
by reimar 13 May '13

13 May '13

Author: reimar Date: Mon May 13 21:34:44 2013 New Revision: 36268 Log: Do not pass random unsupported data to encoder. Modified: trunk/fmt-conversion.c trunk/libmpcodecs/ae_lavc.c Modified: trunk/fmt-conversion.c ============================================================================== --- trunk/fmt-conversion.c Mon May 13 21:34:43 2013 (r36267) +++ trunk/fmt-conversion.c Mon May 13 21:34:44 2013 (r36268) @@ -180,7 +180,7 @@ static const struct { {AF_FORMAT_S16_NE, AV_SAMPLE_FMT_S16}, {AF_FORMAT_S32_NE, AV_SAMPLE_FMT_S32}, {AF_FORMAT_FLOAT_NE, AV_SAMPLE_FMT_FLT}, - {0, AV_SAMPLE_FMT_NONE} + {AF_FORMAT_UNKNOWN, AV_SAMPLE_FMT_NONE} }; enum AVSampleFormat affmt2samplefmt(int fmt) @@ -206,7 +206,7 @@ int samplefmt2affmt(enum AVSampleFormat if (samplefmt_conversion_map[i].sample_fmt == sample_fmt) break; fmt = samplefmt_conversion_map[i].fmt; - if (!fmt) + if (fmt == AF_FORMAT_UNKNOWN) mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported AVSampleFormat %i\n", sample_fmt); return fmt; } Modified: trunk/libmpcodecs/ae_lavc.c ============================================================================== --- trunk/libmpcodecs/ae_lavc.c Mon May 13 21:34:43 2013 (r36267) +++ trunk/libmpcodecs/ae_lavc.c Mon May 13 21:34:44 2013 (r36268) @@ -199,6 +199,10 @@ int mpae_init_lavc(audio_encoder_t *enco } } encoder->input_format = samplefmt2affmt(lavc_actx->sample_fmt); + if (encoder->input_format == AF_FORMAT_UNKNOWN) { + mp_msg(MSGT_MENCODER,MSGL_ERR, "Audio encoder requires unknown or unsupported input format\n"); + return 0; + } lavc_actx->channels = encoder->params.channels; lavc_actx->sample_rate = encoder->params.sample_rate; lavc_actx->time_base.num = 1;

1 0

r36266 - in trunk: libmpcodecs/img_format.c libvo/gl_common.c
by reimar 13 May '13

13 May '13

Author: reimar Date: Mon May 13 21:34:40 2013 New Revision: 36266 Log: Add NV12/NV21 support to some helper functions. Modified: trunk/libmpcodecs/img_format.c trunk/libvo/gl_common.c Modified: trunk/libmpcodecs/img_format.c ============================================================================== --- trunk/libmpcodecs/img_format.c Sun May 12 03:25:11 2013 (r36265) +++ trunk/libmpcodecs/img_format.c Mon May 13 21:34:40 2013 (r36266) @@ -220,6 +220,11 @@ int mp_get_chroma_shift(int format, int xs = 31; ys = 31; break; + case IMGFMT_NV12: + case IMGFMT_NV21: + xs = 1; + ys = 1; + err = 1; default: err = 1; break; Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sun May 12 03:25:11 2013 (r36265) +++ trunk/libvo/gl_common.c Mon May 13 21:34:40 2013 (r36266) @@ -326,6 +326,8 @@ int glFindFormat(uint32_t fmt, int *bpp, *gl_format = GL_LUMINANCE; *gl_type = GL_UNSIGNED_SHORT; break; + case IMGFMT_NV12: + case IMGFMT_NV21: case IMGFMT_YV12: supported = 0; // no native YV12 support case IMGFMT_Y800:

1 0

r36264 - trunk/libvo/x11_common.c
by reimar 09 May '13

09 May '13

Author: reimar Date: Thu May 9 16:06:19 2013 New Revision: 36264 Log: Avoid duplicating the mouse button handling. Modified: trunk/libvo/x11_common.c Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Thu May 9 16:06:18 2013 (r36263) +++ trunk/libvo/x11_common.c Thu May 9 16:06:19 2013 (r36264) @@ -828,6 +828,7 @@ err: static int handle_x11_event(Display *mydisplay, XEvent *event) { + int key = 0; uint8_t buf[16] = {0}; KeySym keySym; static XComposeStatus stat; @@ -892,15 +893,7 @@ static int handle_x11_event(Display *myd return VO_EVENT_MOUSE; case ButtonPress: -#ifdef CONFIG_GUI - // Ignore mouse button 1-3 under GUI. - if (use_gui && (event->xbutton.button >= 1) - && (event->xbutton.button <= 3)) - return VO_EVENT_MOUSE; -#endif - mplayer_put_key((MOUSE_BTN0 + event->xbutton.button - - 1) | MP_KEY_DOWN); - return VO_EVENT_MOUSE; + key = MP_KEY_DOWN; case ButtonRelease: #ifdef CONFIG_GUI // Ignore mouse button 1-3 under GUI. @@ -908,7 +901,8 @@ static int handle_x11_event(Display *myd && (event->xbutton.button <= 3)) return VO_EVENT_MOUSE; #endif - mplayer_put_key(MOUSE_BTN0 + event->xbutton.button - 1); + key |= MOUSE_BTN0 + event->xbutton.button - 1; + mplayer_put_key(key); return VO_EVENT_MOUSE; case PropertyNotify: {

1 0

r36263 - in trunk/libvo: video_out.h x11_common.c
by reimar 09 May '13

09 May '13

Author: reimar Date: Thu May 9 16:06:18 2013 New Revision: 36263 Log: Avoid duplicating the mouse autohide code. This also avoids calling vo_showcursor for every single event and moves both parts of the autohide code closer to each other. Modified: trunk/libvo/video_out.h trunk/libvo/x11_common.c Modified: trunk/libvo/video_out.h ============================================================================== --- trunk/libvo/video_out.h Thu May 9 16:06:17 2013 (r36262) +++ trunk/libvo/video_out.h Thu May 9 16:06:18 2013 (r36263) @@ -35,6 +35,7 @@ #define VO_EVENT_KEYPRESS 4 #define VO_EVENT_REINIT 8 #define VO_EVENT_MOVE 16 +#define VO_EVENT_MOUSE 32 /* Obsolete: VOCTRL_QUERY_VAA 1 */ /* does the device support the required format */ Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Thu May 9 16:06:17 2013 (r36262) +++ trunk/libvo/x11_common.c Thu May 9 16:06:18 2013 (r36263) @@ -890,44 +890,26 @@ static int handle_x11_event(Display *myd case MotionNotify: vo_mouse_movement(event->xmotion.x, event->xmotion.y); - if (vo_mouse_autohide) - { - vo_showcursor(mydisplay, vo_window); - mouse_waiting_hide = 1; - mouse_timer = GetTimerMS(); - } - break; + return VO_EVENT_MOUSE; case ButtonPress: - if (vo_mouse_autohide) - { - vo_showcursor(mydisplay, vo_window); - mouse_waiting_hide = 1; - mouse_timer = GetTimerMS(); - } #ifdef CONFIG_GUI // Ignore mouse button 1-3 under GUI. if (use_gui && (event->xbutton.button >= 1) && (event->xbutton.button <= 3)) - break; + return VO_EVENT_MOUSE; #endif mplayer_put_key((MOUSE_BTN0 + event->xbutton.button - 1) | MP_KEY_DOWN); - break; + return VO_EVENT_MOUSE; case ButtonRelease: - if (vo_mouse_autohide) - { - vo_showcursor(mydisplay, vo_window); - mouse_waiting_hide = 1; - mouse_timer = GetTimerMS(); - } #ifdef CONFIG_GUI // Ignore mouse button 1-3 under GUI. if (use_gui && (event->xbutton.button >= 1) && (event->xbutton.button <= 3)) - break; + return VO_EVENT_MOUSE; #endif mplayer_put_key(MOUSE_BTN0 + event->xbutton.button - 1); - break; + return VO_EVENT_MOUSE; case PropertyNotify: { char *name = @@ -977,6 +959,12 @@ int vo_x11_check_events(Display * mydisp XNextEvent(mydisplay, &Event); ret |= handle_x11_event(mydisplay, &Event); } + if (vo_mouse_autohide && (ret & VO_EVENT_MOUSE)) + { + vo_showcursor(mydisplay, vo_window); + mouse_waiting_hide = 1; + mouse_timer = GetTimerMS(); + } return ret; }

1 0