1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-17 12:25:03 +00:00
Commit Graph

104 Commits

Author SHA1 Message Date
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
reimar
85f88efe84 Lots of cosmetics for gl2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23671 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-26 16:33:43 +00:00
reimar
15d418e19b Remove two unused variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23670 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-26 15:51:51 +00:00
reimar
d3bc927fc4 Remove overly complex and unused per-subtexture "dirty" handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23669 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-26 15:51:49 +00:00
reimar
92542f710b Remove now unused variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23668 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-26 15:51:47 +00:00
reimar
db9f690747 remove useless calloc cast
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23667 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-26 15:51:43 +00:00
reimar
467d176cd1 Remove some unused code and useless error checking that only clutters the code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23665 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-26 15:01:09 +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
3c32a11ae5 Set classhint directly after creating window just as all other vos do, in accordance with ICCCM.
Patch by Mark Tiefenbruck [mark at fluxbox org]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22266 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-18 20:23:25 +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
29a164309f Fix compilation under MinGW with X11 enabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21647 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-17 12:33:09 +00:00
reimar
01d5289203 Improve windows gui support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18954 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 15:00:37 +00:00
reimar
320bcf39be Make header include order more similar to vo_gl.c
Patch by Erik Lunchpail (erik_27can at yahoo com) to ease win32 gui compilation


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18745 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-17 19:43:13 +00:00
reimar
0965bcee43 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18620 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-07 13:24:54 +00:00
reimar
0d0dbd97d8 Avoid crash with e.g. -vo gl2:yuv=2 when no fragment program functions are available
Fix "ported" from vo_gl.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18585 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-05 20:21:25 +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
reimar
d96b09cd64 fixes and cleanup for windows fullscreen switching (restore old position,
fullscreen on current monitor).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18080 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-12 14:11:26 +00:00
rathann
e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.

Comments about a similar patch applied to ffmpeg:

That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter

Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- Måns Rullgård


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 14:08:03 +00:00
reimar
2a15e8beb8 support negative stride (flipping) in vo_gl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17221 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-18 12:04:08 +00:00
reimar
2d065d1c6d signed division must be used for calculation vo_dx and vo_dy.
Fixes a bug that causes overbig windows to disappear on Windows.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17128 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-07 15:56:27 +00:00
reimar
6b9f08f720 Get rid of most #ifdefs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17117 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-06 22:23:06 +00:00
reimar
28b32a786a Enable border toggling for gl and gl2 under windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17007 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-17 20:49:46 +00:00
reimar
1a3e0c3b12 documentation update.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16627 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-01 12:53:49 +00:00
reimar
464df17b27 debugging/testing helpers: allow forcing a certain width/height for textures
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16595 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 16:33:03 +00:00
reimar
98ef94eb18 panscan support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16591 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 16:18:16 +00:00
reimar
d16d2c3e32 Support rectangular texture in fragment programs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16587 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 16:07:54 +00:00
reimar
2abdf6ac43 Fix crashes and green border when using YV12 input format
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16584 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 13:58:18 +00:00
reimar
4e60e039f5 hardware color-space conversion for vo_gl and vo_gl2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16489 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-14 22:08:04 +00:00
reimar
052fc0f4e9 Allow disabling the glFinish call
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16476 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-13 16:16:13 +00:00
reimar
f68be97419 Fix texture format variable types. Internal format is GLint, others are GLenum
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16304 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-25 12:45:57 +00:00
reimar
6f4bba6b61 -wid support for windows. Not well tested, might still behave a bit weird.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16283 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-21 09:59:45 +00:00
reimar
cbd8483a32 Get events from -wid window.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16240 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-16 23:24:52 +00:00
reimar
0f10868e3d use glUploadTex helper function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16225 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-14 19:40:33 +00:00
reimar
5543cc2bf5 textures smaller 64x64 might not be supported
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16223 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-14 19:36:34 +00:00
reimar
c7888c0a7f remove/move some unused headers/variables/code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16222 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-14 19:24:49 +00:00
reimar
f1fcbe1d11 10l, texture_width/height initialization was removed, so use
image_width/height here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16221 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-14 18:36:01 +00:00
reimar
698494f779 Helper function for drawing texture and general cleanup of vo_gl2.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16215 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-14 13:44:14 +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
fd0aa2708e support -wid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15749 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-18 18:32:29 +00:00
reimar
881f0f083f -geometry support for gl2 under win, default window pos centered for gl, gl2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15596 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-30 08:45:21 +00:00
reimar
7322c396a9 Implement -geometry for vo gl and gl2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15590 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-29 17:04:51 +00:00
reimar
cdfb0214ba Remove a lot of duplicate code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14748 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-21 14:44:39 +00:00
reimar
efb6997813 Remove unused defines
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14271 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-29 14:35:18 +00:00
reimar
84fd90d3e4 Improving gl2 under windows, moving some functionality to gl_common
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14143 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-11 16:57:42 +00:00
reimar
d924f1beb1 Move selection of internal texture format to appropriate place, should
be at texture initialization as visual might change.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14091 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-03 00:11:28 +00:00
reimar
c977dab456 More similar code from gl and gl2 moved to gl_common
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14079 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-01 17:05:58 +00:00
reimar
34065ca6f9 Avoid drawing before transformation matrices are set up.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13927 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-13 12:01:20 +00:00
faust3
819ba1a04f 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13878 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-05 13:48:41 +00:00
reimar
a594c4f593 more fullscreen fixes and gl2 uses setGlWindow.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13872 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-04 18:31:55 +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