1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 18:12:22 +00:00
Commit Graph

219 Commits

Author SHA1 Message Date
reimar
f102ac7a8c Fix function declarations to avoid casting function pointers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30164 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 13:18:49 +00:00
reimar
8082e89f6e Remove panscan related conditions and code that only breaks future windowed
aspect and panscan without any real benefit.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29568 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 18:51:02 +00:00
diego
6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
reimar
fca7818668 Setting vo_fs is handled by x11_common.c, so remove that code from vo_xv/vo_xvmc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28864 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-07 08:52:57 +00:00
reimar
05119ecaf6 Make data related to suboption parsing const in libvo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28863 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-07 08:51:40 +00:00
reimar
01ef7e4579 Extend calc_src_dst_rects to also calculate the border values needed for
correctly placed dvdnav highlights, and fix direct3d and vdpau accordingly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28633 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 11:59:49 +00:00
reimar
694c3dc03f Add a calc_src_dst_rects that calculates from window size, panscan etc.
which part of the video source must be scaled onto which part of the window.
Direct3D and (future) VDPAU need this, for XvMC it makes it easier to add
cropping support and Xv is changed to keep the diff to XvMC small.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28546 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 17:40:53 +00:00
diego
befc528297 Add standard license headers, unify header formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-08 03:27:30 +00:00
cehoyos
0fa2d1abd7 Factor calc_drwXY out of vo_xv and vo_xvmc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28285 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-09 15:25:24 +00:00
reimar
9542118efe Simplify handling of VOFLAG_MODESWITCHNG, merge assignment and declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27986 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 12:30:39 +00:00
reimar
be6e3bf79f Remove unused flip_flag variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27985 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 12:25:41 +00:00
reimar
61a0561122 Remove a aspect calculation line.
It is useless because with the new API enabled by VOCTRL_UPDATE_SCREENINFO it
is not necessary because it is already done in video_out.c:config_video_out.
Secondly, the removal of the aspect_save_prescale triggered a regression because of
it, with -wid the window would not be filled completely initially.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27978 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-21 23:22:53 +00:00
reimar
c351d29392 Factor common code like -wid handling, vo_gc creation etc. out into
x11_common.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27961 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-19 20:19:25 +00:00
reimar
8cc27a3561 Remove explicit setting of vo_ontop since that is already done by vo_x11_create_vo_window
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27937 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 23:09:31 +00:00
reimar
936420385a Sync with vo_x11: make sure we get expose events even when drawing to the root window.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27933 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 22:33:36 +00:00
reimar
39e42b26e9 Remove a nonsensical "else" for the video mode switching case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27929 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 19:14:09 +00:00
reimar
55175c457d Remove now unused variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27926 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 19:03:21 +00:00
reimar
21040bb951 Use vo_dwidth/vo_dheight for creating the windows instead of d_width/d_height.
This fixes the -vm bug that the created window is too small.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27925 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:58:14 +00:00
reimar
4b9ee2e206 Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
boiler-plate code with them, just with different bugs.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27924 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:56:25 +00:00
reimar
c8d9e2eb60 Set modified window position and monitor aspect in vo_vm_switch instead of in
individual vo drivers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27923 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:28:35 +00:00
reimar
f2bceedc49 Get rid of (besides useless assignments) unused XSizeHints variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27922 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:14:03 +00:00
reimar
87bee02b19 Replace some of the different inconsistent XGetGeometry uses by a
vo_x11_update_geometry function.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27919 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 17:45:55 +00:00
reimar
252f6d5093 Remove a useless XGetGeometry call, the X11 event handling already takes care of this.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27918 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 17:41:30 +00:00
reimar
18fac2d947 Remove code from unused and since ages deprecated draw_frame function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27917 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 16:40:48 +00:00
reimar
eb4f31f73b Remove vo_xv code that has been under #if 0 since ages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27916 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 16:36:39 +00:00
reimar
f850757249 Fix grammar of comment and sync it with vo_x11.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27912 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 14:21:02 +00:00
diego
82f319af62 Change a bunch of X11-specific preprocessor directives.
Switch from a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-04 06:16:23 +00:00
diego
3b31fa5717 Rename two GUI-related preprocessor directives:
HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 13:44:59 +00:00
diego
c31a0a07c7 Move message about which adapter is used to verbose mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27063 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-15 12:13:29 +00:00
diego
ad603f5559 cosmetics: Remove useless parentheses from from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 08:33:27 +00:00
ben
531000e6ae Add a new suboption to -vo xv and -vo xvmc that allows selection
of XVideo adaptor to be used (instead of default one, which is #0).

This is useful for example if you'd rather like to use the original
Overlay renderer of your GPU instead of the texture blitting engine
(which is usually default), which is number one cause of nasty
video tearing effects.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26762 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-13 17:52:25 +00:00
cehoyos
e78f2ea6dc Revert accidentially committed line of r25994.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25995 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:39:49 +00:00
diego
835c654bb0 typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
reimar
2bf8c692f1 Mark the vo_functions_t definitions as const where possible.
This is not possible for xover and anything supporting vidix
due to horrible hacks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25248 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 14:39:15 +00:00
reimar
909887bdbe Make vo info structs const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 14:06:03 +00:00
diego
9842c21a07 warning fix:
vo_xv.c:63: warning: redundant redeclaration of 'XShmGetEventBase'
/usr/include/X11/extensions/XShm.h:80: warning: previous declaration of 'XShmGetEventBase' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24259 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 10:53:51 +00:00
uau
37babdb3a1 Watch X11 fd in main input select() if using vo xv
Add the X11 fd to main input select() set, and call VO check_events() if
it becomes readable. Only done in vo xv code for now, though would make
sense for other X11-based VOs too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24153 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 04:28:17 +00:00
reimar
e1057f5898 Remove some unused variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23676 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-27 10:28:38 +00:00
reimar
f131aafff1 Make X11 window creation and (with -fixed-vo) management simpler and more
consistent by introducing a new function that handles most of the
ugly things. Changes of behaviour with some vos is unavoidable, bug reports
welcome.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23675 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-27 10:26:13 +00:00
diego
5c9abf7f9f Gui --> gui
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-23 07:42:42 +00:00
reimar
61ee6f358f 100l, last patch broke window resizing with xv and xvmc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22486 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-08 09:42:14 +00:00
reimar
1b12836fca Factor out some duplicated code in vo_xv and vo_xvmc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22479 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-06 15:34:54 +00:00
reimar
0fe4207dfb Move common vo initialization code to video_out.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22250 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-17 20:58:55 +00:00
reimar
3baddb9645 Sanity check for vo window dimensions, helps avoid division by zero
with -wid.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22148 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 17:47:43 +00:00
kraymer
7ae43d3309 MSGTRs for libvo/aspect.c and libvo/vo_xv.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20781 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 14:55:37 +00:00
reimar
37ee8c83cb Fix window position when changing videos while in fullscreen and for
window managers that modify position on Map. Oked by Alexander Strasser.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18718 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-15 08:00:37 +00:00
reimar
ae2eafeb55 do aspect correction of video size before calculating vo_dx and vo_dy.
fixes misplaced video e.g. with -aspect 0.3 (window is not centered but near left border)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18510 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-14 19:36:21 +00:00
reimar
1571808a1a Make sure black borders are drawn when switching videos with -fixed-vo.
Alexander Strasser at LinuxTag


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18385 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-04 08:45:34 +00:00
reynaldo
78417bf0dd Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18235 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 04:23:53 +00:00
reimar
7f3d9de556 Fix and improve xinerama support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18117 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-16 13:38:28 +00:00