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

204 Commits

Author SHA1 Message Date
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
al
fb8da06ed7 Test if source image dimensions are too big.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16959 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-10 02:39:31 +00:00
ivo
cd55954e4e Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
return values can be negative (VO_ERROR, VO_NOTAVAIL and VO_NOTIMPL), so it's
changed to int now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16172 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 01:24:37 +00:00
reimar
85626ef1aa Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15827 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-27 10:05:39 +00:00
al
362be18be6 Make -wid behave more consistent.
Original patch by kiriuja |mplayer-patches >ta< en-directo >tod< net|


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15541 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-21 17:31:44 +00:00
henry
dbb001bae2 replace VO and VF numeric flags with #defined identifiers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15213 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-18 15:52:38 +00:00
henry
fa7fe564bb more colorkey w/ panscan woes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15193 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-16 17:10:31 +00:00
henry
9946de0944 redraw colorkey on panscan change
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15191 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-16 16:45:43 +00:00
al
c3105be29a - fix black screen problem on reinit
- disable colorkey autopainting when painting it manually


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15187 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-16 15:52:03 +00:00
al
bc52a8e25b Always use vo_x11_sizehint function ( even when going fullscreen ) to
reflect at least the window aspect behaviour.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14798 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-24 17:46:19 +00:00
al
0df8c299bd Don't change buffers when paused and redrawing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14783 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-23 12:23:44 +00:00
al
f366d01286 Unified colorkey code for vo xv and vo xvmc.
Made the code also more flexible.

Colorkey drawing is now by default done as
proposed by Marko Macek.

Patch also approved by iive.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14743 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-20 22:43:25 +00:00
iive
b3dcfc7ec6 3 memory leaks fixed
Xlib funtions allocate memory that should be freed appropriately


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13954 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-15 14:56:18 +00:00
diego
56a40089dd devices.html is no more, links updated.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13915 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-11 02:24:23 +00:00
diego
5b0d96c6b4 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13788 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-28 01:15:53 +00:00
al
80098f9851 We don't need to support the old nvidia binary driver bug any longer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13243 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-03 20:22:22 +00:00