Commit ecc72fd1 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

New "vout display" for macosx.

It is non blocking regarding Main Thread.
It is compatible with minimal_macosx in term of drawable-nsobject.
It will only work if a drawable-nsobject is provided.

It removes the glitches there was with minimal_macosx (and gui/macosx) when:
- Displaying the first frames
- Resizing the view.
parent 8496ea9b
...@@ -4409,21 +4409,17 @@ AC_ARG_ENABLE(macosx-minimal, ...@@ -4409,21 +4409,17 @@ AC_ARG_ENABLE(macosx-minimal,
[ --enable-macosx-minimal minimal Mac OS X support (default disabled)]) [ --enable-macosx-minimal minimal Mac OS X support (default disabled)])
if test "x${enable_macosx_minimal}" = "xyes" if test "x${enable_macosx_minimal}" = "xyes"
then then
VLC_ADD_LDFLAGS([minimal_macosx opengllayer qtcapture],[-Wl,-framework,Cocoa]) VLC_ADD_LDFLAGS([vout_macosx qtcapture],[-Wl,-framework,Cocoa])
VLC_ADD_LDFLAGS([minimal_macosx opengllayer],[-Wl,-framework,OpenGL]) VLC_ADD_LDFLAGS([vout_macosx], [-Wl,-framework,OpenGL])
VLC_ADD_LDFLAGS([minimal_macosx], [-Wl,-framework,Carbon])
VLC_ADD_LDFLAGS([minimal_macosx], [-Wl,-framework,CoreServices])
VLC_ADD_LDFLAGS([minimal_macosx], [-Wl,-framework,AGL])
VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit]) VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit])
VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio]) VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio])
VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore]) VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QuartzCore])
VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo]) VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo])
VLC_ADD_OBJCFLAGS([minimal_macosx opengllayer], [-fobjc-exceptions] ) VLC_ADD_OBJCFLAGS([vout_macosx], [-fobjc-exceptions] )
VLC_ADD_PLUGIN([qtcapture]) VLC_ADD_PLUGIN([qtcapture])
VLC_ADD_PLUGIN([minimal_macosx]) VLC_ADD_PLUGIN([vout_macosx])
VLC_ADD_PLUGIN([opengllayer])
fi fi
dnl dnl
......
...@@ -20,6 +20,7 @@ SOURCES_directfb = directfb.c ...@@ -20,6 +20,7 @@ SOURCES_directfb = directfb.c
SOURCES_vmem = vmem.c SOURCES_vmem = vmem.c
SOURCES_yuv = yuv.c SOURCES_yuv = yuv.c
SOURCES_vout_wrapper = wrapper.c SOURCES_vout_wrapper = wrapper.c
SOURCES_vout_macosx = macosx.m
libxcb_x11_plugin_la_SOURCES = \ libxcb_x11_plugin_la_SOURCES = \
xcb/xcb_vlc.h \ xcb/xcb_vlc.h \
......
This diff is collapsed.
...@@ -60,6 +60,7 @@ DECLARE_OPEN(vmem); ...@@ -60,6 +60,7 @@ DECLARE_OPEN(vmem);
DECLARE_OPEN(direct3d_xp); DECLARE_OPEN(direct3d_xp);
DECLARE_OPEN(direct3d_vista); DECLARE_OPEN(direct3d_vista);
DECLARE_OPEN(glwin32); DECLARE_OPEN(glwin32);
DECLARE_OPEN(macosx);
#undef DECLARE_OPEN #undef DECLARE_OPEN
...@@ -121,6 +122,9 @@ vlc_module_begin() ...@@ -121,6 +122,9 @@ vlc_module_begin()
add_submodule() add_submodule()
DECLARE_MODULE(glwin32, 20) DECLARE_MODULE(glwin32, 20)
add_submodule()
DECLARE_MODULE(macosx, 300)
vlc_module_end() vlc_module_end()
#undef DECLARE_MODULE #undef DECLARE_MODULE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment