Kaydet (Commit) a3a89fc8 authored tarafından jan Iversen's avatar jan Iversen

svx, implement HAVE_FEATURE_AVMEDIA

iOS does not support avmedia, therefore HAVE_FEATURE_AVMEDIA
is set, however not all sources test for it.

Change-Id: I351d36769f82289e6b7fa61b3509aa1f34458989
üst 64b3b366
...@@ -78,8 +78,12 @@ Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const ...@@ -78,8 +78,12 @@ Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const
{ {
Size aRet; Size aRet;
#if HAVE_FEATURE_AVMEDIA
if( mpMediaWindow ) if( mpMediaWindow )
aRet = mpMediaWindow->getPreferredSize(); aRet = mpMediaWindow->getPreferredSize();
#else
aRet = Size(0,0);
#endif
return aRet; return aRet;
} }
...@@ -87,6 +91,7 @@ Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const ...@@ -87,6 +91,7 @@ Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const
void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) const void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) const
{ {
#if HAVE_FEATURE_AVMEDIA
if( mpMediaWindow ) if( mpMediaWindow )
{ {
mpMediaWindow->updateMediaItem( rItem ); mpMediaWindow->updateMediaItem( rItem );
...@@ -109,11 +114,15 @@ void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rIte ...@@ -109,11 +114,15 @@ void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rIte
mpMediaWindow->show(); mpMediaWindow->show();
} }
} }
#else
(void) rItem;
#endif
} }
void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaItem& rItem ) void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaItem& rItem )
{ {
#if HAVE_FEATURE_AVMEDIA
if( mpMediaWindow ) if( mpMediaWindow )
{ {
::avmedia::MediaItem aUpdatedItem; ::avmedia::MediaItem aUpdatedItem;
...@@ -124,6 +133,9 @@ void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaIte ...@@ -124,6 +133,9 @@ void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaIte
updateMediaItem( aUpdatedItem ); updateMediaItem( aUpdatedItem );
static_cast< ViewContactOfSdrMediaObj& >( GetViewContact() ).mediaPropertiesChanged( aUpdatedItem ); static_cast< ViewContactOfSdrMediaObj& >( GetViewContact() ).mediaPropertiesChanged( aUpdatedItem );
} }
#else
(void) rItem;
#endif
} }
......
...@@ -170,6 +170,7 @@ SdrMediaObj& SdrMediaObj::operator=(const SdrMediaObj& rObj) ...@@ -170,6 +170,7 @@ SdrMediaObj& SdrMediaObj::operator=(const SdrMediaObj& rObj)
const uno::Reference< graphic::XGraphic > SdrMediaObj::getSnapshot() const const uno::Reference< graphic::XGraphic > SdrMediaObj::getSnapshot() const
{ {
#if HAVE_FEATURE_AVMEDIA
if( !m_xImpl->m_xCachedSnapshot.is() ) if( !m_xImpl->m_xCachedSnapshot.is() )
{ {
OUString aRealURL = m_xImpl->m_MediaProperties.getTempURL(); OUString aRealURL = m_xImpl->m_MediaProperties.getTempURL();
...@@ -177,6 +178,7 @@ const uno::Reference< graphic::XGraphic > SdrMediaObj::getSnapshot() const ...@@ -177,6 +178,7 @@ const uno::Reference< graphic::XGraphic > SdrMediaObj::getSnapshot() const
aRealURL = m_xImpl->m_MediaProperties.getURL(); aRealURL = m_xImpl->m_MediaProperties.getURL();
m_xImpl->m_xCachedSnapshot = avmedia::MediaWindow::grabFrame( aRealURL, m_xImpl->m_MediaProperties.getReferer(), m_xImpl->m_MediaProperties.getMimeType()); m_xImpl->m_xCachedSnapshot = avmedia::MediaWindow::grabFrame( aRealURL, m_xImpl->m_MediaProperties.getReferer(), m_xImpl->m_MediaProperties.getMimeType());
} }
#endif
return m_xImpl->m_xCachedSnapshot; return m_xImpl->m_xCachedSnapshot;
} }
...@@ -229,15 +231,26 @@ void SdrMediaObj::AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrin ...@@ -229,15 +231,26 @@ void SdrMediaObj::AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrin
void SdrMediaObj::setURL( const OUString& rURL, const OUString& rReferer, const OUString& rMimeType ) void SdrMediaObj::setURL( const OUString& rURL, const OUString& rReferer, const OUString& rMimeType )
{ {
::avmedia::MediaItem aURLItem; ::avmedia::MediaItem aURLItem;
#if HAVE_FEATURE_AVMEDIA
if( !rMimeType.isEmpty() ) if( !rMimeType.isEmpty() )
m_xImpl->m_MediaProperties.setMimeType(rMimeType); m_xImpl->m_MediaProperties.setMimeType(rMimeType);
aURLItem.setURL( rURL, "", rReferer ); aURLItem.setURL( rURL, "", rReferer );
#else
(void) rMimeType;
(void) rURL;
(void) rReferer;
#endif
setMediaProperties( aURLItem ); setMediaProperties( aURLItem );
} }
const OUString& SdrMediaObj::getURL() const const OUString& SdrMediaObj::getURL() const
{ {
#if HAVE_FEATURE_AVMEDIA
return m_xImpl->m_MediaProperties.getURL(); return m_xImpl->m_MediaProperties.getURL();
#else
static OUString ret;
return ret;
#endif
} }
void SdrMediaObj::setMediaProperties( const ::avmedia::MediaItem& rState ) void SdrMediaObj::setMediaProperties( const ::avmedia::MediaItem& rState )
...@@ -374,6 +387,7 @@ void SdrMediaObj::SetInputStream(uno::Reference<io::XInputStream> const& xStream ...@@ -374,6 +387,7 @@ void SdrMediaObj::SetInputStream(uno::Reference<io::XInputStream> const& xStream
} }
/// copy a stream from XStorage to temp file /// copy a stream from XStorage to temp file
#if HAVE_FEATURE_AVMEDIA
static bool lcl_HandlePackageURL( static bool lcl_HandlePackageURL(
OUString const & rURL, OUString const & rURL,
SdrModel const *const pModel, SdrModel const *const pModel,
...@@ -406,10 +420,12 @@ static bool lcl_HandlePackageURL( ...@@ -406,10 +420,12 @@ static bool lcl_HandlePackageURL(
} }
return lcl_CopyToTempFile(xInStream, o_rTempFileURL); return lcl_CopyToTempFile(xInStream, o_rTempFileURL);
} }
#endif
void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProperties ) void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProperties )
{ {
bool bBroadcastChanged = false; bool bBroadcastChanged = false;
#if HAVE_FEATURE_AVMEDIA
const AVMediaSetMask nMaskSet = rNewProperties.getMaskSet(); const AVMediaSetMask nMaskSet = rNewProperties.getMaskSet();
// use only a subset of MediaItem properties for own properties // use only a subset of MediaItem properties for own properties
...@@ -477,6 +493,9 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper ...@@ -477,6 +493,9 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper
if( AVMediaSetMask::ZOOM & nMaskSet ) if( AVMediaSetMask::ZOOM & nMaskSet )
m_xImpl->m_MediaProperties.setZoom( rNewProperties.getZoom() ); m_xImpl->m_MediaProperties.setZoom( rNewProperties.getZoom() );
#else
(void) rNewProperties;
#endif
if( bBroadcastChanged ) if( bBroadcastChanged )
{ {
......
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