Commit Graph

3137 Commits

Author SHA1 Message Date
reimar e0c5806d44 Add newlines to generated fragment program to make both fragment program dump
with -v more readable and compiler error message more understandable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30882 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-12 17:21:05 +00:00
reimar 7f0c959ddc Use FBIOPAN_DISPLAY for switching between pages, seems to work for more
drivers and can be much faster.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30859 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-07 17:33:13 +00:00
reimar 16ec3a5a8a Add double-buffering support to vo_fbdev.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30858 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-07 15:55:52 +00:00
reimar 7852aff0c4 Reuse fb_tty_fd for setting up the text area.
This avoids the fopen call which could end up creating a /dev/tty file
if it did not exist.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30846 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 20:15:16 +00:00
reimar baae4d1add Save the new width and height earlier so that e.g. -geometry 30x30-50-50
gives the correct behaviour - before placement would depend on the
original movie size instead of the one scaled according to -geometry.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30823 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 21:01:57 +00:00
reimar 90188f0e5f Add support for specifying window position relative to right and bottom
screen borders with -geometry.
Based on patch by Melchior FRANZ [melchior franz gmail com].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30822 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 20:57:56 +00:00
reimar 0833aaa64d Simplify sscanf format strings and get rid of useless percent variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30821 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 20:36:35 +00:00
reimar 55b3c6f090 Avoid very deep indentation level and RESET_GEOMETRY macro in -geometry
parsing.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30820 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 20:24:46 +00:00
diego c106fe7751 Drop support for old-style DVB code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30818 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-02 19:57:17 +00:00
cehoyos 2acd36c48e Documentation: Add linebreak and try to be less ambiguous.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30800 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 17:39:30 +00:00
cehoyos 8271fc722b Remove unused static function send_lpcm_packet().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30766 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 20:22:30 +00:00
reimar 84a962ebea Update -vo gl info structs, it isn't X11-only since ages and there's basically
no code left from Arpi and it's unlikely the email address is still working anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30763 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 18:20:22 +00:00
reimar 5f32754c14 100l, remove forgotten debugging code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30762 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 18:17:33 +00:00
reimar e92eaa0fd8 Only prefer -vo gl over -vo x11 if hardware acceleration is available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30761 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 18:16:41 +00:00
reimar 05c24134de Enable StructureNotifyMask before waiting for a DestroyNotify event.
Fixes hangs if OpenGL initialization fails in vo gl preinit and we
call uninit while the window is still hidden.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30760 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 17:55:57 +00:00
reimar 09cf021307 Port yuv=... auto-detection from gl to gl2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30753 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 21:41:42 +00:00
diego 38b7648cac Mark character arrays as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30751 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 19:57:40 +00:00
diego b63759b175 Do not cast the results of malloc/calloc/realloc.
These functions return void*, which is compatible with any pointer,
so there is no need for casts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 15:01:37 +00:00
reimar e3e75ca066 Reorder vos: prioritize -vo gl above -vo x11 and -vo matrixview down with aa, caca etc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30741 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-25 22:53:04 +00:00
diego 2074d1a3e7 Unconditionally declare fast_memcpy() and mem2agpcpy().
This fixes the following warnings on non-x86 systems:
libvo/aclib.c:162: warning: no previous prototype for 'fast_memcpy'
libvo/aclib.c:196: warning: no previous prototype for 'mem2agpcpy'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30728 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-25 13:20:56 +00:00
diego 36a14ac50c Declare externally used variables from vd.c as extern in vd.h.
This saves declaring them as extern all over the place.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30695 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 09:51:44 +00:00
diego b18b59b8d4 Add header for v4l2_write() instead of forward declaring it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30692 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 23:31:56 +00:00
diego 8ba6b4eaf9 cosmetics: Remove pointless empty lines at EOF.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 21:02:49 +00:00
diego d306b727b1 Remove pointless '#if 1' preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-19 10:22:29 +00:00
diego eea4f2238b Add header for functions exported from vo_zr.c and use it appropriately.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30635 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-18 10:19:42 +00:00
reimar 50973f0044 Move struct typedef pixbuf into the only .c file where it is used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30603 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-16 19:39:30 +00:00
reimar 0dc08a811d Remove useless malloc casts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30602 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-16 19:36:36 +00:00
reimar 091e2a4313 Remove unused XPM-loading function pixbuf_load_xpm() from spuenc.c.
Remove unused function pixbuf_delete() from spuenc.[ch].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30601 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-16 19:34:41 +00:00
diego 6833ea6ab2 libvo: Mark functions not used outside of their files as static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30598 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-16 16:22:17 +00:00
reimar 676a0c121e Remove unused variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30589 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 18:50:32 +00:00
reimar 51cc80d2dd Use memset to initialize huge arrays.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30588 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 18:38:02 +00:00
reimar 687744dfed Remove pointless explicit member initialization to 0 when the struct
is already zeroed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30587 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 18:32:31 +00:00
reimar af356b5d15 Use calloc instead of malloc+memset
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30586 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 18:30:32 +00:00
diego 2e816f7a17 Add xscreensaver_heartbeat() declaration to x11_common.h.
This avoids a forward declaration in mplayer.c.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30574 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 12:57:18 +00:00
diego 11b55ec7a8 Fix exit_player() usage throughout the codebase.
exit_player() was declared with differing parameter types in mplayer.c and
mplayer.h. Make the declaration in the .h file match the one in the .c file
and adjust all usages of exit_player() throughout the codebase. Also move
the exit_player() declaration into mp_core.h next to exit_player_with_rc().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30558 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 10:53:20 +00:00
reimar c5b0ff1cfa Fix hang with -fixed-vo due to VOFLAG_HIDDEN never being removed from window_state.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30514 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-05 16:42:13 +00:00
reimar 21208015e0 Print messages only after we are sure preinit will not fail anymore.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30510 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-05 07:12:05 +00:00
reimar 1cd3b3c5dd Add support for VOFLAG_HIDDEN to the w32 backend.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30509 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 22:46:45 +00:00
reimar bf6dc310dc Set the PixelFormat right after creating the window and set it only once.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30508 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 22:46:01 +00:00
reimar f34454b6b5 Create the OpenGL probe window as a hidden Window on X11.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30507 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 22:08:23 +00:00
cehoyos 212eb494ff 100l: Fix compilation (broken by me).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30504 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 17:27:38 +00:00
cehoyos eacccfafc8 Clarify -vo vdpau:pullup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30503 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 16:56:28 +00:00
reimar bc9eaa5404 Use vo_x11_clearwindow instead of XClearWindow, both for consistency and also
because vo_x11_clearwindow works as intended also when the background is
set to None.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30497 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-03 21:12:23 +00:00
reimar 115f7d2e63 Remove a duplicated vo_x11_sizehint, vo_x11_nofs_sizepos already calls this
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30493 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-02 21:27:17 +00:00
reimar 75bfddd3a2 Remove pointless initializers and also set geometry_*_changed to 0 when
-geometry did not adjust some values (instead of only ever setting them to 1
and never reset them).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30492 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-02 21:18:21 +00:00
reimar f8e4b8ec7c Add support for autodetection during preinit and use that to detect a default
value for the yuv suboption.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30489 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-02 20:37:48 +00:00
reimar 18011824ac Avoid using options before autodetectGlExtensions to allow it to change them properly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30488 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-02 20:20:48 +00:00
reimar 2feef89fce Remove vo_config_count check from uninit, it should always be safe to run.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30487 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-02 20:16:57 +00:00
diego 5640ddf49c Add missing #include, fixes the warning:
libvo/vo_png.c:147: warning: implicit declaration of function 'imgfmt2pixfmt'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30469 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 23:01:32 +00:00
diego 1e4bf6639e Add missing license header and multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30456 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 13:22:24 +00:00