mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code
33,867 Commits 40 Branches 85 Tags 155 MiB
34b3a9c5e9
Commit Graph

113 Commits

Author SHA1 Message Date
reimar
70dbf549e6 More robust w32 -wid size handling 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28074 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-03 10:54:01 +00:00
reimar
23a8967a4c Reindent after previous commit 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28073 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-03 10:42:53 +00:00
reimar
c4386a8333 Do not override the vo_dwidth/vo_dheight values in vo_w32_config 
in -wid mode because we ignore the requested size in that case. 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28072 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-03 10:38:50 +00:00
Uoti Urpala
a6af927ea1 w32_common.c, vo_direct3d.c: Fix Windows compilation issues 
In w32_common.c the special "old_vo_defines.h" header was included too
late. vo_direct3d.c was copied from svn without fixing the type of the
control() function.
 2008-12-02 20:15:45 +02:00
Uoti Urpala
6cbca28085 Merge svn changes up to r27979 2008-11-22 19:16:43 +02:00
diego
529028ff5d cosmetics: typo fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27975 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-21 19:32:19 +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
Uoti Urpala
1715c2a336 Merge svn changes up to r27949 
Conflicts:
	common.mak
	libvo/vo_xv.c
	libvo/x11_common.c
	libvo/x11_common.h
	stream/cache2.c
 2008-11-17 20:50:23 +02: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
Uoti Urpala
c172b5355f libvo: Move aspect.c static variables to vo struct 
This moves non-option variables. aspect.c still defines option globals.
 2008-05-01 11:02:26 +03:00
Uoti Urpala
423b95bf5c input: Move cmd_queue to context struct 
Menu instances now also need a input context pointer to queue commands.
 2008-04-30 14:46:21 +03:00
Uoti Urpala
a2212a71a7 Remove vo_depthonscreen references from non-X VOs 
X-specific code uses this global as its internal variable (assuming
that X is initialized if it is set). While using non-X VOs the
variable is not accessed outside the VO. So make those VOs use their
own variables instead of the global vo_depthonscreen.
 2008-04-23 13:46:40 +03:00
Uoti Urpala
bfe569b76e Move vo_ontop to options struct 
Add a 'struct vo *vo' argument to the x11_common.c functions that
access the variable so it's available as vo->opts->vo_ontop. To keep
VOs using the old API working create a global vo variable that is set
to the currently used old vo. "vo_ontop" will be #defined to
"global_vo->opts->vo_ontop", and x11_common.h will add defines like
the following when it is included by old VOs:
 #define vo_x11_ontop() vo_x11_ontop(global_vo)
so that they will call the function according to the new declaration.
 2008-04-23 13:41:06 +03:00
reimar
b8abe420bc Make some variables static. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25978 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-10 19:58:05 +00:00
reimar
6201d6027d Avoid a useless extra pointer variable. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25977 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-10 19:55:15 +00:00
reimar
7c763876c7 Do not uselessly erase background, OpenGL will take care of drawing everything. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25976 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-10 19:47:54 +00:00
reimar
2272b20c3d Avoid -wid message processing blocking MPlayer. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25974 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-10 16:49:24 +00:00
reimar
c5decb0718 Forward mouse messages to -wid Window. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25972 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-10 10:01:25 +00:00
reimar
a09d0bac78 Make sure the -wid window does not get notified when we destroy our attached child window. 
Previous behaviour seems to cause QT to do something stupid which makes
DestroyWindow hang (SMPlayer is an application where this happened).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25966 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-09 14:47:10 +00:00
reimar
83834ac968 Hack: Create a child window for Windows OpenGL with -wid, since (esp. nVidia) 
drivers have problems drawing in other processes' windows. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25965 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-09 14:14:35 +00:00
reimar
8b068da7ad Implement keepaspect for Windows OpenGL vos. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25950 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-02 17:22:07 +00:00
reimar
2b316697f3 Avoid some pointer conversion warnings (the code is messy but not wrong) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25815 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-20 09:50:50 +00:00
reimar
da28fa2ab2 Fix some function types from unspecified to empty argument list 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25813 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-20 09:40:15 +00:00
reimar
058d1f0886 Fix the bug where the window would become smaller each time vo_ontop is toggled. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25747 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-13 21:01:30 +00:00
reimar
7b9f20c0ab Fix compilation after patch to remove global vo_hdc 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24335 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-03 13:18:26 +00:00
reimar
e1e588421f Remove global vo_hdc, since it is recommended to release a DC as soon as possible. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24334 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-03 08:44:36 +00:00
reimar
265c1a174e Hack around some fullscreen issues with gl under Windows 
(non-fullscreen window would not always return to original size).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23607 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-22 22:06:58 +00:00
rathann
259cfbe7e2 Code cleanup: don't include a .c file in mplayer.c and fix a few 
"implicit declaration of function ‘mplayer_put_key’" warnings

