1
mirror of https://github.com/mpv-player/mpv synced 2024-11-14 22:48:35 +01:00
Commit Graph

172 Commits

Author SHA1 Message Date
Uoti Urpala
f38efd166e Merge svn changes up to r31097 2010-04-26 19:23:32 +03:00
reimar
7da954855a Set vo_dwidth/vo_dheight for mouse movements work at least in windowed mode.
For fullscreen, vo_screenwidth/vo_screenheight have to be set correctly still.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31095 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 16:48:48 +00:00
reimar
9661a675e5 Share SDL initialization code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31079 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 09:52:01 +00:00
reimar
7c2bef4bb5 Add sdl_common file and use it to share the input handling between -vo gl
with SDL backend and -vo sdl.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31074 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 08:17:23 +00:00
reimar
d5d3c203d3 Remove code to work around bugs in ancient libSDL versions, the code has been
accidentally disabled since some time and there were no complaints.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31067 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-24 17:15:28 +00:00
Uoti Urpala
00323c06e2 Delete things related to old translation system
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
2010-03-10 03:47:14 +02:00
Uoti Urpala
b390b9b28f Merge svn changes up to r30185 2010-01-08 01:36:05 +02:00
reimar
c23a01e260 Fixup SDL configure check:
- Make it work without sdl-config which adds at least useless or even hurtful
  cflags and also does not work for cross-compiling
- If using sdl-config, make it use the CFLAGS we actually use for compiling
  instead of something else. Thus #undef main is needed in the test program.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30178 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 11:33:33 +00:00
Uoti Urpala
0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Amar Takhar
e306174952 Translation system changes part 2: replace macros by strings
Replace all MSGTR_ macros in the source by the corresponding English
string.
2009-07-07 01:38:20 +03:00
Amar Takhar
b5972d6f14 Translation system changes part 1: wrap translated strings
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
2009-07-07 01:28:07 +03:00
diego
6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
Uoti Urpala
cf9edda1d3 Merge svn changes up to r29117 2009-04-01 02:43:47 +03:00
diego
8484309af2 Remove obsolete extra elements from opt_t struct initialization.
Fixes a bunch of 'excess elements in struct initializer' warnings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28957 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 10:03:09 +00:00
Uoti Urpala
ae2faad666 Merge svn changes up to r28951 2009-03-14 23:52:45 +02:00
reimar
05119ecaf6 Make data related to suboption parsing const in libvo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28863 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-07 08:51:40 +00:00
Uoti Urpala
0406d95120 Merge svn changes up to r28348 2009-01-23 20:56:50 +02:00
diego
8d242b60e0 cosmetics: Remove pointless period after copyright statement non-sentences.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28342 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-19 17:12:43 +00:00
Uoti Urpala
e62517ef6a Merge svn changes up to r28065 2008-12-02 18:02:05 +02:00
reimar
5a0c4f3b61 Remove a lot of completely pointless mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28055 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-01 16:37:06 +00:00
Uoti Urpala
0301309425 Merge svn changes up to 27824
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
2008-10-25 05:12:34 +03:00
cehoyos
22bb046adc Replace numeric constants by their defines.
Fixes icc warning #188: enumerated type mixed with another type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27738 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-09 17:08:47 +00:00
Uoti Urpala
17d3e4b36d Merge svn changes up to r27441
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
2008-08-08 02:13:09 +03:00
diego
82f319af62 Change a bunch of X11-specific preprocessor directives.
Switch from a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-04 06:16:23 +00:00
Uoti Urpala
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
diego
8ba8cac28d Use standard license headers with standard formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26771 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 17:22:53 +00: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
diego
72cc06352f Fix nonsensical license header, mpeg2dec is not GNU Make.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26361 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 11:31:50 +00:00
diego
5e1457d4fe Use __AMIGAOS4__ instead of AMIGA, like everywhere else.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26246 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-15 09:50:12 +00:00
diego
f6afdbca59 Consistently use __APPLE__ instead of MACOSX as preprocessor condition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26243 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-15 09:23:48 +00:00
diego
37ea342f85 #include config.h before all other headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26235 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-14 16:46:13 +00:00
diego
f4ac29f285 Remove changelog from file header, we have revision control for this.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25624 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 12:58:02 +00:00
diego
8a00a66de3 Replace some more broken SYS_DARWIN preprocessor conditionals with __APPLE__.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25425 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-16 23:50:05 +00: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
diego
14c25c122f movie player for Linux --> movie player
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24899 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-30 17:39:55 +00:00
diego
3cb11cbe20 A missing break statement caused SDLK_PLUS to be triggered twice on one press.
patch by Michael Mauch, michael.mauch gmx de
Subject: [MPlayer-dev-eng] [PATCH] Add two breaks in the key handling of vo_sdl
Date: Tue, 23 Oct 2007 00:04:20 +0200


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24842 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-22 22:42:47 +00:00
diego
f28e5871ed cosmetics: typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24764 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-11 12:22:14 +00:00
reimar
576500d6a6 Avoid vo_sdl void * arithmetic
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23639 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 11:07:47 +00:00
reimar
6a09e8e2ed Replace implicit use of fast_memcpy via macro by explicit use to allow
for future optimization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 14:27:54 +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
reimar
ff32ae1051 Move code to ignore mouse wheel "down" events to fifo.c (needed because
they too easily cause those "buttons" to get stuck), reducing code duplication.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21982 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 11:05:21 +00:00
diego
084a5d01b5 Amiga OS 4 support
patch by Andrea Palmatè, andrea amigasoft net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21750 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-23 23:27:01 +00:00
diego
35b960c206 Use MOUSE_BTN0 instead of MOUSE_BASE for consistency with other vo drivers.
patch by Laurent Wozniak, laurent.wozniak laposte net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20170 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 00:39:47 +00:00
nplourde
6b0da6eb35 disable double buffer in vo_sdl on macosx. fix flicker issue.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19434 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 02:22:39 +00:00
diego
3f62423f42 Rename some misspelled and misnamed messages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18336 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-28 23:06:42 +00:00
reynaldo
78417bf0dd Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18235 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 04:23:53 +00:00
diego
eebf08b978 Convert all if(verbose>X) to mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:12:03 +00:00
al
fa2d1c9a69 - move our setenv() fallback implementation to osdep
- assert that the override param is nonzero (zero is not implemented)
- correct return value type to int

based on a patch by Diego
fixes bugzilla bug #342


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17246 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-26 03:16:48 +00:00
albeu
374db42e17 libvo input cleanup: remove the dependency on libinput,
remove most of the crappy mappings (like O->o or ESC->q).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16893 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-02 21:50:55 +00:00