summaryrefslogtreecommitdiffstats
path: root/libmenu/vf_menu.c
Commit message (Collapse)AuthorAgeFilesLines
* libmenu: remove OSD menu functionality (--menu)Uoti Urpala2011-10-251-267/+0
| | | | | | | | | | Something like the OSD menu functionality could be useful. However the current implementation has several problems and would require a relatively large amount of work to get into good shape. As far as I know there are few users of the existing functionality. Nobody is working on the existing code and keeping it compiling at all while changing other code would require extra work. So delete the menu code and some related code elsewhere that's used by nothing else.
* cleanup: remove warnings under libmenu/Clément Bœsch2011-06-241-1/+1
|
* sub/OSD: move some related files to sub/Uoti Urpala2011-01-261-2/+2
|
* menu: Move vf_info_menu extern declaration to menu.hdiego2010-11-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32089 b3059339-0415-0410-9bf9-f77b7e298cf2 Mark vf_info_menu declaration as const. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32109 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"Uoti Urpala2010-05-291-6/+6
| | | | | | | Change 'struct vf_instance' pointer arguments to more standard style as in the subject. Also some other minor formatting fixes. Patch by Diego Biurrun.
* input: remove unused "paused" arguments from some functionsUoti Urpala2010-04-251-2/+4
|
* Delete things related to old translation systemUoti Urpala2010-03-101-1/+0
| | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* Implement vsync-aware frame timing for VDPAUUoti Urpala2009-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main things added are custom frame dropping for VDPAU to work around the display FPS limit, frame timing adjustment to avoid jitter when video frame times keep falling near vsyncs, and use of VDPAU's timing feature to keep one future frame queued in advance. NVIDIA's VDPAU implementation refuses to change the displayed frame more than once per vsync. This set a limit on how much video could be sped up, and caused problems for nearly all videos on low-FPS video projectors (playing 24 FPS video on a 24 FPS projector would not work reliably as MPlayer may need to slightly speed up the video for AV sync). This commit adds a framedrop mechanism that drops some frames so that no more than one is sent for display per vsync. The code tries to select the dropped frames smartly, selecting the best one to show for each vsync. Because of the timing features needed the drop functionality currently does not work if the correct-pts option is disabled. The code also adjusts frame timing slightly to avoid jitter. If you for example play 24 FPS video content on a 72 FPS display then normally a frame would be shown for 3 vsyncs, but if the frame times happen to fall near vsyncs and change between just before and just after then there could be frames alternating between 2 and 4 vsyncs. The code changes frame timing by up to one quarter vsync interval to avoid this. The above functionality depends on having reliable vsync timing information available. The display refresh rate is not directly provided by the VDPAU API. The current code uses information from the XF86VidMode extension if available; I'm not sure how common cases where that is inaccurate are. The refresh rate can be specified manually if necessary. After the changes in this commit MPlayer now always tries to keep one frame queued for future display using VDPAU's internal timing mechanism (however no more than 50 ms to the future). This should make video playback somewhat more robust against timing inaccuracies caused by system load.
* Remove trailing whitespace from most filesUoti Urpala2009-07-071-6/+3
|
* Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-2/+2
| | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-2/+2
| | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* Merge svn changes up to r29134Uoti Urpala2009-04-021-4/+0
|\
| * Remove unnecessary malloc.h #includes and related #ifdeffery.diego2009-04-021-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29126 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28641Uoti Urpala2009-02-181-1/+1
|\| | | | | | | | | | | | | | | Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border macro) to use a wrapper macro in old-style VOs which do not provide a VO object argument. Before this function had an explicit global_vo argument in vo_gl/gl2. New vo_vdpau uses it too so use the same mechanism as most other functions.
| * Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:diego2009-02-171-1/+1
| | | | | | | | | | | | | | mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28629 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28149Uoti Urpala2008-12-141-0/+17
|\|
| * Add standard GPL headers.diego2008-12-131-0/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28147 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to 27824Uoti Urpala2008-10-251-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * Remove pointless attribute_used from variable declaration.diego2008-10-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27780 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Rename font-related preprocessor directives.diego2008-08-071-1/+1
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
| * cosmetics: Remove useless parentheses from return statements.diego2008-05-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove _s/_st suffix from some struct namesUoti Urpala2008-04-251-6/+6
| | | | | | | | | | Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless.
* | Add new video driver APIUoti Urpala2008-04-231-2/+2
|/ | | | | | | | | | | | | Create new video driver API that has a per-instance context structure and does not rely on keeping status in global or static variables. Existing drivers are not yet converted to this API; instead there is a wrapper which translates calls to them. In the new API, an old API call vo_functions->xyz(args) is generally replaced by vo_xyz(vo_instance, args). The changes to keep the vesa, dxr2 and xover drivers compiling have not been tested.
* Allow independent scaling of vo_font and sub_font.reimar2008-01-271-1/+1
| | | | | | | Patch by Guillaume LECERF (foxcore gmail com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25879 b3059339-0415-0410-9bf9-f77b7e298cf2
* From now on, libmenu does not steal all input keys from input modules.ulion2007-12-261-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25530 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify the condition code.ulion2007-12-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25524 b3059339-0415-0410-9bf9-f77b7e298cf2
* OSD menu support mouse selection.ulion2007-12-221-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25489 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove hardcoded key->cmd bindings in libmenu, support custom key bindingsulion2007-12-041-0/+8
| | | | | | | by menu config file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25291 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark several uses of vo_functions_t as const to stop some of the currentreimar2007-12-021-1/+1
| | | | | | | hacks e.g. in vidix code from spreading. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25247 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove the pause filter and the cmd queue hack, to know the mplayer going toulion2007-11-151-29/+10
| | | | | | | | pause by checking mpctx directly. If there's any video update before the pause then capture the frame or fallback to use last captured frame as pausing frame. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25054 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix pause key problem in correct way, only handle pause cmd when showing menu.ulion2007-11-081-7/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24988 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix link to email explaining the paused vf_menu behaviour changereimar2007-11-031-1/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24957 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move alloc_mpi and copy_mpi from libmenu/vf_menu.c to libmpcodecs/mp_image.c.cehoyos2007-08-041-54/+0
| | | | | | | Patch by Attila Ötvös. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24014 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use fast_memcpy for small size copy, esp. when the size is constantreimar2007-06-051-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23476 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace implicit use of fast_memcpy via macro by explicit use to allowreimar2007-06-051-2/+2
| | | | | | | for future optimization. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
* rename some menu open functions, to avoid confusion with libc native open()ben2007-05-251-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23384 b3059339-0415-0410-9bf9-f77b7e298cf2
* add new -subfont option, that allows having a different font for OSD ↵ben2007-05-201-1/+2
| | | | | | (controls and menu) and subtitles git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23356 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix menu to work with mpctxuau2007-02-211-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22302 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix identation, broken by last commitgpoirier2007-01-161-12/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21943 b3059339-0415-0410-9bf9-f77b7e298cf2
* speeds up mplayer execution by over FIVE times when all of the of the ↵gpoirier2007-01-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | following apply: * menus are enabled * menus are enabled but not displayed * direct rendering is in use Patch by Adam Sulmicki % adam A cfar P umd P edu % Original thread: date: Jan 7, 2007 11:07 PM subject: [MPlayer-dev-eng] [PATCH] slow menus : try two Other threads: date: Jan 7, 2007 12:39 PM subject: [MPlayer-advusers] [patch] slow menus Also: date: Jan 6, 2007 11:13 PM subject: [MPlayer-advusers] [patch] slow menus And: date: Jan 2, 2007 11:46 PM subject: [MPlayer-advusers] slow down with menu off Finaly: date: Dec 24, 2006 11:25 AM subject: [MPlayer-users] slow down with menu off git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21942 b3059339-0415-0410-9bf9-f77b7e298cf2
* woops, actually fix URL this timegpoirier2007-01-061-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21836 b3059339-0415-0410-9bf9-f77b7e298cf2
* update comment urlgpoirier2007-01-061-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21831 b3059339-0415-0410-9bf9-f77b7e298cf2
* allows OSD menu to be displayed when using MPEG PES video outben2007-01-041-0/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21821 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix menu toggle/hide issuesben2006-08-221-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19495 b3059339-0415-0410-9bf9-f77b7e298cf2
* Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT ↵reynaldo2006-03-301-2/+4
| | | | | | chello DOT hu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17995 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow 6 ways (up/down/left/right/ok/cancel) navigation.albeu2006-03-251-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17946 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l (forgot ...)michael2006-03-211-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17909 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify include paths, -I.. is in CFLAGS.diego2005-10-261-10/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16863 b3059339-0415-0410-9bf9-f77b7e298cf2
* support newer gccfaust32004-10-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13529 b3059339-0415-0410-9bf9-f77b7e298cf2
* option to display menu at startup, patch by Aurelien Jacobs <aurel at ↵faust32004-09-151-0/+3
| | | | | | gnuage.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13345 b3059339-0415-0410-9bf9-f77b7e298cf2
* output typo fixes: unknow --> unknowndiego2003-07-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10398 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l fix by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>alex2003-04-101-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9904 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10L forgot this filter.albeu2003-03-301-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9756 b3059339-0415-0410-9bf9-f77b7e298cf2
* these patches let ,,oldstyle'' and freetype subtitle renderers livearpi2002-12-291-1/+1
| | | | | | | | | | | together happily. if an oldstyle subtitle (font.desc) is found, it will be used. otherwise mplayer will choose subfont.ttf, if freetype was detected during ./configure. (also you can use -font /path/to/font.desc and -font /path/to/foobar.ttf too) patch-set by Wojtek Kaniewski <wojtekka@bydg.pdi.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8636 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added/reordered #includes to silence warnings about "implicit declaration".rathann2002-12-281-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8624 b3059339-0415-0410-9bf9-f77b7e298cf2
* better fix for my previous 10lcolin2002-11-221-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8252 b3059339-0415-0410-9bf9-f77b7e298cf2
* don't fully-copy the planes if the menu doesn't show (faster)colin2002-11-211-0/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8245 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix freetype. Freetype is highly recommended for a nice output ;)albeu2002-11-181-0/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8225 b3059339-0415-0410-9bf9-f77b7e298cf2
* OSD menus initial versionalbeu2002-11-141-0/+251
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8198 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 16:41:31 +0000