summaryrefslogtreecommitdiffstats
path: root/libvo/osx_common.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r31097Uoti Urpala2010-04-261-1/+1
|\
| * rename 'struct keymap' -> 'struct mp_keymap'siretart2010-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This avoids the compilation failure on kFreeBSD (at least amd64): In file included from libvo/vo_directfb2.c:44: libvo/video_out.h:267: error: redefinition of 'struct keymap' This is because libvo/vo_directfb2.c #includes sys/kd.h, which in turn includes sys/kbio.h, which defines another 'struct keymap'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31059 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30967Uoti Urpala2010-04-261-0/+23
|\|
| * Refactor OS X foreground process setting into a separate function.diego2010-03-261-0/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30964 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29912Uoti Urpala2009-11-161-0/+51
|\|
| * Add keycode definitions for older versions of OSX. Fixes compilation on 10.4.adrian2009-10-061-0/+51
| | | | | | | | | | | | | | Patch by Aaro Koskinen, aaro D koskinen A iki D fi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29754 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29752Uoti Urpala2009-10-061-1/+1
|\| | | | | | | | | | | | | | | | | As part of merging subtitle-in-terminal changes make update_subtitles() only clear existing subtitles if called with the reset argument, and not try to set new ones. Later calls should set the needed new subtitles, and this change avoids some problems with trying to set subtitles when mp_property_sub() in command.c gets called from initialization code before full initialization.
| * Fix definition of KEY_PAGE_DOWN.cehoyos2009-10-041-1/+1
| | | | | | | | | | | | | | Patch by Aaro Koskinen, aaro D koskinen A iki D fi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29749 b3059339-0415-0410-9bf9-f77b7e298cf2
* | osx_common.c: Fix compilationUoti Urpala2009-09-261-1/+2
|/ | | | | This file should have been fixed when merging it from svn. Broke compilation with OS X-specific VOs enabled.
* Add standard license header and move a misplaced comment.reimar2009-09-051-1/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29649 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make aspect switching work again (used the wrong variable and alwaysreimar2009-08-281-1/+1
| | | | | | | switched to the original aspect). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29578 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix implicit declaration of mp_input_.. functions.reimar2009-08-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29577 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1l, use sizeof for snprintf size instead of hard-coding the current value.reimar2009-08-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29576 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move aspect change handling from vo_quartz to osx_common.reimar2009-08-281-0/+28
| | | | | | | | 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
* Add osx_common.c and move the keycode conversion (OSX to MPlayer) there.reimar2009-08-281-0/+45
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