Uoti Urpala
4a36b51ea6
Merge svn changes up to r29455
2009-07-29 01:32:03 +03:00
diego
e5751ced4f
Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29443 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-26 19:53:00 +00:00
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
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
53eeb0e412
Merge branch 'ordered_chapters'
2009-04-08 02:43:44 +03:00
Uoti Urpala
7db6430959
VO: Don't reset pause status in VO config() functions
...
Many VOs kept track of pause status, but reset the value when their
config() function was called. However it can be called while playback
stays in pause mode. Modify the VOs to not change anything in
config(). Also send the VO either VOCTRL_PAUSE or VOCTRL_RESUME when
the playback of a new file is starting to make sure they have the
right status.
2009-04-02 06:51:26 +03:00
Uoti Urpala
cf9edda1d3
Merge svn changes up to r29117
2009-04-01 02:43:47 +03:00
reimar
b4f5702c0a
Consistently use MP_MAX_PLANES as size for plane pointer/stride arrays in libvo.
...
This might avoid some issues since sws_scale in some cases assumes these
have at least 4 valid entries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29101 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-29 14:37:21 +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
c1b80dcbbb
Merge svn changes up to r28204
2008-12-27 17:40:57 +02:00
diego
d76a585366
Remove pointless forward declaration.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28184 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-23 13:31:04 +00:00
Uoti Urpala
835511ac39
Merge svn changes up to r28038
2008-11-25 21:12:01 +02:00
reimar
6c3457bd0e
Clear the whole window on resize in vo_x11 since we do not
...
yet know how large the borders will be.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28011 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:49:05 +00:00
reimar
7428efabee
Simplify vo_x11 check_events function
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28010 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:47:04 +00:00
reimar
b704defedd
Do not draw in window if our image has not yet been adjusted to the new window size.
...
Fixes some cases of borders not being black in fullscreen when fullscreen image
is scaled down.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28009 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:39:15 +00:00
reimar
af80fe7f12
Remove unnecessary xf86vmode.h include.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28008 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:20:51 +00:00
reimar
ff05d203b2
Remove some usnused variables and commented-out code.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28007 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:19:06 +00:00
reimar
307953643d
Use aspect.c code in vo_x11.c. Removes some inconsistencies in -wid handling.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28006 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:17:46 +00:00
Uoti Urpala
6cbca28085
Merge svn changes up to r27979
2008-11-22 19:16:43 +02:00
reimar
b8a0605f4b
Simplify handling of "flags" parameter
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27977 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-21 23:17:26 +00:00
reimar
3095b31c26
Add forgotten initialization if Flip_Flag to 0.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27976 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-21 23:14:38 +00: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
8cc27a3561
Remove explicit setting of vo_ontop since that is already done by vo_x11_create_vo_window
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27937 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 23:09:31 +00:00
reimar
f5ce35ec8c
Remove a duplicated vo_x11_selectinput_witherr
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27936 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 22:49:49 +00:00
reimar
554ce917df
respect -vf dsize etc. also for -rootwin, just like vo_xv does.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27935 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 22:48:41 +00:00
reimar
55175c457d
Remove now unused variables.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27926 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 19:03:21 +00:00
reimar
21040bb951
Use vo_dwidth/vo_dheight for creating the windows instead of d_width/d_height.
...
This fixes the -vm bug that the created window is too small.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27925 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:58:14 +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
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
reimar
18fac2d947
Remove code from unused and since ages deprecated draw_frame function.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27917 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 16:40:48 +00:00
reimar
08367541bc
vo_x11: do not replace the vo_gc created by the Gui.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27915 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 16:34:44 +00:00
reimar
60b5834701
Cosmetic changes to vo_x11 to reduce diff to vo_xv for future refactoring.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27914 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 15:50:47 +00:00
reimar
e0a4769570
Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27913 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 14:24:32 +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
faust3
fe44156133
fixed image format detection for 15 bit color depths
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27796 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-17 10:01:44 +00:00
Uoti Urpala
e09fe1ce04
Merge svn changes up to r27458
2008-08-12 15:03:34 +03:00
diego
c324966059
Remove duplicated prototype for XShmGetEventBase(), because
...
- it is used in other places without checking,
- it is a workaround for a bug elsewhere,
- if the problem is real at all, there should be a proper configure check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27444 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-09 14:56:09 +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
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
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
Uoti Urpala
dbe080ec9f
Change VOCTRL_[GET|SET]_EQUALIZER argument passing
...
These were the only voctrl types with more than one argument. The
second argument was passed using variable arguments. Change them to
use a single argument (address of a struct containing both old
arguments). This makes forwarding the arguments to other functions
easier and allows simplifying code.
2008-04-23 13:41:03 +03:00
diego
835c654bb0
typo fix: inited --> initialized
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00