Uoti Urpala
0e1b7765be
Merge svn changes up to r29644
2009-09-04 19:49:35 +03:00
reimar
d0c1992160
Consistently use sizeof(variable) instead of sizeof(type) where easily possible.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29632 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 14:18:01 +00:00
reimar
25cc492d90
Cosmetics: get rid of many pointless ()
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29631 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 14:11:30 +00:00
reimar
7a7c246709
Reduce code duplication for half/normal/double video size handling.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29630 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 14:02:15 +00:00
reimar
001e4be0ba
Remove unused variable.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29629 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 11:38:18 +00:00
reimar
144b7f5989
vo_quartz: change deallocation/uninit to more reliably free allocated data.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29618 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 09:51:38 +00:00
reimar
311db2c468
Port feature from corevideo: remember half/double size settings and reapply
...
them after an aspect change.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29579 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 14:39:42 +00:00
reimar
4ce7a48748
Move aspect change handling from vo_quartz to osx_common.
...
This could probably be even moved to video_out, though the names should
be improved.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29574 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 13:25:30 +00:00
reimar
0dadcc7bf0
Add osx_common.c and move the keycode conversion (OSX to MPlayer) there.
...
Also get rid of our own defines for the keycodes and instead use the
predefined ones from Carbon.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29573 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 12:54:33 +00:00
reimar
1ba0432474
Use the standard MPlayer aspect handling instead of reimplementing our own in vo_quartz.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29572 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 08:36:51 +00:00
reimar
a4566be905
Use lookup_keymap_table function with data structure instead of huge switch-case
...
for mapping OSX keys onto MPlayer keys in vo_quartz.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29570 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 23:13:37 +00: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
1db1773ec2
Merge svn changes up to r29277
2009-05-08 23:50:26 +03:00
diego
d9ded9284c
Add missing 'void' to parameterless function declarations.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 17:35:26 +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
71b25cca76
Merge svn changes up to r28162
2008-12-19 00:29:24 +02:00
diego
762197410a
Do not use full relative #include path for headers in the same directory.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28157 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-17 00:08:04 +00:00
Uoti Urpala
a3ab9e8e46
Merge svn changes up to r28149
2008-12-14 17:28:16 +02:00
diego
1f5caf1867
#include appropriate headers instead of locally declaring function prototypes.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28109 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 00:02:07 +00:00
diego
0864f92e7a
Get rid of pointless 'extern' keywords.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
Uoti Urpala
835511ac39
Merge svn changes up to r28038
2008-11-25 21:12:01 +02:00
gpoirier
76797a077c
cosmetics (svn diff --diff-cmd diff -x '-duwbBE' gives no differences)
...
replace tabs by 4 spaces.
prettier intentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28026 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 14:29:32 +00:00
gpoirier
20011636d2
avoid putting several statements on a single line
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28025 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 14:25:14 +00:00
gpoirier
40a450c69b
Use doxygen-style comments in file header. Remove tabs usage.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28024 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 13:34:31 +00:00
gpoirier
45b0d94b60
whitespace-cleanup
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28023 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 13:28:56 +00:00
gpoirier
b236cc711b
Replace QuickDraw calls in vo_quartz.c to fix warnings when compiling with current SDK versions.
...
Patch by Gregor Riepl %onitake A gmail P com%
Original thread:
Date: Wed, Oct 29, 2008 at 7:26 PM
Subject: Re: [MPlayer-dev-eng] [PATCH] Replaced deprecated QuickDraw calls in vo_quartz
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28020 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 10:01:03 +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
e0b1c9a6b7
Give a CONFIG_ prefix to preprocessor directives that lacked one and
...
change arbitrary prefixes to CONFIG_.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:20:50 +00:00
diego
5641e60698
Ahem, the MACOSX_FINDER_SUPPORT directive was renamed to MACOSX_FINDER.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27426 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 10:57:40 +00:00
diego
02135001b4
Change a bunch of video/audio-output-specific preprocessor directives from
...
a HAVE_ prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-03 15:21:40 +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
c172b5355f
libvo: Move aspect.c static variables to vo struct
...
This moves non-option variables. aspect.c still defines option globals.
2008-05-01 11:02:26 +03:00
Uoti Urpala
60e2c8604d
Move movie_aspect to options struct
2008-04-25 03:34:28 +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
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
ulion
20b1f841a6
Fix mouse button mapping:
...
MOUSE_BTN1 is middle buttion, MOUSE_BTN2 is right button.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25450 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-18 14:48:30 +00:00
reimar
2bf8c692f1
Mark the vo_functions_t definitions as const where possible.
...
This is not possible for xover and anything supporting vidix
due to horrible hacks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25248 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 14:39:15 +00:00
reimar
909887bdbe
Make vo info structs const
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 14:06:03 +00:00
ulion
c90770493c
Handle mouse up event to get double click support from mp_fifo.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24986 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-07 01:44:41 +00:00
ulion
58ecb061ad
Fix mouse right button and middle button incorrect identifications.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24984 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-06 15:57:36 +00:00
ulion
7ce42e4ebb
Fix KPENTER keycode value.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24983 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-06 13:17:37 +00:00
ulion
ac78bc4eca
Fix the prevent system idle code. Original code also works, but not as expected.
...
The update function was always called, but it should only be called every 30
seconds.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24982 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-06 12:52:54 +00:00
ulion
3fd8eb3f8e
Warning fixes:
...
vo_quartz.c:537: warning: passing argument 4 of 'AppendMenuItemTextWithCFString' makes integer from pointer without a cast
vo_quartz.c:539: warning: passing argument 4 of 'AppendMenuItemTextWithCFString' makes integer from pointer without a cast
vo_quartz.c:551: warning: passing argument 4 of 'AppendMenuItemTextWithCFString' makes integer from pointer without a cast
vo_quartz.c:578: warning: ISO C90 forbids mixed declarations and code
vo_quartz.c:1126: warning: ISO C90 forbids mixed declarations and code
vo_quartz.c:1363: warning: passing argument 7 of 'BeginFullScreen' makes integer from pointer without a cast
vo_quartz.c:1393: warning: passing argument 2 of 'EndFullScreen' makes integer from pointer without a cast
vo_quartz.c:1402: warning: passing argument 2 of 'SetSystemUIMode' makes integer from pointer without a cast
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24980 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-06 12:12:48 +00:00
nplourde
88166aa171
bugfix intel mac vo_quartz, PlanarPixmapInfoYUV420 structure requires big-endian value. author Taihei Monma tmkk@mac.com
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23696 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-29 21:57:31 +00:00
reimar
6a09e8e2ed
Replace implicit use of fast_memcpy via macro by explicit use to allow
...
for future optimization.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 14:27:54 +00:00
diego
5edd9af248
Remove some unused variables, patch by timwoj ieee org.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-28 08:42:35 +00:00
rathann
259cfbe7e2
Code cleanup: don't include a .c file in mplayer.c and fix a few
...
"implicit declaration of function ‘mplayer_put_key’" warnings
Based on Attila's suggestions.
Approved by Uoti and Ivan.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22841 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-29 17:16:11 +00:00