Commit Graph

2550 Commits

Author SHA1 Message Date
Uoti Urpala bfe569b76e Move vo_ontop to options struct
Add a 'struct vo *vo' argument to the x11_common.c functions that
access the variable so it's available as vo->opts->vo_ontop. To keep
VOs using the old API working create a global vo variable that is set
to the currently used old vo. "vo_ontop" will be #defined to
"global_vo->opts->vo_ontop", and x11_common.h will add defines like
the following when it is included by old VOs:
 #define vo_x11_ontop() vo_x11_ontop(global_vo)
so that they will call the function according to the new declaration.
2008-04-23 13:41:06 +03:00
Uoti Urpala 6c9d09170d vo_gl[2]: Rename conflicting vo_ontop macro
Rename the vo_ontop() macro to vo_gl_ontop(). It caused problems with
other changes because it conflicts with a global variable name (gl2
actually called vo_ontop() as a function and used vo_ontop as an int -
this only worked because vo_ontop was defined as a function-like macro
and use without parentheses didn't trigger replacement).
2008-04-23 13:41:06 +03:00
Uoti Urpala 8ec90e5e4f Add option pointer to vo struct 2008-04-23 13:41:06 +03:00
Uoti Urpala f894294bae vo_xv: Free resources in error cases
If preinit() failed after allocating some resources it didn't free
them. Also if preinit() completed but all (if any) calls to config()
failed then uninit() it not free resources. Add checks to uninit() to
make it safe with only a subset of resources allocated, then make it
execute independently of vo_config_count and also make preinit() call
it in error cases.
2008-04-23 13:41:05 +03:00
Uoti Urpala b91826280c vo_xv.c: Make reconfig logic more robust
The previous version was not buggy, but this is easier to see correct.
Now it doesn't depend on options determining num_buffers staying
constant and on vo_config_count.
2008-04-23 13:41:05 +03:00
Uoti Urpala 461264756e vo_xv.c: remove unnecessary #ifdefs and static vars
Combine code unnecessarily split in 3 #ifdef blocks into one block and
change local variables there were pointlessly declared static to
normal ones.

After this vo_xv.c no longer defines any global or static variables.
2008-04-23 13:41:04 +03:00
Uoti Urpala 1756771e51 vo_xv.c: Cosmetic changes
Remove an unnecessary inner scope in a function and separate 'i' loop
counter variable declared in it, reindent.
2008-04-23 13:41:04 +03:00
Uoti Urpala ef874e0f4c Change vo_xv to use new VO API 2008-04-23 13:41:04 +03:00
Uoti Urpala e5e8effca8 Add a context argument to mp_input_add_event_fd callback 2008-04-23 13:41:04 +03:00
Uoti Urpala 4176d5b183 vo_xv.c: Remove #if 0 code 2008-04-23 13:41:04 +03:00
Uoti Urpala 8716df2a41 Add context variable to vo_draw_text callback
Add a context variable and rename the function to osd_draw_text. Create
a new vo_draw_text that is a wrapper for VOs using old API.
2008-04-23 13:41:04 +03:00
Uoti Urpala 2bcfe1e077 Add new video driver API
Create new video driver API that has a per-instance context structure
and does not rely on keeping status in global or static variables.
Existing drivers are not yet converted to this API; instead there is a
wrapper which translates calls to them.

In the new API, an old API call vo_functions->xyz(args) is generally
replaced by vo_xyz(vo_instance, args).

The changes to keep the vesa, dxr2 and xover drivers compiling have
not been tested.
2008-04-23 13:41:04 +03:00
Uoti Urpala 3bb140d847 video_out.c: Cosmetic changes
Reformat some code, rename local variable, remove trailing whitespace.
2008-04-23 13:41:03 +03: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
attila 530df550e4 revert commits 26437-26439
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26468 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 09:58:01 +00:00
attila d08bf2fc44 cosmetics: fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26439 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 11:15:08 +00:00
attila f5ccd50211 move the #ifdef HAVE_XINERAMA to enclose the whole function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26438 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 11:12:24 +00:00
attila d48f39e68c Always calculate the xinerama screen mplayer is on.
Bug reported by thomas.lindroth(<at>)gmail.com



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26437 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 11:08:59 +00:00
diego e59291d5a9 Replace "all rights reserved" statement with standard GPL license header.
Done with the permission of Andreas Ackermann, the author of the file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26432 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 09:09:36 +00:00
diego 27d308ae44 Remove -I CFLAGS hack, -I../libavcodec is no longer in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26372 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 17:14:43 +00: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
reimar 9761bde49c Change I_TYPE -> FF_I_TYPE to fix compilation.
The whole functionality should probably be used to libavcodec though.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26322 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-03 17:19:23 +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 b5fb7e831e Add a separate definition for quartz.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26245 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-15 09:49:14 +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 5e49bb2dd2 MACOSX_COREVIDEO --> corevideo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26241 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-15 09:19:38 +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
reimar 5979388565 Fix and simplify lscale=2 (bicub_x) scaler, produced funny
noise on ATI cards due to cdelta.y never being set.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26227 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-12 15:17:06 +00:00
iive ad76dcfb58 Fix wrong check for vidix usage.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26206 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-09 18:49:31 +00:00
iive 66fafa133f Don't use void * arithmetic.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26205 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-09 10:35:45 +00:00
iive ea92f386c6 Handle vga_init() error and output error message.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26204 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-09 10:34:04 +00:00
diego c5001347c2 This header uses parts of stdint.h, so #include it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26195 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-07 20:25:26 +00:00
diego d04df10807 Add missing header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26194 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-07 20:07:15 +00:00
diego 01b301602c Remove unnecessary #ifdef nesting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26192 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-07 17:20:04 +00:00
diego c03c4b5431 Wrap '#include <sys/mman.h>' in HAVE_SYS_MMAN_H.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26137 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 10:31:51 +00:00
diego 21c200e767 FFmpeg now uses different (unified) #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 15:46:36 +00:00
diego 8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
diego 878e9ef324 Add missing multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26044 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-21 00:12:02 +00:00
diego 2fa781bcfe Consistently use filename as multiple inclusion guard.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26043 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-21 00:10:33 +00:00
diego 77eb726c3d Remove pointless #ifdefs around extern declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-20 08:51:53 +00:00
uau 1a3fb6c21e libvo: change asm syntax to use ASMALIGN and " # nop"
Change ".balign 16\n\t" to ASMALIGN(4) and "/nop" to " # nop". The new
version is what other code in MPlayer uses, and works with old
assembler versions like that used on OS X.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26005 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-15 21:52:34 +00:00
cehoyos e78f2ea6dc Revert accidentially committed line of r25994.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25995 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:39:49 +00: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
reimar 7a6d302f42 Try harder to find OpenGL functions on Windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25985 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-11 19:37:47 +00:00
reimar 19578c6960 Slightly document alpha for OSD color
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25984 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-11 19:01:34 +00:00
reimar 2d79c4c109 Support alpha for vo gl osdcolor
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25983 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-11 19:00:01 +00:00
reimar 875d963649 Remove an extern for a variable that no longer exists
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25982 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-11 15:23:21 +00:00
reimar 8c1a56e57a Remove left-over extern definitions that should not be there
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25981 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-11 15:21:25 +00:00
reimar b8abe420bc Make some variables static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25978 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-10 19:58:05 +00:00