Commit Graph
307 Commits
Author SHA1 Message Date
Uoti Urpala cfe2839386 Move some declarations from mplayer.c to proper headers
Declare mp_input_register_options in input.h and
xscreensaver_heartbeat in x11_common.h.
2008-08-12 14:57:18 +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 141e81cce4 Rename a bunch of miscellaneous preprocessor directives.
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 08:58:07 +00:00
diego 473e2824cb Rename all preprocessor directives related to Apple / Mac OS X.
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-06 07:42:26 +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 6138ec05eb Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27377 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 18:07:19 +00:00
diego 3b31fa5717 Rename two GUI-related preprocessor directives:
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
2008-07-30 13:44:59 +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 59346bc23a Change DVDNAV command key names.
Parameters now use a string much more intuitive than previous int value.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27100 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-19 18:51:42 +00:00
ben dc8383d0a9 Group all input command defines in one big enum
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27098 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-18 17:18:49 +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
ben bc212e3500 Add a slave command to stop stream playback.
Mostly useful when used with -idle mode.
Patch by Mathieu Schroeter ( mathieu dot schroeter at gamesover dot ch )



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26909 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 18:39:57 +00:00
ben e3755edad5 add potentially missing types
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26841 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-20 20:51:22 +00:00
ben 9171b9dbe6 fix compilation of input.c if neither macosx/linux apple remote code
is compiled in



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26829 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 18:11:05 +00:00
ben 561e9503aa Keep AppleIR enabled by default on MacOSX but have it disable on Linux.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26799 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 12:11:17 +00:00
ben 974d4fadad Do not enable AppleIR by default.
The amount of computers capable of using it is too low in the field to
enable it by default.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26797 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 11:56:20 +00:00
ben dc6d14fb1b Add support for AppleIR Remote as an input under Linux systems.
This requires Linux 2.6 with evdev and appleir drivers.
The keymapping is done to mimics the one that was done for MacOSX.

WARNING: Most distributions do not seems to bother and only let root
access to the device. Modify udev rules accordingly if you want regular
user to be able to use the remote.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26795 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 11:53:00 +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
reimar dd73597f8c usec_sleep(0) is not the same as not sleeping at all.
Fixes massive slowdown on Windows.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26718 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 14:03:42 +00:00
Uoti Urpala 9d27862072 input.c: Use talloc for all memory allocations
Convert the remaining non-talloc memory allocations so that everything
in the file consistently uses talloc. Make one additional minor code
simplification in read_cmd.
2008-05-01 08:10:49 +03:00
Uoti Urpala 8de8be1536 Move input options to option struct 2008-04-30 19:34:48 +03:00
Uoti Urpala d2f4db51fb input: Use talloc for struct mp_cmd and things under it 2008-04-30 14:46:21 +03:00
Uoti Urpala a5fdd8f6f9 input: Move command filedescriptor list to context struct 2008-04-30 14:46:21 +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
Uoti Urpala f7b608812e input.c: Change a static variable to local 2008-04-30 14:46:21 +03:00
Uoti Urpala bfcb3a7a81 input: Move key filedescriptor list to context struct
The context variable is now passed to VOs too as it's now needed to
add a callback on the X filedescriptor.
2008-04-30 14:46:17 +03:00
Uoti Urpala 32e52b8fd0 input.c: Move variable from static to local 2008-04-30 13:24:57 +03:00
Uoti Urpala a2b320fb04 input.c: Move key down state to context struct 2008-04-30 13:24:57 +03:00
Uoti Urpala f7879d206e input.c: Use talloc for command bind allocations 2008-04-30 13:24:57 +03:00
Uoti Urpala d0e8292629 input.[ch]: Move some type definitions from .h to .c
These aren't used outside input.c.
2008-04-30 13:24:57 +03:00
Uoti Urpala a4240ff361 input.c: Remove mp_input_ prefixes from static function names
The prefixes make the code unnecessarily verbose for no real benefit.
2008-04-30 13:24:57 +03:00
Uoti Urpala f328386c33 input.c: Make two functions static 2008-04-30 13:24:57 +03:00
Uoti Urpala 66db9ec7d6 Remove INITIALIZED_INPUT from mpctx->initialized_flags
The input functions are never uninited except at exit. Move the uninit
to player exit function and remove the flag.
2008-04-30 13:24:56 +03:00
Uoti Urpala 7b085d4514 input: Move command bind variables to context struct 2008-04-30 13:24:56 +03:00
Uoti Urpala 9e9932d4d7 Create a context for input.c state
Start moving static variables to a context struct. Only autorepeat
state is moved to the struct in this commit.

mp_input_check_interrupt now requires the context variable. Change
stream functions to pass it. It's still stored in a static variable in
stream/.
2008-04-30 13:24:54 +03:00
Uoti Urpala bde509648f input.c: Remove _st prefix from struct names 2008-04-30 06:30:34 +03:00
Uoti Urpala 3e389c5284 input.c: Use union instead of void * 2008-04-29 12:58:29 +03:00
Uoti Urpala 986e519fc9 input: Remove separate mp_input_add_event_fd
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.
2008-04-29 12:55:23 +03:00
Uoti Urpala b6b82964aa input.c: Revert code uglifications done for gcc 2.95
It's unlikely that this branch will ever compile with gcc 2.95 again,
so it's pointless to keep code uglifications done to work around its
limitations.
2008-04-29 12:24:02 +03:00
Uoti Urpala 5a08b7f96d input.c: Remove unnecessary #include "osdep/getch2.h" 2008-04-29 12:13:20 +03:00
Uoti Urpala 06a35804f3 Merge svn changes up to r26587
Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c
2008-04-29 05:03:57 +03:00
diego df2124e18f Use full path for libavutil #includes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26575 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:44:10 +00:00
Uoti Urpala 05ad815133 Mark some constant symbols as such 2008-04-26 16:35:40 +03:00
Uoti Urpala e5e8effca8 Add a context argument to mp_input_add_event_fd callback 2008-04-23 13:41:04 +03:00
Uoti Urpala 1f086d4376 input/input.c: Minor simplification 2008-04-23 13:41:04 +03:00