summaryrefslogtreecommitdiffstats
path: root/input/input.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r27682Uoti Urpala2008-10-021-0/+3
|\ | | | | | | | | | | | | | | | | Addition of the "outdir" suboption to vo_png in svn was reverted before merging. Conflicts: command.c mplayer.c
| * Add an experimental pausing_keep_force slave mode command prefixreimar2008-09-251-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27665 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-12/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 a bunch of miscellaneous preprocessor directives.diego2008-08-071-6/+6
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename all preprocessor directives related to Apple / Mac OS X.diego2008-08-061-4/+4
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-031-3/+3
| | | | | | | | | | | | | | 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-4/+4
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.diego2008-07-301-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27377 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename two GUI-related preprocessor directives:diego2008-07-301-3/+3
| | | | | | | | | | | | | | 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
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-6/+6
| | | | | | | | | | | | | | | | 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-231-9/+9
|\| | | | | | | | | | | | | Conflicts: libmenu/menu_filesel.c libmenu/menu_pt.c
| * Change DVDNAV command key names.ben2008-06-191-9/+9
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-0/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add a slave command to stop stream playback.ben2008-05-271-0/+2
| | | | | | | | | | | | | | | | | | 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
| * fix compilation of input.c if neither macosx/linux apple remote codeben2008-05-181-1/+1
| | | | | | | | | | | | | | | | is compiled in git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26829 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Keep AppleIR enabled by default on MacOSX but have it disable on Linux.ben2008-05-181-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26799 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not enable AppleIR by default.ben2008-05-181-1/+1
| | | | | | | | | | | | | | | | | | 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
| * Add support for AppleIR Remote as an input under Linux systems.ben2008-05-181-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r26783Uoti Urpala2008-05-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * usec_sleep(0) is not the same as not sleeping at all.reimar2008-05-101-1/+1
| | | | | | | | | | | | Fixes massive slowdown on Windows. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26718 b3059339-0415-0410-9bf9-f77b7e298cf2
* | input.c: Use talloc for all memory allocationsUoti Urpala2008-05-011-14/+10
| | | | | | | | | | | | 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.
* | Move input options to option structUoti Urpala2008-04-301-39/+38
| |
* | input: Use talloc for struct mp_cmd and things under itUoti Urpala2008-04-301-28/+12
| |
* | input: Move command filedescriptor list to context structUoti Urpala2008-04-301-25/+31
| |
* | input: Move cmd_queue to context structUoti Urpala2008-04-301-19/+21
| | | | | | | | Menu instances now also need a input context pointer to queue commands.
* | input.c: Change a static variable to localUoti Urpala2008-04-301-14/+16
| |
* | input: Move key filedescriptor list to context structUoti Urpala2008-04-301-24/+30
| | | | | | | | | | The context variable is now passed to VOs too as it's now needed to add a callback on the X filedescriptor.
* | input.c: Move variable from static to localUoti Urpala2008-04-301-2/+1
| |
* | input.c: Move key down state to context structUoti Urpala2008-04-301-33/+36
| |
* | input.c: Use talloc for command bind allocationsUoti Urpala2008-04-301-31/+11
| |
* | input.[ch]: Move some type definitions from .h to .cUoti Urpala2008-04-301-0/+10
| | | | | | | | These aren't used outside input.c.
* | input.c: Remove mp_input_ prefixes from static function namesUoti Urpala2008-04-301-60/+58
| | | | | | | | The prefixes make the code unnecessarily verbose for no real benefit.
* | input.c: Make two functions staticUoti Urpala2008-04-301-3/+3
| |
* | Remove INITIALIZED_INPUT from mpctx->initialized_flagsUoti Urpala2008-04-301-0/+3
| | | | | | | | | | The input functions are never uninited except at exit. Move the uninit to player exit function and remove the flag.
* | input: Move command bind variables to context structUoti Urpala2008-04-301-54/+67
| |
* | Create a context for input.c stateUoti Urpala2008-04-301-39/+52
| | | | | | | | | | | | | | | | | | 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/.
* | input.c: Remove _st prefix from struct namesUoti Urpala2008-04-301-4/+4
| |
* | input.c: Use union instead of void *Uoti Urpala2008-04-291-6/+9
| |
* | input: Remove separate mp_input_add_event_fdUoti Urpala2008-04-291-43/+8
| | | | | | | | | | | | | | | | 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.
* | input.c: Revert code uglifications done for gcc 2.95Uoti Urpala2008-04-291-9/+5
| | | | | | | | | | | | 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.
* | input.c: Remove unnecessary #include "osdep/getch2.h"Uoti Urpala2008-04-291-1/+0
| |
* | Merge svn changes up to r26587Uoti Urpala2008-04-291-1/+1
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
| * Use full path for libavutil #includes.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26575 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Mark some constant symbols as suchUoti Urpala2008-04-261-2/+2
| |
* | Add a context argument to mp_input_add_event_fd callbackUoti Urpala2008-04-231-2/+4
| |
* | input/input.c: Minor simplificationUoti Urpala2008-04-231-15/+17
|/
* Fix handling of comments in input.c, current code had useless ifs and in ↵reimar2008-03-111-4/+2
| | | | | | | | | addition could treat more data as comments than correct. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26222 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add new command to switch between dvdnav titlesben2008-01-241-0/+1
| | | | | | | | 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
* Add ass_use_margins command and property to shift subtitles to margins and backeugeni2008-01-231-0/+3
| | | | | | | on the fly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25842 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix some types to constreimar2008-01-191-5/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25794 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove a useless castreimar2008-01-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25754 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make several mapping tables related to input processing const.reimar2008-01-131-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25737 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unnecessary <signal.h> includesuau2008-01-091-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25654 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use exit_player in the signal handler, this code just can notreimar2008-01-081-0/+4
| | | | | | | | | 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
* properties to change angle; patch by oattila chello hunicodvb2008-01-051-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25604 b3059339-0415-0410-9bf9-f77b7e298cf2
* From now on, libmenu does not steal all input keys from input modules.ulion2007-12-261-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25530 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add new function for parsing and queueing multi-commands separated by \n or \r.ulion2007-12-111-0/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25347 b3059339-0415-0410-9bf9-f77b7e298cf2
* Ignore heading spaces when parsing command.ulion2007-12-101-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25331 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove hardcoded key->cmd bindings in libmenu, support custom key bindingsulion2007-12-041-1/+1
| | | | | | | by menu config file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25291 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not queue empty cmd.ulion2007-12-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25256 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use const char * to replace a char * parameter.ulion2007-11-271-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25178 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support select subtitle by source, add 4 properties:ulion2007-11-251-0/+4
| | | | | | | | | | | | | 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 mpl