summaryrefslogtreecommitdiffstats
path: root/input
Commit message (Collapse)AuthorAgeFilesLines
* Remove the internal GUIAnton Khirnov2009-07-072-46/+2
| | | | | | | | | The GUI is badly designed and too closely coupled to the internal details of other code. The GUI code is in bad shape and unmaintained for years. There is no indication that anyone would maintain it in the future either. Even if someone did volunteer to implement a better integrated GUI having the current code in the tree probably wouldn't help much. So get rid of it.
* Merge svn changes up to r29412Uoti Urpala2009-07-071-1/+1
|\
| * Increase slave mode buffer so that one can load files with a deeperben2009-06-261-1/+1
| | | | | | | | | | | | | | | | | | path (or bigger URLs). Patch by Mathieu Schroeter (mathieu DOT schroeter AT gamesover DOT ch). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29403 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-136-45/+45
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-076-40/+40
| |
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-074-45/+45
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-074-46/+46
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Merge svn changes up to r29277Uoti Urpala2009-05-081-1/+1
|\|
| * Add missing 'void' to parameterless function declarations.diego2009-05-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29117Uoti Urpala2009-04-011-5/+5
|\|
| * Rename 'default-binds' input option to 'default-bindings'.diego2009-03-251-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29058 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28951Uoti Urpala2009-03-141-1/+6
|\|
| * Add an option to disable the default key binding that MPlayer includesreimar2009-03-081-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28878 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make pausing_keep_force the default for the set_mouse_pos and key_down_event -reimar2009-03-071-1/+10
| | | | | | | | | | | | | | | | | | different behaviour is unlikely to make sense but it is better to handle this in input.c instead of adding special cases to mplayer.c and being able to override the default behaviour at least should not hurt. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28870 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28403Uoti Urpala2009-01-311-19/+11
|\|
| * Move setting of O_NONBLOCK before lirc_readconfig, this avoids a memleakreimar2009-01-301-7/+7
| | | | | | | | | | | | | | due to not freeing the lirc config on error. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28390 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix an MSGT_INPUT to MSGT_LIRC in lirc.creimar2009-01-301-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28389 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not use select n lirc code, instead set the fd non-blocking.reimar2009-01-271-18/+10
| | | | | | | | | | | | | | | | | | select can not work because lirc_nextcode buffers data internally, causing events to be delayed until the next keypress in some cases. Patch by Dennis Vshivkov [jaimor (at) orcon net nz] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28380 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28366Uoti Urpala2009-01-261-1/+1
|\| | | | | | | | | | | | | | | | | Contains more changes needed to sync build system with latest FFmpeg. Conflicts: Makefile configure mplayer.c
| * Fix typo: pool -> pollreimar2009-01-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28356 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28149Uoti Urpala2008-12-147-0/+124
|\|
| * Add standard GPL license header.diego2008-12-137-0/+124
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28146 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28103Uoti Urpala2008-12-061-1/+1
|\|
| * Re-add "extern"s incorrectly removed in r28085reimar2008-12-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28088 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Uoti Urpala2008-12-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Get rid of pointless 'extern' keywords.diego2008-12-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | 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
* | Move some declarations from mplayer.c to proper headersUoti Urpala2008-08-121-0/+3
| | | | | | | | | | Declare mp_input_register_options in input.h and xscreensaver_heartbeat in x11_common.h.
* | 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-232-146/+149
|\| | | | | | | | | | | | | Conflicts: libmenu/menu_filesel.c libmenu/menu_pt.c
| * Change DVDNAV command key names.ben2008-06-192-18/+19
| | | | | | | | | | | | | | | | 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
| * Group all input command defines in one big enumben2008-06-181-128/+130
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27098 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-045-2/+174
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-272-0/+3
| | | | | | | | | | | | | | | | | | 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
| * add potentially missing typesben2008-05-201-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26841 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-183-0/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * cosmetics: Remove useless parentheses from return statements.diego2008-05-161-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26783Uoti Urpala2008-05-153-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * Use standard license headers with standard formatting.diego2008-05-142-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26775 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 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-302-40/+40
| |
* | 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-302-29/+34
| |
* | input: Move cmd_queue to context structUoti Urpala2008-04-302-22/+23
| | | | | | | | 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-302-28/+34
| | | | | | | | | |