Commit Graph

54 Commits

Author SHA1 Message Date
Uoti Urpala 23cb829072 input: move all key code lists to input/keycodes.h
Move the definitions of all special key codes (those not passed by
ASCII value) to input/keycodes.h. Before they were spread between
osdep/keycodes.h, input/joystick.h, input/mouse.h and input/ar.h, plus
some special values in input.h. This was especially inconvenient as
the codes had to be coordinated to not conflict between the files.

The change requires a bit of ugliness as appleir.c includes
<linux/input.h> which contains various conflicting KEY_* definitions.
Work around this by adding a special preprocessor variable which can
be used to avoid defining these in keycodes.h.
2011-05-02 00:43:31 +03:00
cboesch fe3c4810e1 cleanup: remove NULL checks before free() all over the code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 13:11:20 +02:00
Uoti Urpala 1e86963828 Merge svn changes up to r28537 2009-02-12 04:17:55 +02:00
diego befc528297 Add standard license headers, unify header formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-08 03:27:30 +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 e588ab056d Change a bunch of video-output-specific preprocessor directives from a HAVE_
prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27397 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 17:38:11 +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
diego ad603f5559 cosmetics: Remove useless parentheses from from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 08:33:27 +00:00
Uoti Urpala a2212a71a7 Remove vo_depthonscreen references from non-X VOs
X-specific code uses this global as its internal variable (assuming
that X is initialized if it is set). While using non-X VOs the
variable is not accessed outside the VO. So make those VOs use their
own variables instead of the global vo_depthonscreen.
2008-04-23 13:46:40 +03:00
Uoti Urpala de56d2d9f5 Remove variable arguments from vo control() functions
No voctrl uses them any more, and using them would not be a good idea
because it makes forwarding arguments to other functions harder.
2008-04-23 13:41:03 +03:00
reimar 2bf8c692f1 Mark the vo_functions_t definitions as const where possible.
This is not possible for xover and anything supporting vidix
due to horrible hacks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25248 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 14:39:15 +00:00
reimar 909887bdbe Make vo info structs const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 14:06:03 +00:00
reimar bbf95a3dcf Remove more pointless fastmemcpy.h includes in libvo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23394 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-27 21:13:10 +00:00
rathann 259cfbe7e2 Code cleanup: don't include a .c file in mplayer.c and fix a few
"implicit declaration of function ‘mplayer_put_key’" warnings

Based on Attila's suggestions.
Approved by Uoti and Ivan.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22841 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-29 17:16:11 +00:00
diego a407e0f51d - improved performance on truecolor modes
- fixed all known bugs, i.e. palette mode works right again
patch by Christoph Egger < Christoph_Egger -- at -- gmx -- dot -- de >


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16471 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-13 08:47:46 +00:00
diego ae3406c2c8 Replace remaining tabs by spaces.
patch by Christoph Egger <Christoph_Egger -- at -- gmx -- dot -- de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16427 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-08 00:11:55 +00:00
diego 7e13572ce9 Switch indentation over to K&R style, replace all tabs by spaces.
patch by Christoph Egger <Christoph_Egger -- at -- gmx -- dot -- de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16410 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-06 18:44:04 +00:00
reimar cbf7b3b291 remove extern for variables that are already in headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16281 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-21 01:20:31 +00:00
ivo cd55954e4e Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
return values can be negative (VO_ERROR, VO_NOTAVAIL and VO_NOTIMPL), so it's
changed to int now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16172 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 01:24:37 +00:00
diego 467ab2516e - make use of libggiwmh if found by configure
* For now use it to set the window title
  * Implement "Window-On-Top" (experimental)
- Improved dirty region handling introduced in rev 1.33.
- other minor fixes
patch by Christoph Egger <Christoph_Egger at gmx dot de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15407 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-11 08:04:13 +00:00
reimar ec9db5fc78 Make it possible to use a ggi device string that contains a ',' by writing
a '.' instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15273 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-27 12:15:37 +00:00
diego 84e0255555 - Fixed mode setting, so any video can be played on all supported ggi targets.
- Fixed and enabled draw_slice().
- Only perform flushes in flip_page().
- implemented a primitive dirty region handling to only flush changed area.
patch by Christoph Egger <Christoph_Egger at gmx dot de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14176 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-17 19:36:52 +00:00
iive 7c1c404505 Remove broken support for directbuffer and including frame-handling use.
Allows using of directrendering for hw acceleration, with fallbacl to directbuffer.
No more black frames. No more flickering.
patch by Christoph Egger, approved by al3x


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14022 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-23 16:07:14 +00:00
diego 5b0d96c6b4 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13788 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-28 01:15:53 +00:00
diego 1bd9852166 Unify the config.h #include, use "config.h" instead of "../config.h"
everywhere, will make extracting libvo/ easier.  Approved by Alex.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12651 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-25 16:58:45 +00:00
alex 759578ff51 non-directbuffer and slices support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11111 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-14 10:03:37 +00:00
alex 188460e7ee removing my (nonworking) email address
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10369 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-03 20:22:51 +00:00
arpi 7ff83a7181 linux->osdep
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9381 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-09 20:18:23 +00:00
alex 6811f96358 removed get_info, using the same sheme as in libmpcodecs instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8149 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-11 15:22:10 +00:00
alex 64bedd9683 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7125 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 21:32:32 +00:00
alex a70e4ff973 removed query_vaa
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6818 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-26 12:42:43 +00:00
alex e290b55198 revised query_format
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6212 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-27 17:44:32 +00:00
alex 53ee55160d minor fixes and flipping support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5704 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-19 16:50:03 +00:00
alex 5814bcece3 added support for directrendering, updated to VFCAP_ flags in query_format, added support for non-directbuffer devices, and using mem2agpcpy_pic
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5638 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-15 18:04:18 +00:00
alex 7283920d29 older API fixes, support for async mode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4842 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-24 16:28:44 +00:00
alex e07d2921f4 do not fault if no directbuffer available (for example: ggi display-multi)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4832 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-24 02:50:02 +00:00
alex 21043e0d28 reworked :) should work on low bpp outputs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4831 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-24 02:21:14 +00:00
alex 723c3a1fd0 totally reworked, working fine on fbdev too, applied Andres Beck's patches, quad-buffering support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4829 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-23 23:31:08 +00:00
nick 5ddd8e92a1 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4738 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-17 08:24:43 +00:00
arpi 4b33dccb25 10000hl to Holm... control MUST BE static...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4597 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-09 01:21:48 +00:00
arpi 7c51652a1b query_ stuff replaced by new control() - patch by David Holm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4593 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-09 00:47:26 +00:00
nick b587a3d642 new info for tuning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4434 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-31 09:57:13 +00:00
nick fa1d5742bc Extensions for video accelerated architecture
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4353 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-26 16:01:26 +00:00
nick dfe91abaa2 Move yuv2rgb to postprocess
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2733 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-11-06 11:22:40 +00:00
atlka ca99c8dc89 changes according to -utf8 option, draw_osd() function added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1502 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-13 11:08:18 +00:00
atmosfear eb1bede70a Should fix bytes per pixel for 15bpp.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1199 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-06-23 13:28:28 +00:00
al3x b267d6e357 hardly modified, keyboard handling is ok. aspect implemented, but bugging :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1173 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-06-19 23:20:59 +00:00
al3x e3e885d7cd bennehagytam egy bugot :(
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1149 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-06-17 18:33:05 +00:00
al3x 24101782d0 hacked osd working on yv12
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1148 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-06-17 18:32:14 +00:00
atmosfear 39f60a9550 Fixed OSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1146 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-06-17 17:43:04 +00:00