1
0
mirror of https://github.com/mpv-player/mpv synced 2025-02-21 23:36:58 +00:00
Commit Graph

2668 Commits

Author SHA1 Message Date
reimar
f525ba25e7 Cosmetics: rename variables etc. in vo_direct3d.c
Patch by Georgi Petrov (gogothebee gmail com)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27962 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-20 15:13:14 +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
82e0e9055a Simplify conditions in direct3d vo: remove == 1, change == 0 to ! etc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27959 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-19 13:39:07 +00:00
reimar
0ebdbc02d8 Add missing "static" qualifiers to vo_direct3d
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27957 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-18 14:51:54 +00:00
reimar
af25bb3acf 100l, the video_out_drivers list must be sorted by priority, not
alphabetically. For now, vo_directx should be preferred over
vo_direct3d.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27956 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-18 13:18:55 +00:00
reimar
af366bff51 Direct3D based video_out module.
Patch by Georgi Petrov (gogothebee gmail com)
Panscan handling is still disabled and needs to be fixed for negative
-panscan.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27955 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-18 12:23:42 +00:00
reimar
04d6de5ee2 Doxygen documentation for w32_common.c
Patch by Georgi Petrov (gogothebee gmail com) with several modifications by me.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27954 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-18 12:23:23 +00:00
reimar
330e951cf0 Remove a useless XGetGeometry call, the X11 event handling already
updates vo_dwidth/vo_dheight.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27946 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-17 13:12:01 +00:00
reimar
d12df3ab12 Get rid of (besides useless assignments) unused XSizeHints variable
in vo_xvmc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27942 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-16 17:16:08 +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
f5ce35ec8c Remove a duplicated vo_x11_selectinput_witherr
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27936 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 22:49:49 +00:00
reimar
554ce917df respect -vf dsize etc. also for -rootwin, just like vo_xv does.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27935 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 22:48:41 +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
4fa4e8744d include limits.h for INT_MAX.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27927 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 19:06:25 +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
ebff32237b Set modeline_width/height to sane values in vo_vm_switch even when
the XF86VidMode extension is not available.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27921 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:11:10 +00:00
reimar
8b0b5bee77 Cosmetics: remove useless "extern"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27920 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 17:48:27 +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
08367541bc vo_x11: do not replace the vo_gc created by the Gui.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27915 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 16:34:44 +00:00
reimar
60b5834701 Cosmetic changes to vo_x11 to reduce diff to vo_xv for future refactoring.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27914 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 15:50:47 +00:00
reimar
e0a4769570 Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27913 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 14:24:32 +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
reimar
930c37da56 Fix ati-hack to work again with ATI 8.9 and later drivers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27908 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-14 10:31:15 +00:00
reimar
36dade7693 Use the proper IMGFMT_RGB24 and IMGFMT_BGR24 defines instead of
IMGFMT_RGB|24 and IMGFMT_BGR|24.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27907 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-13 19:05:07 +00:00
reimar
69c3d22e00 Fix Windows OpenGL -wid:
Disable the Window instead of explicitly passing on click events.
This also makes Drag-and-Drop work if the -wid window supports it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27904 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-11 19:21:36 +00:00
reimar
14eb21fce0 For fragment programs, check GL_MAX_TEXTURE_IMAGE_UNITS instead of GL_MAX_TEXTURE_UNITS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27899 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-06 18:39:37 +00:00
diego
69ad7080f9 Add #include <string.h> for memset.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27896 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-04 21:00:29 +00:00
reimar
c9f2a3636c Change OpenGL support to work on unmodified MinGW64
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27879 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-02 16:37:45 +00:00
ben
b086fadb3d Remove X11 backing store: this is now a useless flag.
Also, it is mandatory for Xserver 1.5.x (part of Xorg 7.4, shipped on all
Linux distributions starting from Oct. 08) and will be removed
from Xserver 1.6 anyhow ...

Patch by Stephane Marchesin (marchesin at icps dot u dash strasbg dot fr).

For more info, see long flame thread at:
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2008-August/058323.html



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27849 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-29 22:03:36 +00:00
diego
33f7abfe2c Improve error message when screen width and height are not set.
patch by Christian Ohm, chr.ohm gmx net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27802 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-19 11:47:46 +00:00
faust3
fe44156133 fixed image format detection for 15 bit color depths
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27796 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-17 10:01:44 +00:00
diego
26b29f4f2d Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.
We were using an inconsistent mix of the three variants and 'volatile' should
be the most correct and portable variant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27791 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 20:17:56 +00:00
diego
6b52a2e974 Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
Neither variant is valid C99 syntax, but __asm__ is the most portable variant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27788 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 18:59:27 +00:00
diego
a290af1657 Move X11_FULLSCREEN definition to x11_common.h where it belongs.
config.h should only contain option definitions, no logic.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27784 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 18:19:36 +00:00
faust3
beef14987b fixed overlay x and y calculation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27782 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 18:13:26 +00:00
faust3
c27f719237 Honour differences between src and dst stride for packed yuv
patch by Laurent <laurent.aml at gmail.com>
 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27772 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 22:28:19 +00:00
diego
4d644f513c Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
This avoids a pointless indirection that only obscures what is really done.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27761 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 16:23:55 +00:00
diego
9992cbd580 Surround conditionally used function with corresponding #ifdef, fixes:
libvo/vo_gl2.c:681: warning: 'gl_handlekey' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27754 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 14:40:58 +00:00
diego
1d5af8c0da Remove redundant variable declaration, fixes the warning:
libvo/vo_winvidix.c:52: warning: redundant redeclaration of 'hWnd'
libvo/vo_winvidix.c:50: warning: previous declaration of 'hWnd' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27753 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 14:38:36 +00:00
diego
73357cc804 Add missing support for some multimedia keys to X11 backend code.
patch by Jorge Lopez, jorgelt gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27747 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-12 15:58:44 +00:00
cehoyos
22bb046adc Replace numeric constants by their defines.
Fixes icc warning #188: enumerated type mixed with another type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27738 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-09 17:08:47 +00:00
diego
e965e29432 Add missing #include for mplayer.h, fixes the warning:
libvo/vo_png.c:67: warning: implicit declaration of function 'exit_player'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27687 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-03 10:18:53 +00:00