Commit Graph

926 Commits

Author SHA1 Message Date
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
diego 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
reimar 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
diego 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
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 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
ben 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
eugeni 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
reimar 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
reimar 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
reimar 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
uau b5aa5692cd Remove unnecessary <signal.h> includes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25654 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-09 01:17:49 +00:00
reimar 876b028289 Do not use exit_player in the signal handler, this code just can not
be called from a signal handler.
Instead only make the input system generate quit commands for the first
CTRL+C and otherwise do getch2_disable and exit.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25651 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-08 21:40:44 +00:00
nicodvb d18dab693a properties to change angle; patch by oattila chello hu
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25604 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-05 14:31:03 +00:00
diego d505bb051b 10l: Replace #define with #endif where I really meant to write #endif.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25582 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-02 00:19:19 +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 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 38473dd468 Add new function for parsing and queueing multi-commands separated by \n or \r.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25347 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-11 08:03:47 +00:00
ulion 5319009dfe Ignore heading spaces when parsing command.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25331 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 01:46:02 +00:00
ulion a986e2a1f6 Remove hardcoded key->cmd bindings in libmenu, support custom key bindings
by menu config file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25291 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-04 10:42:59 +00:00
ulion 9870aa54e3 Do not queue empty cmd.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25256 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 15:53:33 +00:00
ulion 7961a457ba Use const char * to replace a char * parameter.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25178 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-27 08:27:20 +00:00
ulion 595de9b1fc Support select subtitle by source, add 4 properties:
1. sub_source for current sub source (sub file, vobsub, or from demuxer).
2. sub_file for all subtitles from files.
3. sub_vobsub for all subtitles from vobsub.
4. sub_demux for all subtitles from demuxer.
Now mplayer can supply a stable and clear interface to external programs
using mplayer in slave mode to select a subtitle by its source and
its unique id for that source printed by mplayer using -identify parameter. 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25157 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-25 04:09:04 +00:00
ulion ac46121b3b Fix cmd filter memory leak, free the cmd after filter ate it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24987 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-08 05:19:56 +00:00
ulion bc81f68d3a Fix input.conf parse bug when comment follows key binding in the same line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24906 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-31 01:23:33 +00:00
ulion 9e5f80ded3 Fix input command parser for using only tab to separate the arguments.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24844 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-23 00:44:22 +00:00
diego 4d190ca5fc spelling cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24663 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-29 19:56:17 +00:00
diego 43bd3a468e warning fixes:
input.c: In function 'mp_input_set_section':
input.c:1640: warning: suggest parentheses around assignment used as truth value
input.c:1643: warning: suggest parentheses around assignment used as truth value
mga_common.c: In function 'mga_init':
mga_common.c:394: warning: suggest parentheses around assignment used as truth value
playtreeparser.c: In function 'parse_smil':
playtreeparser.c:523: warning: suggest parentheses around assignment used as truth value
libmpdemux/demux_ts.c: In function 'ts_parse':
libmpdemux/demux_ts.c:2795: warning: suggest parentheses around assignment used as truth value
libmpdemux/demux_ts.c: In function 'demux_open_ts':
libmpdemux/demux_ts.c:591: warning: 'frame_length' may be used uninitialized in this function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24444 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 13:16:30 +00:00
voroshil c4debc9042 Implement X/27/0 packet decoding.
It contains information about navigation links.

Modified patch from Otvos Attila oattila at chello dot hu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24264 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 14:10:47 +00:00
diego 84157efa5a Clean up the way get_path is handled: Compile get_path.c to an object to link
against instead of directly #including the C file and replace the many extern
declarations by a proper header file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24262 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 11:20:24 +00:00
reimar 40bb01cb45 Process any waiting commands (got_cmd set). Should fix e.g. smplayer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24245 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 15:21:12 +00:00
reimar 2d1a05ce75 Revert r24158, it is not necessary with unsigned bitfield
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24161 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 09:29:27 +00:00