Based on Attila's suggestions.
Approved by Uoti and Ivan.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22841 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-29 17:16:11 +00:00
reimar
edfdc4c0b5 Add support for tracking mouse movements. 
Patch by Zuxy Meng (zuxy meng at gmail com)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22441 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-04 13:20:51 +00:00
reimar
51d6a768c7 Whitespace-only cosmetics: get rid of all remaining tabs 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22434 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-04 10:39:02 +00:00
reimar
ad90e64ad9 Generate resize events when size of -wid window changes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22433 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-04 10:30: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
1719ee50e2 Adapt code to annoying ShowCursor semantics (increases/decreases and returns 
an internal variable, cursor is show when this variable is >= 0)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20988 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-17 17:44:51 +00:00
reimar
97a3016cae Hack around Windows focus problem with -vo gl 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20673 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-04 21:44:53 +00:00
reimar
2de69adf98 Remove completely useless cursor variable. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20671 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-04 19:19:03 +00:00
reimar
15b474c59e Support backspace for -vo gl/gl2 under Windows 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20613 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-02 18:42:07 +00:00
reimar
384cb8f2a3 Fix window size bug when starting with -fs and returning 
to windowed mode


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18992 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-10 10:22:29 +00:00
reimar
4ccabac9ba Do not fiddle (too much) with external (WinID) windows 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18953 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-08 14:57:25 +00:00
reimar
6d8ee8674d Convince windows to allow window sizes > screen size 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18932 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-07 11:14: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
9e88af0e0c 10l, forgot to move aspect_save_screenres in last commit 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18090 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-14 11:23:03 +00:00
reimar
c711faab44 correct fullscreen size 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18086 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-13 21:47:21 +00:00
reimar
9c188dbd5f define MONITOR_DEFAULTTOPRIMARY if necessary, some mingw version seem to miss it 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18082 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-12 20:17:07 +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
reimar
552a2eab0b WM_PAINT is the "expose" event, not WM_ACTIVATE 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17127 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-07 15:53:02 +00:00
reimar
33d32ef193 Fix message handling, process resize events 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17116 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-06 22:15:03 +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
albeu
374db42e17 libvo input cleanup: remove the dependency on libinput, 
remove most of the crappy mappings (like O->o or ESC->q).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16893 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-11-02 21:50:55 +00:00
reimar
999c4374c6 DestroyWindow must be used when -wid was not given, so for WinID < 0, not >=0 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16289 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-08-22 09:05:18 +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
a96150da85 10l, initializers don't work without a declaration :-( 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16227 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-08-14 23:16:17 +00:00
reimar
3cf870e26b Cleanup, move declarations to beginning of block. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16214 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-08-14 10:30:18 +00:00
reimar
1feebc74c7 OpenGL fixes for windows and vo_gl.c ported to windows. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16110 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-07-26 13:47:18 +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
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
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
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
reimar
e11a5c3051 applied old patch that was missing an include... 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12937 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-08-02 15:02:35 +00:00
reimar
4cd760385d support for passing mouse events on to MPlayer 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12928 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-08-01 20:13:42 +00:00
faust3
e65a6fc09c replace WM_DESTROY with WM_CLOSE to make it possible to play multiple files, patch by Reimar Doeffinger 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12005 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-02-29 17:42:49 +00:00
joey
640f93d018 runtime 'stay-on-top' functionality 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11543 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-11-30 16:36:10 +00:00
faust3
0d327f00f2 change vo_w32_fullscreen to behave like vo_x11_fullscreen patch by Reimar Doeffinger <someone-guy at gmx.de> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11480 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-11-16 14:37:42 +00:00
faust3
ae1496e7df vo_gl2 port to win32 patch by Tristan Seligmann <mithrandi-mplayer-dev-eng at mithrandi.za.net> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10881 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-09-19 14:33:51 +00:00