diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-08-16 05:38:04 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-09-02 01:08:46 +0200 |
| commit | b3e74732e9a9dc324f3c0985fe2601fcd8b94f9e (patch) | |
| tree | 1fa678032aeaca8a4f7798600518f09088269eaa /slideshow | |
| parent | d44155730af9d1056725e8e5d46a07f43dcd61d7 (diff) | |
don't try to use X11 functions on OSX
Change-Id: Ife987833a52c7ed0b55f1003df1ee0dad2011cc0
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 19c16067d356..879024ee98a0 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -68,7 +68,7 @@ #include "OGLTrans_TransitionImpl.hxx" -#if defined( UNX ) +#if defined( UNX ) && !defined( MACOSX ) #include <X11/keysym.h> #include <X11/X.h> #endif @@ -153,7 +153,7 @@ int calcComponentOrderIndex(const uno::Sequence<sal_Int8>& rTags) return -1; } -#ifdef UNX +#if defined( UNX ) && !defined( MACOSX ) // not thread safe static bool errorTriggered; @@ -258,7 +258,7 @@ private: bool mbUseEnteringPixmap; bool mbFreeLeavingPixmap; bool mbFreeEnteringPixmap; -#ifdef UNX +#if defined( UNX ) && !defined( MACOSX ) Pixmap maLeavingPixmap; Pixmap maEnteringPixmap; #endif @@ -362,6 +362,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta aDeviceParams[1] >>= aVal; mpContext = boost::make_shared<OpenGLContext>(); + mpContext->requestLegacyContext(); if( !mpContext->init( reinterpret_cast< Window* >( aVal ) ) ) return false; @@ -513,7 +514,7 @@ void OGLTransitionerImpl::impl_prepareSlides() mpContext->sync(); -#ifdef UNX +#if defined( UNX ) && !defined( MACOSX ) // synchronized X still gives us much smoother play // I suspect some issues in above code in slideshow // synchronize whole transition for now @@ -1297,7 +1298,7 @@ void OGLTransitionerImpl::disposing() } #endif -#ifdef UNX +#if defined( UNX ) && !defined( MACOSX ) if( mbRestoreSync && bool(mpContext) ) { // try to reestablish synchronize state char* sal_synchronize = getenv("SAL_SYNCHRONIZE"); @@ -1331,7 +1332,7 @@ OGLTransitionerImpl::OGLTransitionerImpl() , mbUseEnteringPixmap(false) , mbFreeLeavingPixmap(false) , mbFreeEnteringPixmap(false) -#ifdef UNX +#if defined( UNX ) && !defined( MACOSX ) , maLeavingPixmap(0) , maEnteringPixmap(0) #endif |