Commit Graph

19 Commits

Author SHA1 Message Date
Stefano Pigozzi e70b5ee2fd cocoa_common: add HiDPI/retina support
With a HiDPI screen, for performance and backwards compatibility
reasons, AppKit requests an OpenGL surface with a pixel number that
equals the user points number. After the image is rendered to this
smaller surface, it is upscaled so that its dimensions are comparable
across screens of different DPIs. The applied scaling is not that good
and makes the video/subtitles blurry; this is not acceptable for a
video player.

Request AppKit to use a high resolution OpenGL surface to back the
mplayer2 OpenGL view. Also set the window pixel size information
correctly in the VO object by converting user points to actual pixels.

All the system version checks are done at runtime so that the feature
is available on OSX 10.7 even with a binary compiled with older SDKs.

Also replace is_lion_or_better() with is_osx_version_at_least(10, 7, 0)
which is defined in osx_common.
2012-08-16 22:41:09 +02:00
Stefano Pigozzi 13675fc7dc cleanup: osx_common: remove unused functions
Remove functions that aren't called anymore:

 *  `osx_foreground_hack` was replaced by the NSApplication's
    activateIgnoringOtherApps: in cocoa_common.
 *  Aspect ratio functions were not called by the "new" cocoa backend,
    since the corresponding menu item was deleted.
2012-08-16 22:29:42 +02:00
wm4 f3bb6692c7 osx_common: remove old VO include, modify change_movie_aspect()
The only reason the old VO related header old_vo_defines.h was included
was probably to gain access to the current VO struct in the function
change_movie_aspect(). Make that function take a parameter instead.

This function seems to be unused.
2012-08-07 01:13:25 +02:00
Uoti Urpala 23cb829072 input: move all key code lists to input/keycodes.h
Move the definitions of all special key codes (those not passed by
ASCII value) to input/keycodes.h. Before they were spread between
osdep/keycodes.h, input/joystick.h, input/mouse.h and input/ar.h, plus
some special values in input.h. This was especially inconvenient as
the codes had to be coordinated to not conflict between the files.

The change requires a bit of ugliness as appleir.c includes
<linux/input.h> which contains various conflicting KEY_* definitions.
Work around this by adding a special preprocessor variable which can
be used to avoid defining these in keycodes.h.
2011-05-02 00:43:31 +03:00
Uoti Urpala f38efd166e Merge svn changes up to r31097 2010-04-26 19:23:32 +03:00
Uoti Urpala 4785c2617e Merge svn changes up to r30967 2010-04-26 17:42:20 +03:00
siretart 9cef48bac7 rename 'struct keymap' -> 'struct mp_keymap'
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
2010-04-23 10:22:44 +00:00
diego 3e7a2bd8c3 Refactor OS X foreground process setting into a separate function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30964 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-26 15:02:14 +00:00
Uoti Urpala 287b62163e Merge svn changes up to r29912 2009-11-16 07:01:46 +02:00
adrian 28f36c3656 Add keycode definitions for older versions of OSX. Fixes compilation on 10.4.
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
2009-10-06 08:21:52 +00:00
Uoti Urpala 7fd3eb0f74 Merge svn changes up to r29752
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.
2009-10-06 04:48:00 +03:00
cehoyos 23235a0ed0 Fix definition of KEY_PAGE_DOWN.
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
2009-10-04 21:10:13 +00:00
Uoti Urpala ef438b3a6b osx_common.c: Fix compilation
This file should have been fixed when merging it from svn. Broke
compilation with OS X-specific VOs enabled.
2009-09-26 16:22:48 +03:00
reimar b3a789863e Add standard license header and move a misplaced comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29649 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-05 08:48:48 +00:00
reimar b7c7318352 Make aspect switching work again (used the wrong variable and always
switched to the original aspect).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29578 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 14:38:44 +00:00
reimar cc1b58e348 Fix implicit declaration of mp_input_.. functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29577 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 14:02:32 +00:00
reimar 6497662b92 1l, use sizeof for snprintf size instead of hard-coding the current value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29576 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 13:30:32 +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