Commit Graph

144 Commits

Author SHA1 Message Date
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
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
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 06be6b7135 Removed superfluous XFlush calls before XSync.
Original patch by Piotr Neuman <sikkh@wp.pl>
extended by Joey to cover all X11 code
modified by me to only do the above stated change.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13057 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-20 09:41:13 +00:00
reimar d7d2ea1551 removed saver_on, saver_off calls, they are already in x11_common.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12896 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-25 12:49:01 +00:00
attila 0e4e21aac5 major reindentation of x11 code try #2
note that this is plain ident output, i didnt tweak it by
hand like the last attempt.

if anyone is interested in the indent profile i used, just drop me a mail.

please contact me on irc on how to send me my share of cola,
but be aware that i will only accept swiss or german cola, as the japanese is
way to sweet :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12583 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-14 04:53:03 +00:00
alex a5bd70e04f just the same include reordering as in vo_xv (codemetics :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11691 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-27 19:45:54 +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
gabucino fadce2d781 many small typo and grammar fixes
Based on Bernard Leak's mail <bernard 4t brenda-arkle.demon.co.uk>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11001 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-04 17:29:08 +00:00
mosu 908e6a761d Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10758 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-31 22:27:10 +00:00
attila 8a7b7a430d geometry support for x11
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10729 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-31 12:33:49 +00:00
michael 5b882e5130 vf_scale.h & related cleanup & some small warning fix by dominik
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10234 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-06-01 21:59:29 +00:00
alex a0fce62fd3 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10213 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-30 18:05:49 +00:00
alex b80b0cadd3 swscaler doesn't recognizes support for BGR1/BGR4 too, and so if forced it crashes, without checking the swsContext
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10178 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-23 21:20:12 +00:00
alex 5b6efa44b2 that works correctly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10177 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-23 20:35:56 +00:00
michael 20faf3dc0d 10000l (YUV vs. YVU swscale fix/cleanup)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9698 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-27 16:04:53 +00:00
michael 41b847f6a8 sws_ prefix, more seperation between internal & external swscaler API
sws_scale() returns the number of outputed lines


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9495 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-23 22:05:55 +00:00
arpi 127530fe9f The reason why mplayer crashes (in some cases) when using x11
output and -wid (>0) parameter is this:

Mplayer by default creates a colormap using DirectColor visual. If the
window given to mplayer uses TrueColor visual there will be an error
when mplayer sets the colormap for the window. This patch
modifies mplayer to use TrueColor visual if the window given to mplayer
uses TrueColor. Another solution is to make sure that the window given to
mplayer is created using DirectColor visual if it is supported by the
display.

Jouni Tulkki <jitulkki@cc.hut.fi>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9279 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-04 18:31:44 +00:00
arpi 1bf956391f MPlayer crash when using -wid and -vo x11 parameters.
I don't understand very well why my fix works.
Jouni Tulkki <jitulkki@cc.hut.fi>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9116 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-26 22:24:17 +00:00
alex 6811f96358 removed get_info, using the same sheme as in libmpcodecs instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8149 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-11 15:22:10 +00:00
arpi e5947d8b27 here is a somewhat generic equalizer implementation for the X11 vo drivers
using the window's colormap (DirectColor).
this method is using the video card's hardware gamma ramp so it involves
no performance penalties at all.
patch by lucho <lucho@haemimont.bg>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7965 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-29 20:27:47 +00:00
pontscho 0020017268 fix memleak
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7766 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-16 22:44:09 +00:00
pontscho 898e7af0fb -fixed-vo support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7765 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-16 22:29:00 +00:00
arpi db608ffa2f since draw_slice() supports RGB/BGR, we don't need draw_image() for stride
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7690 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-09 22:44:07 +00:00
arpi 329c4e88c3 - implemented draw_image()
- removed unneeded if(!gui) from preinit


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7684 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-09 20:32:41 +00:00
arpi dbb902acc6 -nograbpointer, based on old patch by Christian Ohm <chr.ohm@gmx.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7540 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-28 20:09:14 +00:00
jkeil d0e59b4ff9 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
function.  This is useful for framebuffers on Sun hardware, where we have
multiple truecolor visuals of different depths available, and the root
window typically runs at depth 8, yet there are 24 bit true color visuals
available as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7257 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-03 18:10:42 +00:00
alex 64bedd9683 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7125 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 21:32:32 +00:00
arpi 1d17fa69c3 ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
patch Kazunori Ueno <jagarl@creator.club.ne.jp>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6954 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-09 17:43:49 +00:00
arpi 52dd13f8c0 initial window size (-xy) fixed - patch by Kazunori Ueno <jagarl@creator.club.ne.jp>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6859 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-31 19:40:33 +00:00
atmos4 bf2793f39d Silly me, vo_x11 doesn't use my aspect code!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6705 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-11 16:14:55 +00:00
atmos4 1073092976 1000l, back out hack-n-slay 8bpp code from my local tree.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6695 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-10 08:36:27 +00:00
atmos4 f8e68b858f Markus Rechberger <revenger at shell.dnload.com>:
XMapWindow (vo_x11.c didn't map the Window after using -wid 0x....)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6694 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-10 04:58:51 +00:00
atmos4 2294920c35 -vm -fs -zoom fix, set correct vm screenres in aspect code (similar to xv fix).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6693 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-10 04:11:59 +00:00
albeu 1fbfd704be Destroy the old win when config is called multiple times
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6181 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-24 21:58:05 +00:00
arpi e6bcec1c6b some cleanup, gl/gl2 updated to use vo_window
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6096 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-14 23:44:35 +00:00
alex 8e929ea0a8 disable bgr8
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6081 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-13 20:56:08 +00:00
arpi deb89d89a5 bad fix removed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6064 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-12 20:48:17 +00:00
pontscho 762d6ac6aa fix Arpi's bugs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6060 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-12 16:01:08 +00:00
pontscho fc7a24a483 fix Nil's vo_x11 bug (Nilmoni Deb <ndeb@ece.cmu.edu>)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6046 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-11 16:54:15 +00:00
pontscho e6215bef40 fix some small bug and -rootwin
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6044 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-11 14:57:41 +00:00
arpi 7151c375c4 some reorder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6026 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-09 00:45:36 +00:00
pontscho 5a26c56aad -zoom, -fs with x[11|mga|v] fix -- round two
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6017 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-08 20:24:35 +00:00
pontscho 1bff6e8bc3 some bugfix, x[11|mga|v] ( fullscreen with more files )
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6014 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-08 16:41:44 +00:00
pontscho a1f7ba2ba7 fix -fs and 'f'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6000 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-06 16:56:41 +00:00
pontscho b6004b1b7c fix xmga fs, resize to movie size and mouse auto hide + dga
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5956 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-03 20:57:13 +00:00
pontscho 5e1d8aafed fix aspect ratio handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5946 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-03 13:12:46 +00:00
albeu d611fcc378 printf to mp_msg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5936 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-02 10:49:55 +00:00
pontscho 51f5418bd8 fix fullscreen (?)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5836 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-25 21:52:47 +00:00