GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-26 04:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,986 Commits 44 Branches 89 Tags
4db39fdfdb9caeb91ed7fbd87174faa49f8baeda
Commit Graph
190 Commits
Author SHA1 Message Date
Uoti Urpala 0301309425 Merge svn changes up to 27824 
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
 2008-10-25 05:12:34 +03:00
diego 2093097cfb Remove pointless attribute_used from variable declaration. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27780 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-16 18:08:18 +00:00
Uoti Urpala f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03:00
Uoti Urpala 17d3e4b36d Merge svn changes up to r27441 
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
 2008-08-08 02:13:09 +03:00
diego 091d352d06 Rename font-related preprocessor directives. 
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 10:36:07 +00:00
diego 02135001b4 Change a bunch of video/audio-output-specific preprocessor directives from 
a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-03 15:21:40 +00:00
Uoti Urpala 6cce822505 Merge svn changes up to r27399 
Conflicts:

	libmpcodecs/vd.c
	libmpcodecs/ve_raw.c
	libvo/video_out.c
	libvo/x11_common.c
	mplayer.c
 2008-08-02 22:04:35 +03:00
diego d17f9943af Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate; 
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
 2008-08-01 20:28:58 +00:00
Uoti Urpala 04f3909a72 Merge svn changes up to r27374 
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
 2008-07-30 16:39:24 +03:00
diego 4b141479da Start unifying names of internal preprocessor directives. 
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
 2008-07-30 12:01:30 +00:00
Uoti Urpala de560e8167 Merge svn changes up to r27123 
Conflicts:

	libmenu/menu_filesel.c
	libmenu/menu_pt.c
 2008-06-23 03:58:44 +03:00
ben 9e0e5b028c fixes two bugs: 
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
 2008-06-20 20:36:05 +00:00
ben 6f70e50e6d Add auto-close option to libmenu playlist handling part. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27104 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-20 19:43:19 +00:00
Uoti Urpala af3fcdf2de Merge svn changes up to r27025 
Conflicts:

	command.c
	libvo/vosub_vidix.c
	libvo/vosub_vidix.h
	mplayer.c
 2008-06-07 19:57:57 +03:00
ben a3e6050aa1 Removed unused freepath variable. 
Patch by Guillaume Lecerf <foxcore at gmail com>



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27002 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-06 23:24:39 +00:00
ben 45509b2576 Remove useless braces on if() statement. 
Patch by Guillaume Lecerf <foxcore at gmail com>



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26993 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-05 19:47:04 +00:00
ben 8d4cdcc158 Ensure 'path' string is 0 terminated. 
Patch by Guillaume Lecerf <foxcore at gmail com>



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26992 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-05 19:46:16 +00:00
Uoti Urpala d5c868325c Merge svn changes up to r26979 
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
 2008-06-04 08:10:48 +03:00
diego 15525ae9aa Use size_t instead of int for a variable that is compared to the result 
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
 2008-06-03 22:35:02 +00:00
diego 5423c418c2 cosmetics: Remove useless parentheses from return statements. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-16 09:42:28 +00:00
Uoti Urpala a41db36b22 Merge svn changes up to r26783 
Conflicts:

	Makefile
	common.mak
	configure
	libmpcodecs/vd_ffmpeg.c
	libmpdemux/demux_mkv.c
	libvo/vo_xv.c
	mplayer.c
 2008-05-15 21:19:35 +03:00
diego b10c35e0ed Use standard license headers with standard formatting. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26775 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-14 18:02:27 +00:00
Uoti Urpala bec3b84f5e Merge svn changes up to r26624 
Conflicts:

	Makefile
 2008-05-01 08:18:50 +03:00
Uoti Urpala 423b95bf5c input: Move cmd_queue to context struct 
Menu instances now also need a input context pointer to queue commands.
 2008-04-30 14:46:21 +03:00
diego 7d560418f6 Remove unnecessary version.h #includes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26602 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-30 11:03:41 +00:00
Uoti Urpala 80d43e8632 Move global filename to mpctx 2008-04-26 15:17:51 +03:00
Uoti Urpala fb33e286b5 Move global mconfig to mpctx 
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.
 2008-04-26 10:44:59 +03:00
Uoti Urpala 0e757bf9da Remove _s/_st suffix from some struct names 
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
 2008-04-25 03:34:22 +03:00
Uoti Urpala 2bcfe1e077 Add new video driver API 
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.
 2008-04-23 13:41:04 +03:00
diego f827599b48 Build all parts in the libmenu subdirectory nonrecursively. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26343 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-07 08:28:54 +00:00
diego 55e29f6103 Add missing header #includes to fix 'make checkheaders'. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26171 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-05 08:24:59 +00:00
diego 8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-22 09:09:46 +00:00
diego 77eb726c3d Remove pointless #ifdefs around extern declarations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-20 08:51:53 +00:00
reimar fbae3928cd Allow independent scaling of vo_font and sub_font. 
Patch by Guillaume LECERF (foxcore gmail com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25879 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-27 15:14:02 +00:00
ulion 73f51e7f78 Deny the code using realpath(). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25660 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-10 12:44:17 +00:00
diego 2b6af2000b Add multiple inclusion guards to all header files that lack them. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-01 21:35:58 +00:00
ulion 61f55e9fd7 Default use the dir where the current playing file located if path not set. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25556 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-31 01:20:50 +00:00
ulion 1fbd5fb5f4 Remove redundant option 'auto-close' from cmdlist and filesel. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25533 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-28 03:45:01 +00:00
ulion b6870cc5ba From now on, libmenu does not steal all input keys from input modules. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25530 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-26 13:13:48 +00:00
ulion 967aaee5e2 Use '-' instead of '_' in option name. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25527 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-25 09:01:51 +00:00
ulion 76f10103ba Remove useless scope. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25526 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-25 08:38:09 +00:00
ulion c8a8ffcf36 Simplify the condition code. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25524 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-25 04:30:16 +00:00
ulion 673246be0c OSD menu support mouse selection. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25489 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-22 06:14:38 +00:00
ulion 787801f7a5 Add variable bx, dx to simplify code of function menu_draw_list. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25466 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-20 07:11:48 +00:00
ulion bfe3186801 Add local variable 'line_h' to simplify code of function menu_list_draw. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25465 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-20 02:17:29 +00:00
ulion d7ed78143c Currently menu title did not align center together with menu items when x>=0. 
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
 2007-12-19 15:21:27 +00:00
ulion 5fdfc9124d Calculate and draw osd accurately. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25462 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-19 09:34:28 +00:00
ulion 007988abf8 Here should add the minb to x when x>=0 because in later code 
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
 2007-12-18 11:54:17 +00:00
ulion cccac8fa2a Fix the menu uninit function name. 
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
 2007-12-18 10:45:43 +00:00
ulion fea0ba733f Replace another m_struct_t by 'struct m_struct_st' to remove depedency 
on m_struct.h when include libmenu/menu.h.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25447 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-18 09:44:54 +00:00