summaryrefslogtreecommitdiffstats
path: root/libmenu
Commit message (Collapse)AuthorAgeFilesLines
* Remove trailing whitespace from most filesUoti Urpala2009-07-0713-78/+74
|
* Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-078-45/+45
| | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-078-45/+45
| | | | | 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-1412-0/+206
|\|
| * Add standard GPL headers.diego2008-12-1312-0/+206
| | | | | | | | 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
* | Make various functions staticUoti Urpala2008-08-121-2/+2
| |
* | Merge svn changes up to r27441Uoti Urpala2008-08-082-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-072-5/+5
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-031-1/+1
| | | | | | | | | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-3/+3
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;diego2008-08-011-3/+3
| | | | | | | | | | | | | | CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * Start unifying names of internal preprocessor directives.diego2008-07-301-3/+3
| | | | | | | | | | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27123Uoti Urpala2008-06-232-10/+27
|\| | | | | | | | | | | | | Conflicts: libmenu/menu_filesel.c libmenu/menu_pt.c
| * fixes two bugs:ben2008-06-201-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | 1. doesn't add \ before spaces when showing dirname in interface title. 2. when replace_path() string is to be parsed by input command, I assume that the path is to be run in shell, and I do special escaping of 'into \'\\\'\' (tested useful and ok with geexbox for last 3 years ...) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27118 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add auto-close option to libmenu playlist handling part.ben2008-06-201-2/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27104 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27025Uoti Urpala2008-06-071-10/+4
|\| | | | | | | | | | | | | | | | | Conflicts: command.c libvo/vosub_vidix.c libvo/vosub_vidix.h mplayer.c
| * Removed unused freepath variable.ben2008-06-061-8/+3
| | | | | | | | | | | | | | | | Patch by Guillaume Lecerf <foxcore at gmail com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27002 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless braces on if() statement.ben2008-06-051-2/+1
| | | | | | | | | | | | | | | | Patch by Guillaume Lecerf <foxcore at gmail com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26993 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Ensure 'path' string is 0 terminated.ben2008-06-051-1/+1
| | | | | | | | | | | | | | | | Patch by Guillaume Lecerf <foxcore at gmail com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26992 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-042-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Use size_t instead of int for a variable that is compared to the resultdiego2008-06-031-1/+1
| | | | | | | | | | | | | | | | of strlen. Fixes a warning about signed and unsigned comparison. patch by Guillaume LECERF, foxcore gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26977 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 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
* | Merge svn changes up to r26783Uoti Urpala2008-05-151-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * Use standard license headers with standard formatting.diego2008-05-141-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26775 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26624Uoti Urpala2008-05-011-1/+0
|\| | | | | | | | | | | Conflicts: Makefile
| * Remove unnecessary version.h #includes.diego2008-04-301-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26602 b3059339-0415-0410-9bf9-f77b7e298cf2
* | input: Move cmd_queue to context structUoti Urpala2008-04-309-16/+22
| | | | | | | | Menu instances now also need a input context pointer to queue commands.
* | Move global filename to mpctxUoti Urpala2008-04-261-1/+0
| |
* | Move global mconfig to mpctxUoti Urpala2008-04-264-7/+14
| | | | | | | | | | | | | | | | | | | | | | The global was used in the function cfg_include which handles the -include option. Make the address available in that function by creating a new dynamically allocated option in m_config_new that has the address in the option's private data. asxparser.c also used the global. Making it available through all ways the code could get called required a number of relatively straightforward changes to playtree and menu code.
* | 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.
* Build all parts in the libmenu subdirectory nonrecursively.diego2008-04-071-18/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26343 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing header #includes to fix 'make checkheaders'.diego2008-03-052-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26171 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add MPLAYER_ prefix to multiple inclusion guards.diego2008-02-222-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless #ifdefs around extern declarations.diego2008-02-201-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
* 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
* Deny the code using realpath().ulion2008-01-101-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25660 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add multiple inclusion guards to all header files that lack them.diego2008-01-012-1/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
* Default use the dir where the current playing file located if path not set.ulion2007-12-311-2/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25556 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove redundant option 'auto-close' from cmdlist and filesel.ulion2007-12-282-17/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25533 b3059339-0415-0410-9bf9-f77b7e298cf2
* From now on, libmenu does not steal all input keys from input modules.ulion2007-12-266-19/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25530 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use '-' instead of '_' in option name.ulion2007-12-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25527 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless scope.ulion2007-12-251-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25526 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-224-0/+61
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25489 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add variable bx, dx to simplify code of function menu_draw_list.ulion2007-12-201-7/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25466 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add local variable 'line_h' to simplify code of function menu_list_draw.ulion2007-12-201-8/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25465 b3059339-0415-0410-9bf9-f77b7e298cf2
* Currently menu title did not align center together with menu items when x>=0.ulion2007-12-191-3/+3
| | | | | | | Now fix it to get a good alignment with menu items. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25463 b3059339-0415-0410-9bf9-f77b7e298cf2
* Calculate and draw osd accurately.ulion2007-12-191-2/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25462 b3059339-0415-0410-9bf9-f77b7e298cf2
* Here should add the minb to x when x>=0 because in later codeulion2007-12-181-1/+1
| | | | | | | we use 'x - minb' to draw bg box when x>=0. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25449 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the menu uninit function name.ulion2007-12-182-2/+2
| | | | | | | NOTE: Nobody call this function by now, should be fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25448 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace another m_struct_t by 'struct m_struct_st' to remove depedencyulion2007-12-181-1/+1
| | | | | | | on m_struct.h when include libmenu/menu.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25447 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove dependency on m_struct.h when include libmenu/menu.h.ulion2007-12-181-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25445 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix indent for last commit.ulion2007-12-171-15/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25437 b3059339-0415-0410-9bf9-f77b7e298cf2
* Ignore elements of keybindings other than 'binding'.ulion2007-12-171-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25436 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove NO_REPEAT mask from keycode, fix keycode matching for JOY_BTN0, etc.ulion2007-12-171-0/+1
|