Commit Graph

31720 Commits

Author SHA1 Message Date
Uoti Urpala f38efd166e Merge svn changes up to r31097 2010-04-26 19:23:32 +03:00
Uoti Urpala 7a33e76943 Skip svn changes r30151, r30152
The functionality equivalent was already done last month in git
(plus the svn commit has a misleading MSGL_WARN message that shouldn't
be there).
2010-04-26 18:51:02 +03:00
Uoti Urpala 9a34ae4fd0 Merge svn changes up to r31050 2010-04-26 18:46:18 +03:00
Uoti Urpala 8df340271e Merge svn changes up to r31040 2010-04-26 18:38:11 +03:00
Uoti Urpala b4c7b7ce11 Skip svn change r31034 (bad FFmpeg-ASS support attempt)
This svn commit is wrong in multiple ways. First, it doesn't actually
work; there's more than one functionality bug. Second, it's the wrong
overall approach. If FFmpeg continues to insist on mangling subtitles
to this badly-thought-out format and support for it is desired in
MPlayer then the right approach would be conversion to a saner format
in demux_lavf, instead of trying to handle the mangled format
elsewhere.
2010-04-26 18:36:16 +03:00
Uoti Urpala 7795726e0f Merge svn changes up to r31033 2010-04-26 18:25:34 +03:00
Uoti Urpala ba3b65b92f Skip svn changes up to r31022 2010-04-26 18:06:49 +03:00
Uoti Urpala 837c48ddee Merge svn changes up to r31020 2010-04-26 18:06:00 +03:00
Uoti Urpala e913d6c5da Merge svn changes up to r31004 2010-04-26 17:55:05 +03:00
Uoti Urpala be935e2766 Ignore svn changes up to r30974
FFmpeg build stuff.
2010-04-26 17:45:07 +03:00
Uoti Urpala 6a7956a11b Merge svn changes up to r30972 2010-04-26 17:44:48 +03:00
Uoti Urpala e6048e1830 Skip svn change r30968
Already done long ago in git.
2010-04-26 17:43:35 +03:00
Uoti Urpala 4785c2617e Merge svn changes up to r30967 2010-04-26 17:42:20 +03:00
Uoti Urpala 2732d5efba Skip svn change r30918 2010-04-26 17:13:37 +03:00
Uoti Urpala 95fba94860 Merge svn changes up to r30917 2010-04-26 17:11:04 +03:00
Uoti Urpala 3c2d6d9a8e Merge svn change r30908 2010-04-26 17:00:52 +03:00
Uoti Urpala ff559b8e90 Merge svn changes up to r30907 2010-04-26 16:57:25 +03:00
Uoti Urpala d2e25a90c4 core: track current chapter for relative chapter seeks
Due to inexact seeks, chapter seek commands may result in a playback
position that's inside the previous chapter. This causes problems when
the user does repeated next-chapter/previous-chapter seeks, because
the code will use the wrong base for calculating 'next' or
'previous'. Improve the behavior by adding a heuristic that keeps
track of what chapter the user last wanted to seek to and adjusts the
"current chapter" value based on that.
2010-04-25 23:29:46 +03:00
Gabrov 4e853e19ef synced with r31096
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31097 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 20:05:22 +00:00
Uoti Urpala 823b989f0f mplayer.c: silence some compiler warnings
No semantic changes.
2010-04-25 23:05:01 +03:00
Uoti Urpala 082287f3a3 cfg-mplayer.h: add casts to silence warnings 2010-04-25 23:00:19 +03:00
Gabrov c9c728034e typo fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31096 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 19:58:43 +00:00
Uoti Urpala 66a983985d mplayer.h: remove unnecessary declarations (dvd_device, cdrom_device) 2010-04-25 22:58:35 +03:00
Uoti Urpala b1372a4f56 cosmetics: mark sub.c:osd_update_ext() static 2010-04-25 22:57:49 +03:00
Uoti Urpala 0b6e3647a5 commands: finish seeks before processing other commands
The code processing seek commands only sets/alters variables
specifying the current seek target. Before all queued commands were
processed first, and any needed seeks were executed after that. This
was somewhat unreliable, as commands queued later were not guaranteed
to see all the effects of earlier seek commands if they happened to be
processed in the same batch. Change the behavior so that processing
commands is interrupted and the real seek executed if the next command
is anything other than a basic seek. This guarantees that other
commands see a consistent state, while still allowing the combining of
consecutive seeks (which is useful for example when the user keeps the
seek-forward key pressed down, and key repeat is faster than seeks can
be executed).
2010-04-25 22:48:40 +03:00
Uoti Urpala 4cb23ad350 input: remove unused "paused" arguments from some functions 2010-04-25 22:48:18 +03:00
Uoti Urpala 1393793cd3 menu.h: add struct tag declaration to avoid warnings 2010-04-25 22:48:10 +03:00
Uoti Urpala 05ae9dbd0d Fix chapter handling with first chapter not at beginning of file
Before "-chapter 1" did nothing even if the first chapter didn't start
at the beginning of file. Fix it.
Before all chapter property commands (including chapter seek keys)
failed if the current playback position was before the start of the
first chapter. Now they'll work. Relative chapter seeks will go to the
first chapter (even if that's in the wrong direction for backward
seeks).
2010-04-25 22:48:10 +03:00
Uoti Urpala dd1760e697 demux_mkv: fix verbose output of chapter numbering
The "Chapter N from..." lines printed with -v used wrong N.
2010-04-25 22:48:10 +03:00
Uoti Urpala 859e956523 Fix -chapter with ordered chapters
Move the code doing an initial seek specified by -chapter to a
position where it works if ordered chapters are used.
2010-04-25 22:48:10 +03:00
Uoti Urpala a2133d7684 options: move -chapter values to option struct
-chapter can optionally take a range with a start and an end. Add a
new option type which supports such values and use that instead of a
custom per-option function.

