aboutsummaryrefslogtreecommitdiffhomepage
path: root/libvo/vo_xv.c
Commit message (Collapse)AuthorAge
...
| * Get rid of (besides useless assignments) unused XSizeHints variableGravatar reimar2008-11-15
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27922 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace some of the different inconsistent XGetGeometry uses by aGravatar reimar2008-11-15
| | | | | | | | | | | | | | vo_x11_update_geometry function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27919 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove a useless XGetGeometry call, the X11 event handling already takes ↵Gravatar reimar2008-11-15
| | | | | | | | | | | | care of this. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27918 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove code from unused and since ages deprecated draw_frame function.Gravatar reimar2008-11-15
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27917 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove vo_xv code that has been under #if 0 since ages.Gravatar reimar2008-11-15
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27916 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix grammar of comment and sync it with vo_x11.cGravatar reimar2008-11-15
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27912 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27441Gravatar Uoti Urpala2008-08-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * Change a bunch of X11-specific preprocessor directives.Gravatar diego2008-08-04
| | | | | | | | | | | | | | Switch from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Gravatar Uoti Urpala2008-08-02
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Rename two GUI-related preprocessor directives:Gravatar diego2008-07-30
| | | | | | | | | | | | | | HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Create a context struct for OSD stateGravatar Uoti Urpala2008-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit creates the struct and passes it to some functions that needs to access OSD state but does not yet move much data from globals to it. vf_expand accesses the OSD state for rendering purposes outside of the normal OSD draw time. The way this currently works is suboptimal, but I did not attempt to clean it up now. To keep things working the same way vf_expand needs to know the address of the state object to be able to access the data even in the functions that should normally not need it. For that purpose this commit adds a VFCTRL to tell vf_expand the address of the object.
* | Merge svn changes up to r27092Gravatar Uoti Urpala2008-06-17
|\| | | | | | | | | | | | | | | Conflicts: libmpdemux/demuxer.c libvo/vo_xv.c mencoder.c
| * Move message about which adapter is used to verbose mode.Gravatar diego2008-06-15
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27063 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove useless parentheses from from return statements.Gravatar diego2008-05-16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vo_xv: Fix port selectionGravatar Uoti Urpala2008-05-15
| | | | | | | | | | | | Port selection was broken in conversion to new VO API (the user setting was parsed to a variable that then wasn't used for anything). Fix by parsing it to the x11 struct xv_port variable.
* | Merge svn changes up to r26783Gravatar Uoti Urpala2008-05-15
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * Add a new suboption to -vo xv and -vo xvmc that allows selectionGravatar ben2008-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | of XVideo adaptor to be used (instead of default one, which is #0). This is useful for example if you'd rather like to use the original Overlay renderer of your GPU instead of the texture blitting engine (which is usually default), which is number one cause of nasty video tearing effects. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26762 b3059339-0415-0410-9bf9-f77b7e298cf2
* | libvo: Move aspect.c static variables to vo structGravatar Uoti Urpala2008-05-01
| | | | | | | | This moves non-option variables. aspect.c still defines option globals.
* | input: Move key filedescriptor list to context structGravatar Uoti Urpala2008-04-30
| | | | | | | | | | The context variable is now passed to VOs too as it's now needed to add a callback on the X filedescriptor.
* | Add a context for mp_fifoGravatar Uoti Urpala2008-04-29
| | | | | | | | | | Store data in an allocated context and take it as an argument instead of using static variables.
* | input: Remove separate mp_input_add_event_fdGravatar Uoti Urpala2008-04-29
| | | | | | | | | | | | | | | | 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 structGravatar Uoti Urpala2008-04-23
| |
* | Move vo_mouse_autohide,vo_wm_type,vo_fs_type,vo_fs_flip to x11 structGravatar Uoti Urpala2008-04-23
| |
* | Move vo_gc,f_gc,vo_hints to x11 structGravatar Uoti Urpala2008-04-23
| |
* | Move xv_port,xv_colorkey,xv_ck_info to x11 structGravatar Uoti Urpala2008-04-23
| |
* | Move vo_window to x11 structGravatar Uoti Urpala2008-04-23
| |
* | Move static X11 atoms to structGravatar Uoti Urpala2008-04-23
| |
* | Move vo_screenwidth,vo_screenheight to options structGravatar Uoti Urpala2008-04-23
| |
* | Move vo_dx,vo_dy,vo_dwidth,vo_dheight to vo structGravatar Uoti Urpala2008-04-23
| |
* | Move global vo_config_count to vo structGravatar Uoti Urpala2008-04-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 structGravatar Uoti Urpala2008-04-23
| |
* | Allocate vo struct with tallocGravatar Uoti Urpala2008-04-23
| | | | | | | | | | Also allocate the private vo_xv struct as a child and remove explicit free() for it.
* | Move vo_ontop to options structGravatar Uoti Urpala2008-04-23
| | | | | | | | | | | | | | | | | | | | | | 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 casesGravatar Uoti Urpala2008-04-23
| | | | | | | | | | | | | | | | | | 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 robustGravatar Uoti Urpala2008-04-23
| | | | | | | | | | | | 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 varsGravatar Uoti Urpala2008-04-23
| | | | | | | | | | | | | | | | 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 changesGravatar Uoti Urpala2008-04-23
| | | | | | | | | | 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 APIGravatar Uoti Urpala2008-04-23
| |
* | Add a context argument to mp_input_add_event_fd callbackGravatar Uoti Urpala2008-04-23
| |
* | vo_xv.c: Remove #if 0 codeGravatar Uoti Urpala2008-04-23
| |
* | Remove variable arguments from vo control() functionsGravatar Uoti Urpala2008-04-23
| | | | | | | | | | 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 passingGravatar Uoti Urpala2008-04-23
|/ | | | | | | | 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.Gravatar cehoyos2008-02-14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25995 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo fix: inited --> initializedGravatar diego2008-02-14
| | | | 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.Gravatar reimar2007-12-02
| | | | | | | | 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 constGravatar reimar2007-12-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fix:Gravatar diego2007-08-28
| | | | | | | | 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 xvGravatar uau2007-08-25
| | | | | | | | | 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 variablesGravatar reimar2007-06-27
| | | | 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 moreGravatar reimar2007-06-27
| | | | | | | | | 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