de560e8167
Merge svn changes up to r27123
...
Conflicts:
libmenu/menu_filesel.c
libmenu/menu_pt.c
2008-06-23 03:58:44 +03:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
8de8be1536
Move input options to option struct
2008-04-30 19:34:48 +03:00
d2f4db51fb
input: Use talloc for struct mp_cmd and things under it
2008-04-30 14:46:21 +03:00
a5fdd8f6f9
input: Move command filedescriptor list to context struct
2008-04-30 14:46:21 +03:00
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
f7b608812e
input.c: Change a static variable to local
2008-04-30 14:46:21 +03:00
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
32e52b8fd0
input.c: Move variable from static to local
2008-04-30 13:24:57 +03:00
a2b320fb04
input.c: Move key down state to context struct
2008-04-30 13:24:57 +03:00
f7879d206e
input.c: Use talloc for command bind allocations
2008-04-30 13:24:57 +03:00
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
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
f328386c33
input.c: Make two functions static
2008-04-30 13:24:57 +03:00
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
7b085d4514
input: Move command bind variables to context struct
2008-04-30 13:24:56 +03:00
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
bde509648f
input.c: Remove _st prefix from struct names
2008-04-30 06:30:34 +03:00
3e389c5284
input.c: Use union instead of void *
2008-04-29 12:58:29 +03:00
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
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
5a08b7f96d
input.c: Remove unnecessary #include "osdep/getch2.h"
2008-04-29 12:13:20 +03:00
06a35804f3
Merge svn changes up to r26587
...
Conflicts:
Makefile
configure
osdep/timer-darwin.c
2008-04-29 05:03:57 +03:00
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
05ad815133
Mark some constant symbols as such
2008-04-26 16:35:40 +03:00
e5e8effca8
Add a context argument to mp_input_add_event_fd callback
2008-04-23 13:41:04 +03:00
1f086d4376
input/input.c: Minor simplification
2008-04-23 13:41:04 +03:00
c9b0ef9bca
Get rid of recursive make for the input/ subdirectory.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26340 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 23:09:06 +00:00
6ac6e38c28
Fix handling of comments in input.c, current code had useless ifs and in addition
...
could treat more data as comments than correct.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26222 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-11 14:44:19 +00:00
a21190b9d3
joystick.c is only ever compiled on Linux, remove pointless #ifdef
...
around the whole file and dummy functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26112 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-28 18:32:17 +00:00
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
835c654bb0
typo fix: inited --> initialized
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
e28bd7c6de
Add new command to switch between dvdnav titles
...
Based on parts of dvdnav monster patches from Otvos Attila
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25845 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-24 19:14:05 +00:00
f817a5dc52
Add ass_use_margins command and property to shift subtitles to margins and back
...
on the fly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25842 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-23 21:18:32 +00:00
e5fc538ba5
Fix some types to const
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25794 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 11:42:03 +00:00
2054c24a34
Remove a useless cast
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25754 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-15 09:27:22 +00:00
003ffcfe79
Make several mapping tables related to input processing const.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25737 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 16:13:54 +00:00
Uoti Urpala
ben
diego
reimar
eugeni