summaryrefslogtreecommitdiff
path: root/avmedia/source/framework
diff options
context:
space:
mode:
Diffstat (limited to 'avmedia/source/framework')
-rw-r--r--avmedia/source/framework/mediacontrol.cxx22
-rw-r--r--avmedia/source/framework/mediaitem.cxx38
-rw-r--r--avmedia/source/framework/mediamisc.cxx2
-rw-r--r--avmedia/source/framework/mediaplayer.cxx17
-rw-r--r--avmedia/source/framework/mediatoolbox.cxx21
-rw-r--r--avmedia/source/framework/modeltools.cxx8
6 files changed, 49 insertions, 59 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 8d542290fb13..8728fdff8b42 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -57,10 +57,6 @@
namespace avmedia
{
-
-// - MediaControl -
-
-
MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyle ) :
Control( pParent ),
maImageList( SvtMiscOptions().AreCurrentSymbolsLarge() ? AVMEDIA_RESID( AVMEDIA_IMGLST_L ) : AVMEDIA_RESID( AVMEDIA_IMGLST ) ),
@@ -192,12 +188,12 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl
}
-
MediaControl::~MediaControl()
{
disposeOnce();
}
+
void MediaControl::dispose()
{
maZoomToolBox->SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, nullptr );
@@ -212,14 +208,12 @@ void MediaControl::dispose()
}
-
const Size& MediaControl::getMinSizePixel() const
{
return maMinSize;
}
-
void MediaControl::Resize()
{
Point aPos( 0, 0 );
@@ -277,7 +271,6 @@ void MediaControl::Resize()
}
-
void MediaControl::setState( const MediaItem& rItem )
{
if( !mbLocked )
@@ -292,7 +285,6 @@ void MediaControl::setState( const MediaItem& rItem )
}
-
void MediaControl::implUpdateToolboxes()
{
const bool bValidURL = !maItem.getURL().isEmpty();
@@ -367,7 +359,6 @@ void MediaControl::implUpdateToolboxes()
}
-
void MediaControl::implUpdateTimeSlider()
{
if( maItem.getURL().isEmpty() || !IsEnabled() )
@@ -394,7 +385,6 @@ void MediaControl::implUpdateTimeSlider()
}
-
void MediaControl::implUpdateVolumeSlider()
{
if( maItem.getURL().isEmpty() || !IsEnabled() )
@@ -411,7 +401,6 @@ void MediaControl::implUpdateVolumeSlider()
}
-
void MediaControl::implUpdateTimeField( double fCurTime )
{
if( !maItem.getURL().isEmpty() )
@@ -431,14 +420,12 @@ void MediaControl::implUpdateTimeField( double fCurTime )
}
-
Image MediaControl::implGetImage( sal_Int32 nImageId ) const
{
return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) );
}
-
IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void )
{
mbLocked = true;
@@ -447,7 +434,6 @@ IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void )
}
-
IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void )
{
MediaItem aExecItem;
@@ -460,7 +446,6 @@ IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void )
}
-
IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void )
{
MediaItem aExecItem;
@@ -471,7 +456,6 @@ IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void )
}
-
IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
{
if( p )
@@ -559,7 +543,6 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
}
-
IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void )
{
MediaItem aExecItem;
@@ -582,12 +565,11 @@ IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void )
}
-
IMPL_LINK_NOARG_TYPED(MediaControl, implTimeoutHdl, Idle *, void)
{
update();
}
-}
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 7a8b9a6c4ccb..ed413f23a363 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -43,7 +43,6 @@ using namespace ::com::sun::star;
namespace avmedia
{
-// - MediaItem -
SfxPoolItem* MediaItem::CreateDefault() { return new MediaItem; }
struct MediaItem::Impl
@@ -89,22 +88,26 @@ struct MediaItem::Impl
}
};
+
MediaItem::MediaItem( sal_uInt16 i_nWhich, AVMediaSetMask nMaskSet )
: SfxPoolItem( i_nWhich )
, m_pImpl( new Impl(nMaskSet) )
{
}
+
MediaItem::MediaItem( const MediaItem& rItem )
: SfxPoolItem( rItem )
, m_pImpl( new Impl(*rItem.m_pImpl) )
{
}
+
MediaItem::~MediaItem()
{
}
+
bool MediaItem::operator==( const SfxPoolItem& rItem ) const
{
assert( SfxPoolItem::operator==(rItem));
@@ -122,11 +125,13 @@ bool MediaItem::operator==( const SfxPoolItem& rItem ) const
&& m_pImpl->m_eZoom == rOther.m_pImpl->m_eZoom;
}
+
SfxPoolItem* MediaItem::Clone( SfxItemPool* ) const
{
return new MediaItem( *this );
}
+
bool MediaItem::GetPresentation( SfxItemPresentation,
SfxMapUnit,
SfxMapUnit,
@@ -137,6 +142,7 @@ bool MediaItem::GetPresentation( SfxItemPresentation,
return false;
}
+
bool MediaItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
{
uno::Sequence< uno::Any > aSeq( 10 );
@@ -157,6 +163,7 @@ bool MediaItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
return true;
}
+
bool MediaItem::PutValue( const css::uno::Any& rVal, sal_uInt8 )
{
uno::Sequence< uno::Any > aSeq;
@@ -185,6 +192,7 @@ bool MediaItem::PutValue( const css::uno::Any& rVal, sal_uInt8 )
return bRet;
}
+
void MediaItem::merge( const MediaItem& rMediaItem )
{
const AVMediaSetMask nMaskSet = rMediaItem.getMaskSet();
@@ -217,11 +225,13 @@ void MediaItem::merge( const MediaItem& rMediaItem )
setZoom( rMediaItem.getZoom() );
}
+
AVMediaSetMask MediaItem::getMaskSet() const
{
return m_pImpl->m_nMaskSet;
}
+
void MediaItem::setURL( const OUString& rURL, const OUString& rTempURL, const OUString& rReferer )
{
m_pImpl->m_nMaskSet |= AVMediaSetMask::URL;
@@ -230,109 +240,129 @@ void MediaItem::setURL( const OUString& rURL, const OUString& rTempURL, const OU
m_pImpl->m_Referer = rReferer;
}
+
const OUString& MediaItem::getURL() const
{
return m_pImpl->m_URL;
}
+
const OUString& MediaItem::getTempURL() const
{
return m_pImpl->m_TempFileURL;
}
+
const OUString& MediaItem::getReferer() const
{
return m_pImpl->m_Referer;
}
+
void MediaItem::setMimeType( const OUString& rMimeType )
{
m_pImpl->m_nMaskSet |= AVMediaSetMask::MIME_TYPE;
m_pImpl->m_sMimeType = rMimeType;
}
+
OUString MediaItem::getMimeType() const
{
return !m_pImpl->m_sMimeType.isEmpty() ? m_pImpl->m_sMimeType : AVMEDIA_MIMETYPE_COMMON;
}
+
void MediaItem::setState( MediaState eState )
{
m_pImpl->m_eState = eState;
m_pImpl->m_nMaskSet |= AVMediaSetMask::STATE;
}
+
MediaState MediaItem::getState() const
{
return m_pImpl->m_eState;
}
+
void MediaItem::setDuration( double fDuration )
{
m_pImpl->m_fDuration = fDuration;
m_pImpl->m_nMaskSet |= AVMediaSetMask::DURATION;
}
+
double MediaItem::getDuration() const
{
return m_pImpl->m_fDuration;
}
+
void MediaItem::setTime( double fTime )
{
m_pImpl->m_fTime = fTime;
m_pImpl->m_nMaskSet |= AVMediaSetMask::TIME;
}
+
double MediaItem::getTime() const
{
return m_pImpl->m_fTime;
}
+
void MediaItem::setLoop( bool bLoop )
{
m_pImpl->m_bLoop = bLoop;
m_pImpl->m_nMaskSet |= AVMediaSetMask::LOOP;
}
+
bool MediaItem::isLoop() const
{
return m_pImpl->m_bLoop;
}
+
void MediaItem::setMute( bool bMute )
{
m_pImpl->m_bMute = bMute;
m_pImpl->m_nMaskSet |= AVMediaSetMask::MUTE;
}
+
bool MediaItem::isMute() const
{
return m_pImpl->m_bMute;
}
+
void MediaItem::setVolumeDB( sal_Int16 nDB )
{
m_pImpl->m_nVolumeDB = nDB;
m_pImpl->m_nMaskSet |= AVMediaSetMask::VOLUMEDB;
}
+
sal_Int16 MediaItem::getVolumeDB() const
{
return m_pImpl->m_nVolumeDB;
}
+
void MediaItem::setZoom( css::media::ZoomLevel eZoom )
{
m_pImpl->m_eZoom = eZoom;
m_pImpl->m_nMaskSet |= AVMediaSetMask::ZOOM;
}
+
css::media::ZoomLevel MediaItem::getZoom() const
{
return m_pImpl->m_eZoom;
}
+
OUString GetFilename(OUString const& rSourceURL)
{
uno::Reference<uri::XUriReferenceFactory> const xUriFactory(
@@ -357,6 +387,7 @@ OUString GetFilename(OUString const& rSourceURL)
return filename;
}
+
uno::Reference<io::XStream>
CreateStream(uno::Reference<embed::XStorage> const& xStorage,
OUString const& rFilename)
@@ -399,6 +430,7 @@ CreateStream(uno::Reference<embed::XStorage> const& xStorage,
return xStream;
}
+
bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
OUString const& rSourceURL, OUString & o_rEmbeddedURL)
{
@@ -451,6 +483,8 @@ bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
}
return false;
}
-}
+
+
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index 6733313ed318..af9ce1b48b4e 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -38,6 +38,6 @@ ResMgr* GetResMgr()
return pResMgr;
}
-} // namespace avemdia
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index c39af428e92e..489ff5e05f0a 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -33,10 +33,6 @@
namespace avmedia
{
-
-// - MediaPlayer -
-
-
MediaPlayer::MediaPlayer( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId )
{
@@ -45,19 +41,14 @@ MediaPlayer::MediaPlayer( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* _p
};
-
MediaPlayer::~MediaPlayer()
{
}
-
SFX_IMPL_DOCKINGWINDOW_WITHID( MediaPlayer, SID_AVMEDIA_PLAYER )
-// - MediaFloater -
-
-
MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::Window* pParent ) :
SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE ),
mpMediaWindow( new MediaWindow( this, true ) )
@@ -71,12 +62,12 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::W
}
-
MediaFloater::~MediaFloater()
{
disposeOnce();
}
+
void MediaFloater::dispose()
{
delete mpMediaWindow;
@@ -85,7 +76,6 @@ void MediaFloater::dispose()
}
-
void MediaFloater::Resize()
{
SfxDockingWindow::Resize();
@@ -95,7 +85,6 @@ void MediaFloater::Resize()
}
-
void MediaFloater::ToggleFloatingMode()
{
::avmedia::MediaItem aRestoreItem;
@@ -124,7 +113,6 @@ void MediaFloater::ToggleFloatingMode()
}
-
void MediaFloater::setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately )
{
if( mpMediaWindow )
@@ -137,7 +125,6 @@ void MediaFloater::setURL( const OUString& rURL, const OUString& rReferer, bool
}
-
void MediaFloater::dispatchCurrentURL()
{
SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
@@ -153,6 +140,6 @@ void MediaFloater::dispatchCurrentURL()
}
}
-}
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index 14d6befd7c8a..08d1f9fa7e43 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -33,10 +33,6 @@ using namespace ::com::sun::star;
namespace avmedia
{
-
-// - MediaToolboxControl -
-
-
class MediaToolBoxControl_Impl : public MediaControl
{
public:
@@ -52,7 +48,6 @@ private:
};
-
MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( vcl::Window& rParent, MediaToolBoxControl& rControl ) :
MediaControl( &rParent, MEDIACONTROLSTYLE_SINGLELINE ),
mpToolBoxControl( &rControl )
@@ -61,27 +56,21 @@ MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( vcl::Window& rParent, MediaT
}
-
void MediaToolBoxControl_Impl::update()
{
mpToolBoxControl->implUpdateMediaControl();
}
-
void MediaToolBoxControl_Impl::execute( const MediaItem& rItem )
{
mpToolBoxControl->implExecuteMediaControl( rItem );
}
-// - MediaToolBoxControl -
-
-
SFX_IMPL_TOOLBOX_CONTROL( ::avmedia::MediaToolBoxControl, ::avmedia::MediaItem );
-
MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
@@ -89,15 +78,12 @@ MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, To
}
-
MediaToolBoxControl::~MediaToolBoxControl()
{
}
-
-void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
-
+void MediaToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) );
@@ -123,21 +109,18 @@ void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eSta
}
-
VclPtr<vcl::Window> MediaToolBoxControl::CreateItemWindow( vcl::Window *pParent )
{
return ( pParent ? VclPtr<MediaToolBoxControl_Impl>::Create( *pParent, *this ) : nullptr );
}
-
void MediaToolBoxControl::implUpdateMediaControl()
{
updateStatus( ".uno:AVMediaToolBox" );
}
-
void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
{
MediaItem aExecItem( SID_AVMEDIA_TOOLBOX );
@@ -152,6 +135,6 @@ void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
Dispatch( ".uno:AVMediaToolBox" , aArgs );
}
-}
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
index 4d348c343ac0..74669af81258 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -66,6 +66,7 @@ static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFold
}
}
+
bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
{
o_rOutput.clear();
@@ -133,7 +134,8 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
o_rOutput = sOutput + "/" + GetFilename(sOutput) + ".json";
return true;
}
-#endif
+#endif // HAVE_FEATURE_COLLADA
+
static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed::XStorage> xSubStorage, ::ucbhelper::Content& rContent)
{
@@ -237,6 +239,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed:
}
}
+
bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
const OUString& rSourceURL, OUString& o_rEmbeddedURL)
{
@@ -311,11 +314,12 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
return false;
}
+
bool IsModel(const OUString& rMimeType)
{
return rMimeType == AVMEDIA_MIMETYPE_JSON;
}
-} // namespace avemdia
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit (git 2.34.1) at 2025-04-28 09:00:47 +0000