This commit also fixes a build configuration bug: before the
availability of the -chapter option depended on DVD functionality
being enabled in the binary, even though the option works with other
sources too.
2010-04-25 22:48:10 +03:00
Uoti Urpala 9c63c084ff mplayer.c: share seek-reset code with chapter seeks
Move code resetting various things after a seek into a separate
function and use that for chapter seeks too. In most cases this won't
change behavior because chapter seeks were already falling back to the
same time-based seek code.
2010-04-25 22:47: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 12c9fa73f3 Try other methods also if GetBusKey fails instead of failing completely.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31094 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 16:39:39 +00:00
reimar af7e76c80b Missing space after if.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31093 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 16:20:54 +00:00
reimar 3d2259d365 Support mouse movements in SDL.
Currently for some reason broken with -vo sdl.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31092 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 16:15:00 +00:00
reimar 14c018a80f Avoid duplicating mouse-movement command-generation code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31091 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 16:13:57 +00:00
reimar 38505822c7 Fix crash if a DVD is played with dvdnav:// and without video
(e.g. because vo initialization failed).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31090 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 16:09:56 +00:00
reimar 2f629d7969 Deduplicate enable_mouse_movements declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31089 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 15:49:46 +00:00
reimar 07a9a495c8 Minor cosmetics.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31088 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 15:41:21 +00:00
reimar f189c8286a Add comment for endif.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31087 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 15:39:22 +00:00
reimar a9ff7793e3 Support for auto-selecting the OpenGL backend.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31086 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 10:53:01 +00:00
reimar 3a34dbc927 Add reinitialization support. Necessary for fullscreen on OSX.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31085 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 10:44:53 +00:00
reimar 4121ce1747 Handle SDL expose events with -vo gl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31084 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 10:34:58 +00:00
reimar 63c3c67294 Missing space in error message.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31083 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 10:12:39 +00:00
reimar 2d8e13c4ea Simplify SDL key symbol mapping.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31082 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 10:09:01 +00:00
reimar b2d0096783 Use the proper define for translating the tab key.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31081 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 09:59:43 +00:00
reimar 12d11bbd3a Make uppercase characters and in general all ASCII characters work
properly with SDL.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31080 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 09:57:52 +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 e0183c56b1 Remove unnecessary check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31078 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 09:25:23 +00:00