From fe70101856332663f600df144b39d2638b3d0570 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 11 Jun 2014 12:36:26 +0200 Subject: Introduce HAVE_FEATURE_GLTF to enable/disable gltf related code When it is a release build then enable it only on Windows and Linux. Change-Id: I7c462aeb75e6ab60eeaa0fa42ca7853a6369b742 --- avmedia/source/viewer/mediawindow_impl.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'avmedia/source/viewer') diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 114ab9b2ddc9..c22bdcb26f0e 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -16,6 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + +#include + #include #include "mediawindow_impl.hxx" #include "mediaevent_impl.hxx" @@ -83,10 +86,12 @@ MediaChildWindow::MediaChildWindow( Window* pParent ) : { } +#if HAVE_FEATURE_GLTF MediaChildWindow::MediaChildWindow( Window* pParent, SystemWindowData* pData ) : SystemChildWindow( pParent, WB_CLIPCHILDREN, pData ) { } +#endif MediaChildWindow::~MediaChildWindow() { @@ -242,10 +247,12 @@ uno::Reference< media::XPlayer > MediaWindowImpl::createPlayer( const OUString& xPlayer = createPlayer(rURL, aServiceName, xContext); } } +#if HAVE_FEATURE_GLTF else if ( *pMimeType == AVMEDIA_MIMETYPE_JSON ) { xPlayer = createPlayer(rURL, AVMEDIA_OPENGL_MANAGER_SERVICE_NAME, xContext); } +#endif return xPlayer; } @@ -501,12 +508,14 @@ void MediaWindowImpl::onURLChanged() { mpChildWindow.reset(new MediaChildWindow(this) ); } +#if HAVE_FEATURE_GLTF else if ( m_sMimeType == AVMEDIA_MIMETYPE_JSON ) { SystemWindowData aWinData = OpenGLContext::generateWinData(this); mpChildWindow.reset(new MediaChildWindow(this,&aWinData)); mbEventTransparent = false; } +#endif if( !mpChildWindow ) return; mpChildWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); -- cgit