summaryrefslogtreecommitdiffstats
path: root/libvo/vo_xv.c
Commit message (Collapse)AuthorAgeFilesLines
* Add a context for mp_fifoUoti Urpala2008-04-291-2/+3
| | | | | Store data in an allocated context and take it as an argument instead of using static variables.
* input: Remove separate mp_input_add_event_fdUoti Urpala2008-04-291-4/+7
| | | | | | | | Use the same mp_input_add_key_fd for all uses and add a context argument to its callback that was before only in the event fd callbacks. Instead of checking in input.c whether keys were inserted to the keypress FIFO during the callback do the check in the callback before returning and set return value accordingly.
* Move mRootWin,mScreen,mLocalDisplay to x11 structUoti Urpala2008-04-231-3/+3
|
* Move vo_mouse_autohide,vo_wm_type,vo_fs_type,vo_fs_flip to x11 structUoti Urpala2008-04-231-1/+1
|
* Move vo_gc,f_gc,vo_hints to x11 structUoti Urpala2008-04-231-5/+5
|
* Move xv_port,xv_colorkey,xv_ck_info to x11 structUoti Urpala2008-04-231-20/+20
|
* Move vo_window to x11 structUoti Urpala2008-04-231-16/+17
|
* Move static X11 atoms to structUoti Urpala2008-04-231-1/+1
|
* Move vo_screenwidth,vo_screenheight to options structUoti Urpala2008-04-231-7/+8
|
* Move vo_dx,vo_dy,vo_dwidth,vo_dheight to vo structUoti Urpala2008-04-231-39/+39
|
* Move global vo_config_count to vo structUoti Urpala2008-04-231-1/+1
| | | | | | | | | | | | | | | | | | Remove the global and Add a corresponding field to the vo struct, plus another which tells whether the LAST config call was successful.The latter value which tells whether the VO should be properly configured at the moment seems a better match for the semantics actually needed in most places where the old value was used. The 'count' field with the old semantics is not currently used by anything, but I'm leaving it there for vo drivers which would need those semantics if converted to use the struct. Existing uses of the global outside old vo drivers are either converted to use the struct field or moved inside the vo_xyz() calls (instead of "if (vo_config_count) vo_flip_page(..." just call vo_flip_page which will now do nothing if not configured). The removal of the check in mpcommon.c/update_subtitles() is less trivial than the others, but I think it shouldn't cause problems.
* Move global mDisplay to x11 state structUoti Urpala2008-04-231-50/+54
|
* Allocate vo struct with tallocUoti Urpala2008-04-231-3/+2
| | | | | Also allocate the private vo_xv struct as a child and remove explicit free() for it.
* Move vo_ontop to options structUoti Urpala2008-04-231-5/+7
| | | | | | | | | | | 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.
* vo_xv: Free resources in error casesUoti Urpala2008-04-231-9/+19
| | | | | | | | | If preinit() failed after allocating some resources it didn't free them. Also if preinit() completed but all (if any) calls to config() failed then uninit() it not free resources. Add checks to uninit() to make it safe with only a subset of resources allocated, then make it execute independently of vo_config_count and also make preinit() call it in error cases.
* vo_xv.c: Make reconfig logic more robustUoti Urpala2008-04-231-7/+6
| | | | | | The previous version was not buggy, but this is easier to see correct. Now it doesn't depend on options determining num_buffers staying constant and on vo_config_count.
* vo_xv.c: remove unnecessary #ifdefs and static varsUoti Urpala2008-04-231-11/+4
| | | | | | | | Combine code unnecessarily split in 3 #ifdef blocks into one block and change local variables there were pointlessly declared static to normal ones. After this vo_xv.c no longer defines any global or static variables.
* vo_xv.c: Cosmetic changesUoti Urpala2008-04-231-15/+10
| | | | | Remove an unnecessary inner scope in a function and separate 'i' loop counter variable declared in it, reindent.
* Change vo_xv to use new VO APIUoti Urpala2008-04-231-238/+283
|
* Add a context argument to mp_input_add_event_fd callbackUoti Urpala2008-04-231-2/+4
|
* vo_xv.c: Remove #if 0 codeUoti Urpala2008-04-231-25/+1
|
* Remove variable arguments from vo control() functionsUoti Urpala2008-04-231-1/+1
| | | | | No voctrl uses them any more, and using them would not be a good idea because it makes forwarding arguments to other functions harder.
* Change VOCTRL_[GET|SET]_EQUALIZER argument passingUoti Urpala2008-04-231-18/+4
| | | | | | | | These were the only voctrl types with more than one argument. The second argument was passed using variable arguments. Change them to use a single argument (address of a struct containing both old arguments). This makes forwarding the arguments to other functions easier and allows simplifying code.
* Revert accidentially committed line of r25994.cehoyos2008-02-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25995 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo fix: inited --> initializeddiego2008-02-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark the vo_functions_t definitions as const where possible.reimar2007-12-021-1/+1
| | | | | | | | 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
* Make vo info structs constreimar2007-12-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fix:diego2007-08-281-2/+0
| | | | | | | | 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
* Watch X11 fd in main input select() if using vo xvuau2007-08-251-0/+4
| | | | | | | | | 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
* Remove some unused variablesreimar2007-06-271-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23676 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make X11 window creation and (with -fixed-vo) management simpler and morereimar2007-06-271-38/+3
| | | | | | | | | 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
* Gui --> guidiego2007-04-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, last patch broke window resizing with xv and xvmc.reimar2007-03-081-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22486 b3059339-0415-0410-9bf9-f77b7e298cf2
* Factor out some duplicated code in vo_xv and vo_xvmcreimar2007-03-061-61/+22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22479 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move common vo initialization code to video_out.creimar2007-02-171-16/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22250 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sanity check for vo window dimensions, helps avoid division by zeroreimar2007-02-051-0/+2
| | | | | | | with -wid. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22148 b3059339-0415-0410-9bf9-f77b7e298cf2
* MSGTRs for libvo/aspect.c and libvo/vo_xv.ckraymer2006-11-081-14/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20781 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix window position when changing videos while in fullscreen and forreimar2006-06-151-3/+2
| | | | | | | 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
* do aspect correction of video size before calculating vo_dx and vo_dy.reimar2006-05-141-1/+1
| | | | | | | 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
* Make sure black borders are drawn when switching videos with -fixed-vo.reimar2006-05-041-0/+6
| | | | | | | Alexander Strasser at LinuxTag git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18385 b3059339-0415-0410-9bf9-f77b7e298cf2
* Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with ↵reynaldo2006-04-241-1/+1
| | | | | | lots of corrections git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18235 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix and improve xinerama supportreimar2006-04-161-7/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18117 b3059339-0415-0410-9bf9-f77b7e298cf2
* Test if source image dimensions are too big.al2005-11-101-0/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16959 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the return types of all (six) libvo API functions. Used to be uint32_t, butivo2005-08-051-6/+6
| | | | | | | | 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
* Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.reimar2005-06-271-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15827 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make -wid behave more consistent.al2005-05-211-0/+5
| | | | | | | 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
* replace VO and VF numeric flags with #defined identifiershenry2005-04-181-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15213 b3059339-0415-0410-9bf9-f77b7e298cf2
* more colorkey w/ panscan woeshenry2005-04-161-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15193 b3059339-0415-0410-9bf9-f77b7e298cf2
* redraw colorkey on panscan changehenry2005-04-161-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15191 b3059339-0415-0410-9bf9-f77b7e298cf2
* - fix black screen problem on reinital2005-04-161-1/+0
| | | | | | | - disable colorkey autopainting when painting it manually git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15187 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always use vo_x11_sizehint function ( even when going fullscreen ) toal2005-02-241-3/+1
| | | | | | | reflect at least the window aspect behaviour. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14798 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't change buffers when paused and redrawing.al2005-02-231-19/+37
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14783 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unified colorkey code for vo xv and vo xvmc.al2005-02-201-34/+33
| | | | | | | | | | | | 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
* 3 memory leaks fixediive2004-11-151-2/+7
| | | | | | | Xlib funtions allocate memory that should be freed appropriately git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13954 b3059339-0415-0410-9bf9-f77b7e298cf2
* devices.html is no more, links updated.diego2004-11-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13915 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.diego2004-10-281-1/+1
| | | | | | | 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
* We don't need to support the old nvidia binary driver bug any longer.al2004-09-031-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13243 b3059339-0415-0410-9bf9-f77b7e298cf2
* Removed superfluous XFlush calls before XSync.al2004-08-201-2/+0
| | | | | | | | | 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
* removed saver_on, saver_off calls, they are already in x11_common.creimar2004-07-251-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12896 b3059339-0415-0410-9bf9-f77b7e298cf2
* major reindentation of x11 code try #2attila2004-06-141-534/+748
| | | | | | | | | | | | | | 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
* runtime 'stay-on-top' functionalityjoey2003-11-301-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11543 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/en/ ---> DOCS/HTML/en/diego2003-10-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11184 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix some warnings (define order)pl2003-09-121-13/+21
| | | | | | | remove the static 'i' variable for the module git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10856 b3059339-0415-0410-9bf9-f77b7e298cf2
* hopefully final xv ports.attila2003-09-071-9/+20
| | | | | | | from Jim Hawkins <mplayer@jawkins.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10840 b3059339-0415-0410-9bf9-f77b7e298cf2
* adaptors are not portsattila2003-09-071-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10835 b3059339-0415-0410-9bf9-f77b7e298cf2
* catch negative port numbers, just in caseattila2003-09-061-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10831 b3059339-0415-0410-9bf9-f77b7e298cf2
* add port parameter to -vo xvattila2003-09-061-4/+23
| | | | | | | based on patch from Jean-Yves Simon <lethalwp@tiscali.be> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10827 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid flickering during resizes. Keep video contents even when paused. Fix ↵mosu2003-08-311-21/+17
| | | | | | by Tomas Simonaitis <haden@homelan.lt> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10758 b3059339-0415-0410-9bf9-f77b7e298cf2
* move xv_set_eq to x11_commoniive2003-07-011-133/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10360 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Tom Lees <tal26 (at) cam.ac.uk>attila2003-06-221-3/+5
| | | | | | | | | | | | | | | | | This patch fixes two minor problems the vo_xv driver has: 1. Starting in fullscreen e.g. (mplayer -fs dvd://1) will have a window which doesn't extend all the way down the screen unless you have a 4:3 movie. 2. Monitoraspect is not used so e.g. showing a movie when in 1280x1024 desktop looks wrong. BTW: maybe vo_xv.c should be reindented. it's getting more and more unreadable git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10324 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing language suffix to DOCS/ path.diego2003-06-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10287 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed RGB24 and builtin swscaler supportalex2003-05-161-16/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10114 b3059339-0415-0410-9bf9-f77b7e298cf2
* memleak fix by Raindel Shachar <raindel@techunix.technion.ac.il>alex2003-04-241-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9982 b3059339-0415-0410-9bf9-f77b7e298cf2
* clean up of -geometry code.attila2003-03-021-1/+1
| | | | | | | disabled -geometry for all but -vo xv (will be fixed later) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9518 b3059339-0415-0410-9bf9-f77b7e298cf2
* reversed small part of the r1.135 commit, it broke -fs (random black screen)arpi2003-02-091-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9382 b3059339-0415-0410-9bf9-f77b7e298cf2
*