1
0
mirror of https://github.com/mpv-player/mpv synced 2025-04-06 17:43:02 +00:00
Commit Graph

318 Commits

Author SHA1 Message Date
Anton Khirnov
87366694d8 Remove the internal GUI
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.
2009-07-07 21:49:42 +03: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
Uoti Urpala
8ca11dda9e VO: Don't force window position in X11 VOs
Disable by default the code that forcefully moved the video output
window to the middle of the screen whenever it was reconfigured or
created. That behavior was really annoying when switching video
streams within a file, and overriding the window manager like that is
not good default behavior for the initial creation of a window either.
Add a new option "-force-window-position" that can be used to restore
the old behavior.
2009-03-31 18:23:45 +03:00
Uoti Urpala
e0172b96e3 Merge svn changes up to r28862 2009-03-07 01:04:41 +02:00
reimar
76f7f3aa0d Make sure vo_x11_create_vo_window sets vo_dwidth and vo_dheight right
when we were in fullscreen mode and stay there.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28806 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-04 08:37:54 +00:00
Uoti Urpala
738f66b1bc Merge svn changes up to r28549 2009-02-13 03:52:51 +02:00
reimar
dbc106f4da Remove now unused vo_calc_drwXY function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28547 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 18:03:38 +00:00
reimar
36d0d92f21 Only set VO_EVENT_RESIZE if size actually changed, not if e.g. the window was
only moved to the foreground.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28541 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 12:43:14 +00: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
9bcd12fdf5 Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
2009-01-15 05:57:31 +02:00
cehoyos
0fa2d1abd7 Factor calc_drwXY out of vo_xv and vo_xvmc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28285 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-09 15:25:24 +00:00
Uoti Urpala
c1b80dcbbb Merge svn changes up to r28204 2008-12-27 17:40:57 +02:00
diego
1e1de192f8 Remove unused variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28191 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-24 16:57:35 +00:00
Uoti Urpala
fccb0a7e45 Merge svn changes up to r28176
Conflicts:
	libvo/video_out.c
	libvo/x11_common.c
2008-12-22 00:46:02 +02:00
reimar
01405c8f50 100l, forgot an assignment, broke special keys handling for X11-based vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28175 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-21 04:11:51 +00:00
reimar
d1065dffe1 Add and use a special lookup function to do table-based translation to MPlayer keycodes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28172 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-20 11:52:11 +00:00
reimar
c4460fd32c Use a table to translate X11 to MPlayer keycodes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28170 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-20 11:12:45 +00:00
reimar
ca468a5f84 Simplify handling of X11 key events that are just passed through.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28168 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-20 10:25:13 +00:00
Uoti Urpala
cb3dc68691 Merge svn changes up to r28103 2008-12-06 02:16:51 +02:00
reimar
476c9bfd95 Set the base size window manager hint, otherwise some subtract the minimum
size of 4x4 from the numbers displayed to the user which might be confusing.
Based on patch by Bert Wesarg [bert wesarg googlemail com].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28097 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 19:01:49 +00:00
Uoti Urpala
6cbca28085 Merge svn changes up to r27979 2008-11-22 19:16:43 +02:00
reimar
c351d29392 Factor common code like -wid handling, vo_gc creation etc. out into
x11_common.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27961 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-19 20:19:25 +00:00
Uoti Urpala
1715c2a336 Merge svn changes up to r27949
Conflicts:
	common.mak
	libvo/vo_xv.c
	libvo/x11_common.c
	libvo/x11_common.h
	stream/cache2.c
2008-11-17 20:50:23 +02:00
reimar
4fa4e8744d include limits.h for INT_MAX.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27927 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 19:06:25 +00:00
reimar
4b9ee2e206 Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
boiler-plate code with them, just with different bugs.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27924 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:56:25 +00:00
reimar
c8d9e2eb60 Set modified window position and monitor aspect in vo_vm_switch instead of in
individual vo drivers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27923 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:28:35 +00:00
reimar
ebff32237b Set modeline_width/height to sane values in vo_vm_switch even when
the XF86VidMode extension is not available.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27921 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:11:10 +00:00
reimar
87bee02b19 Replace some of the different inconsistent XGetGeometry uses by a
vo_x11_update_geometry function.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27919 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 17:45:55 +00:00
Uoti Urpala
2ad77c5b00 Merge svn changes up to r27850 2008-10-30 08:25:33 +02:00
ben
b086fadb3d Remove X11 backing store: this is now a useless flag.
Also, it is mandatory for Xserver 1.5.x (part of Xorg 7.4, shipped on all
Linux distributions starting from Oct. 08) and will be removed
from Xserver 1.6 anyhow ...

Patch by Stephane Marchesin (marchesin at icps dot u dash strasbg dot fr).

For more info, see long flame thread at:
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2008-August/058323.html



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27849 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-29 22:03:36 +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
diego
73357cc804 Add missing support for some multimedia keys to X11 backend code.
patch by Jorge Lopez, jorgelt gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27747 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-12 15:58:44 +00:00
Uoti Urpala
849dc0ba31 Merge svn changes up to r27649
Conflicts:
	Makefile
	configure
	libvo/x11_common.c
2008-09-20 16:13:33 +03:00
reimar
7756839a14 Remove already disabled and probably long obsolete code that worked around an OpenBox bug.
Patch by Julien Danjou [ julien danjou info ]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27649 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-20 08:16:05 +00:00
reimar
0643fde0c3 Use already "prefetched" atoms instead of calling XInternAtom each time.
Patch by Julien Danjou [ julien danjou info ]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27648 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-20 08:14:28 +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
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
3b31fa5717 Rename two GUI-related preprocessor directives:
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
2008-07-30 13:44:59 +00:00
Uoti Urpala
3a69d65f8d Merge svn changes up to r27347
Conflicts:

	libvo/x11_common.c
	libvo/x11_common.h

Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts
with the global variable "vo_border"; done in the merge commit because
uses of the macro needed changes anyway to resolve conflicts.
2008-07-25 02:50:58 +03:00
reimar
983800b76f Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27338 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-22 18:46:07 +00:00
reimar
93f1a21bf7 Support -noborder with X11-based vos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27336 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-22 18:38:04 +00:00
reimar
839d579160 Make vo_x11_fullscreen not break vo_border (proper support still needs vo changes)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27335 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-22 18:33:53 +00:00
Uoti Urpala
68e70b3ec3 Merge svn changes up to r27092
Conflicts:

	libmpdemux/demuxer.c
	libvo/vo_xv.c
	mencoder.c
2008-06-17 05:04:32 +03:00
diego
f7867644cb Add parentheses to expression to avoid the warning:
libvo/x11_common.c: In function 'xss_suspend':
libvo/x11_common.c:1618: warning: suggest parentheses around && within ||


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-15 11:11:39 +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