diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /avmedia | |
parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'avmedia')
-rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 36 | ||||
-rw-r--r-- | avmedia/source/framework/mediaitem.cxx | 58 | ||||
-rw-r--r-- | avmedia/source/framework/mediaplayer.cxx | 22 | ||||
-rw-r--r-- | avmedia/source/framework/mediatoolbox.cxx | 28 | ||||
-rw-r--r-- | avmedia/source/framework/soundhandler.hxx | 28 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstmanager.cxx | 14 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 46 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstuno.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstwindow.cxx | 10 | ||||
-rw-r--r-- | avmedia/source/viewer/mediaevent_impl.cxx | 28 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 60 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 64 | ||||
-rw-r--r-- | avmedia/source/win/framegrabber.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/win/manager.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/win/player.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/win/winuno.cxx | 4 |
16 files changed, 169 insertions, 245 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index d0525d2a6eba..2a6e66d0167a 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -59,9 +59,9 @@ namespace avmedia { -// ---------------- + // - MediaControl - -// --------------- + MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : Control( pParent ), @@ -194,7 +194,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maTimer.Start(); } -// ------------------------------------------------------------------------------ + MediaControl::~MediaControl() { @@ -202,14 +202,14 @@ MediaControl::~MediaControl() delete mpZoomListBox; } -// ------------------------------------------------------------------------------ + const Size& MediaControl::getMinSizePixel() const { return maMinSize; } -// ------------------------------------------------------------------------------ + void MediaControl::Resize() { @@ -267,7 +267,7 @@ void MediaControl::Resize() } } -// ------------------------------------------------------------------------------ + void MediaControl::setState( const MediaItem& rItem ) { @@ -282,7 +282,7 @@ void MediaControl::setState( const MediaItem& rItem ) } } -// ------------------------------------------------------------------------------ + void MediaControl::implUpdateToolboxes() { @@ -361,7 +361,7 @@ void MediaControl::implUpdateToolboxes() } } -// ------------------------------------------------------------------------------ + void MediaControl::implUpdateTimeSlider() { @@ -388,7 +388,7 @@ void MediaControl::implUpdateTimeSlider() } } -// ------------------------------------------------------------------------------ + void MediaControl::implUpdateVolumeSlider() { @@ -405,7 +405,7 @@ void MediaControl::implUpdateVolumeSlider() } } -// ------------------------------------------------------------------------------ + void MediaControl::implUpdateTimeField( double fCurTime ) { @@ -425,14 +425,14 @@ void MediaControl::implUpdateTimeField( double fCurTime ) } } -// ------------------------------------------------------------------------------ + Image MediaControl::implGetImage( sal_Int32 nImageId ) const { return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) ); } -// ------------------------------------------------------------------------------ + IMPL_LINK( MediaControl, implTimeHdl, Slider*, p ) { @@ -443,7 +443,7 @@ IMPL_LINK( MediaControl, implTimeHdl, Slider*, p ) return 0; } -// ------------------------------------------------------------------------------ + IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p ) { @@ -458,7 +458,7 @@ IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p ) return 0; } -// ------------------------------------------------------------------------------ + IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p ) { @@ -471,14 +471,14 @@ IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p ) return 0; } -// ------------------------------------------------------------------------------ + IMPL_LINK_NOARG(MediaControl, implVolumeEndHdl) { return 0; } -// ------------------------------------------------------------------------------ + IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p ) { @@ -569,7 +569,7 @@ IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p ) return 0; } -// ------------------------------------------------------------------------------ + IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p ) { @@ -597,7 +597,7 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p ) return 0; } -// ------------------------------------------------------------------------------ + IMPL_LINK_NOARG(MediaControl, implTimeoutHdl) { diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index f8e0f434e7f0..b9ab635cdc72 100644 --- a/avmedia/source/framework/mediaitem.cxx +++ b/avmedia/source/framework/mediaitem.cxx @@ -43,10 +43,7 @@ using namespace ::com::sun::star; namespace avmedia { -// ------------- // - MediaItem - -// ------------- - TYPEINIT1_AUTOFACTORY( MediaItem, ::SfxPoolItem ); struct MediaItem::Impl @@ -90,30 +87,22 @@ struct MediaItem::Impl } }; -// ------------------------------------------------------------------------------ - MediaItem::MediaItem( sal_uInt16 const i_nWhich, sal_uInt32 const 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)); @@ -130,15 +119,11 @@ 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 ); } -//------------------------------------------------------------------------ - SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation, SfxMapUnit, SfxMapUnit, @@ -149,8 +134,6 @@ SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation, return SFX_ITEM_PRESENTATION_NONE; } -//------------------------------------------------------------------------ - bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const { uno::Sequence< uno::Any > aSeq( 9 ); @@ -170,8 +153,6 @@ bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const return true; } -//------------------------------------------------------------------------ - bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) { uno::Sequence< uno::Any > aSeq; @@ -198,8 +179,6 @@ bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) return bRet; } -//------------------------------------------------------------------------ - void MediaItem::merge( const MediaItem& rMediaItem ) { const sal_uInt32 nMaskSet = rMediaItem.getMaskSet(); @@ -229,15 +208,11 @@ void MediaItem::merge( const MediaItem& rMediaItem ) setZoom( rMediaItem.getZoom() ); } -//------------------------------------------------------------------------ - sal_uInt32 MediaItem::getMaskSet() const { return m_pImpl->m_nMaskSet; } -//------------------------------------------------------------------------ - void MediaItem::setURL( const OUString& rURL, const OUString& rTempURL, const OUString& rReferer ) { m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_URL; @@ -246,8 +221,6 @@ 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; @@ -263,113 +236,83 @@ const OUString& MediaItem::getReferer() const return m_pImpl->m_Referer; } -//------------------------------------------------------------------------ - void MediaItem::setState( MediaState eState ) { m_pImpl->m_eState = eState; m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_STATE; } -//------------------------------------------------------------------------ - MediaState MediaItem::getState() const { return m_pImpl->m_eState; } -//------------------------------------------------------------------------ - void MediaItem::setDuration( double fDuration ) { m_pImpl->m_fDuration = fDuration; m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_DURATION; } -//------------------------------------------------------------------------ - double MediaItem::getDuration() const { return m_pImpl->m_fDuration; } -//------------------------------------------------------------------------ - void MediaItem::setTime( double fTime ) { m_pImpl->m_fTime = fTime; m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_TIME; } -//------------------------------------------------------------------------ - double MediaItem::getTime() const { return m_pImpl->m_fTime; } -//------------------------------------------------------------------------ - void MediaItem::setLoop( bool bLoop ) { m_pImpl->m_bLoop = bLoop; m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_LOOP; } -//------------------------------------------------------------------------ - bool MediaItem::isLoop() const { return m_pImpl->m_bLoop; } -//------------------------------------------------------------------------ - void MediaItem::setMute( bool bMute ) { m_pImpl->m_bMute = bMute; m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_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 |= AVMEDIA_SETMASK_VOLUMEDB; } -//------------------------------------------------------------------------ - sal_Int16 MediaItem::getVolumeDB() const { return m_pImpl->m_nVolumeDB; } -//------------------------------------------------------------------------ - void MediaItem::setZoom( ::com::sun::star::media::ZoomLevel eZoom ) { m_pImpl->m_eZoom = eZoom; m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_ZOOM; } -//------------------------------------------------------------------------ - ::com::sun::star::media::ZoomLevel MediaItem::getZoom() const { return m_pImpl->m_eZoom; } -//------------------------------------------------------------------------ - static OUString lcl_GetFilename(OUString const& rSourceURL) { uno::Reference<uri::XUriReferenceFactory> const xUriFactory( @@ -488,7 +431,6 @@ bool EmbedMedia(uno::Reference<frame::XModel> const& xModel, } return false; } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index bef6fc6cdef7..cc592c2caf8d 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -33,9 +33,9 @@ namespace avmedia { -// --------------- + // - MediaPlayer - -// --------------- + MediaPlayer::MediaPlayer( Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -45,19 +45,19 @@ MediaPlayer::MediaPlayer( Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindi static_cast< MediaFloater* >( pWindow )->Initialize( pInfo ); }; -// ----------------------------------------------------------------------------- + MediaPlayer::~MediaPlayer() { } -// ----------------------------------------------------------------------------- + SFX_IMPL_DOCKINGWINDOW_WITHID( MediaPlayer, SID_AVMEDIA_PLAYER ) -// ---------------- + // - MediaFloater - -// ---------------- + MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, Window* pParent ) : SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE ), @@ -71,7 +71,7 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, Window mpMediaWindow->show(); } -// ----------------------------------------------------------------------------- + MediaFloater::~MediaFloater() { @@ -79,7 +79,7 @@ MediaFloater::~MediaFloater() mpMediaWindow = NULL; } -// ------------------------------------------------------------------------- + void MediaFloater::Resize() { @@ -89,7 +89,7 @@ void MediaFloater::Resize() mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) ); } -// ----------------------------------------------------------------------------- + void MediaFloater::ToggleFloatingMode() { @@ -114,7 +114,7 @@ void MediaFloater::ToggleFloatingMode() mpMediaWindow->show(); } -// ----------------------------------------------------------------------------- + void MediaFloater::setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately ) { @@ -127,7 +127,7 @@ void MediaFloater::setURL( const OUString& rURL, const OUString& rReferer, bool } } -// ----------------------------------------------------------------------------- + void MediaFloater::dispatchCurrentURL() { diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx index b0d859a4033b..c90eb5919e29 100644 --- a/avmedia/source/framework/mediatoolbox.cxx +++ b/avmedia/source/framework/mediatoolbox.cxx @@ -31,9 +31,9 @@ using namespace ::com::sun::star; namespace avmedia { -// ----------------------- + // - MediaToolboxControl - -// ----------------------- + class MediaToolBoxControl_Impl : public MediaControl { @@ -50,7 +50,7 @@ private: MediaToolBoxControl* mpToolBoxControl; }; -// --------------------------------------------------------------------- + MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( Window& rParent, MediaToolBoxControl& rControl ) : MediaControl( &rParent, MEDIACONTROLSTYLE_SINGLELINE ), @@ -59,33 +59,33 @@ MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( Window& rParent, MediaToolBo SetSizePixel( getMinSizePixel() ); } -// --------------------------------------------------------------------- + MediaToolBoxControl_Impl::~MediaToolBoxControl_Impl() { } -// --------------------------------------------------------------------- + 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 ) @@ -93,13 +93,13 @@ MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, To rTbx.Invalidate(); } -// ----------------------------------------------------------------------------- + MediaToolBoxControl::~MediaToolBoxControl() { } -// ----------------------------------------------------------------------------- + void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState ) @@ -127,21 +127,21 @@ void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eSta } } -// ----------------------------------------------------------------------------- + Window* MediaToolBoxControl::CreateItemWindow( Window *pParent ) { return( pParent ? new MediaToolBoxControl_Impl( *pParent, *this ) : NULL ); } -// ----------------------------------------------------------------------------- + void MediaToolBoxControl::implUpdateMediaControl() { updateStatus( ".uno:AVMediaToolBox" ); } -// ----------------------------------------------------------------------------- + void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem ) { diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx index 6673674fe5fa..2d0772029184 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -69,20 +69,14 @@ class SoundHandler : // interfaces , private ThreadHelpBase , public ::cppu::OWeakObject { - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- + // public methods public: - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- + // constructor / destructor SoundHandler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); virtual ~SoundHandler( ); - //--------------------------------------------------------------------------------------------------------- // XInterface, XTypeProvider, XServiceInfo - //--------------------------------------------------------------------------------------------------------- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException ); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); @@ -102,16 +96,12 @@ class SoundHandler : // interfaces /* Helper for initialization of service by using own reference! */ virtual void SAL_CALL impl_initService ( ); - //--------------------------------------------------------------------------------------------------------- // XNotifyingDispatch - //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException); - //--------------------------------------------------------------------------------------------------------- // XDispatch - //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL dispatch ( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ); // not supported ! @@ -120,32 +110,24 @@ class SoundHandler : // interfaces virtual void SAL_CALL removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException ) {}; - //--------------------------------------------------------------------------------------------------------- // XExtendedFilterDetection - //--------------------------------------------------------------------------------------------------------- virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); - //------------------------------------------------------------------------------------------------------------- // protected methods - //------------------------------------------------------------------------------------------------------------- protected: - //------------------------------------------------------------------------------------------------------------- // private methods - //------------------------------------------------------------------------------------------------------------- private: DECL_LINK( implts_PlayerNotify, void* ); - //------------------------------------------------------------------------------------------------------------- // variables // (should be private everyway!) - //------------------------------------------------------------------------------------------------------------- private: bool m_bError; - css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// global uno service factory to create new services - css::uno::Reference< css::uno::XInterface > m_xSelfHold ; /// we must protect us against dieing during async(!) dispatch() call! - css::uno::Reference< css::media::XPlayer > m_xPlayer ; /// uses avmedia player to play sounds ... + css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; // global uno service factory to create new services + css::uno::Reference< css::uno::XInterface > m_xSelfHold ; // we must protect us against dieing during async(!) dispatch() call! + css::uno::Reference< css::media::XPlayer > m_xPlayer ; // uses avmedia player to play sounds... css::uno::Reference< css::frame::XDispatchResultListener > m_xListener ; Timer m_aUpdateTimer; diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx index a9aafca288e4..96ecc4c1831c 100644 --- a/avmedia/source/gstreamer/gstmanager.cxx +++ b/avmedia/source/gstreamer/gstmanager.cxx @@ -38,9 +38,9 @@ using namespace ::com::sun::star; namespace avmedia { namespace gstreamer { -// ---------------- + // - Manager - -// ---------------- + Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : mxMgr( rxMgr ) @@ -48,13 +48,13 @@ Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : DBG( "avmediagst: Manager::Manager" ); } -// ------------------------------------------------------------------------------ + Manager::~Manager() { } -// ------------------------------------------------------------------------------ + uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL ) throw (uno::RuntimeException) @@ -71,7 +71,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& return xRet; } -// ------------------------------------------------------------------------------ + OUString SAL_CALL Manager::getImplementationName( ) throw (uno::RuntimeException) @@ -79,7 +79,7 @@ OUString SAL_CALL Manager::getImplementationName( ) return OUString( AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME ); } -// ------------------------------------------------------------------------------ + sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) @@ -87,7 +87,7 @@ sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName ) return cppu::supportsService(this, ServiceName); } -// ------------------------------------------------------------------------------ + uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( ) throw (uno::RuntimeException) diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 17fffe0ec595..f5e34e9ad95b 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -56,9 +56,9 @@ using namespace ::com::sun::star; namespace avmedia { namespace gstreamer { -// ---------------- + // - Player - -// ---------------- + Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : GstPlayer_BASE( m_aMutex ), @@ -95,7 +95,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : } } -// ------------------------------------------------------------------------------ + Player::~Player() { @@ -130,7 +130,7 @@ void SAL_CALL Player::disposing() } } -// ------------------------------------------------------------------------------ + static gboolean pipeline_bus_callback( GstBus *, GstMessage *message, gpointer data ) { @@ -394,7 +394,7 @@ bool Player::create( const OUString& rURL ) return bRet; } -// ------------------------------------------------------------------------------ + void SAL_CALL Player::start() throw (uno::RuntimeException) @@ -409,7 +409,7 @@ void SAL_CALL Player::start() } } -// ------------------------------------------------------------------------------ + void SAL_CALL Player::stop() throw (uno::RuntimeException) @@ -424,7 +424,7 @@ void SAL_CALL Player::stop() DBG( "stop %p", mpPlaybin ); } -// ------------------------------------------------------------------------------ + sal_Bool SAL_CALL Player::isPlaying() throw (uno::RuntimeException) @@ -444,7 +444,7 @@ sal_Bool SAL_CALL Player::isPlaying() return bRet; } -// ------------------------------------------------------------------------------ + double SAL_CALL Player::getDuration() throw (uno::RuntimeException) @@ -461,7 +461,7 @@ double SAL_CALL Player::getDuration() return duration; } -// ------------------------------------------------------------------------------ + void SAL_CALL Player::setMediaTime( double fTime ) throw (uno::RuntimeException) @@ -483,7 +483,7 @@ void SAL_CALL Player::setMediaTime( double fTime ) } } -// ------------------------------------------------------------------------------ + double SAL_CALL Player::getMediaTime() throw (uno::RuntimeException) @@ -502,7 +502,7 @@ double SAL_CALL Player::getMediaTime() return position; } -// ------------------------------------------------------------------------------ + double SAL_CALL Player::getRate() throw (uno::RuntimeException) @@ -517,7 +517,7 @@ double SAL_CALL Player::getRate() return rate; } -// ------------------------------------------------------------------------------ + void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet ) throw (uno::RuntimeException) @@ -527,7 +527,7 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet ) mbLooping = bSet; } -// ------------------------------------------------------------------------------ + sal_Bool SAL_CALL Player::isPlaybackLoop() throw (uno::RuntimeException) @@ -537,7 +537,7 @@ sal_Bool SAL_CALL Player::isPlaybackLoop() return mbLooping; } -// ------------------------------------------------------------------------------ + void SAL_CALL Player::setMute( sal_Bool bSet ) throw (uno::RuntimeException) @@ -561,7 +561,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet ) } } -// ------------------------------------------------------------------------------ + sal_Bool SAL_CALL Player::isMute() throw (uno::RuntimeException) @@ -571,7 +571,7 @@ sal_Bool SAL_CALL Player::isMute() return mbMuted; } -// ------------------------------------------------------------------------------ + void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) throw (uno::RuntimeException) @@ -589,7 +589,7 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) } } -// ------------------------------------------------------------------------------ + sal_Int16 SAL_CALL Player::getVolumeDB() throw (uno::RuntimeException) @@ -609,7 +609,7 @@ sal_Int16 SAL_CALL Player::getVolumeDB() return nVolumeDB; } -// ------------------------------------------------------------------------------ + awt::Size SAL_CALL Player::getPreferredPlayerWindowSize() throw (uno::RuntimeException) @@ -642,7 +642,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize() return aSize; } -// ------------------------------------------------------------------------------ + uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments ) throw (uno::RuntimeException) @@ -684,7 +684,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co return xRet; } -// ------------------------------------------------------------------------------ + uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber() throw (uno::RuntimeException) @@ -700,7 +700,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber() return pFrameGrabber; } -// ------------------------------------------------------------------------------ + OUString SAL_CALL Player::getImplementationName() throw (uno::RuntimeException) @@ -708,7 +708,7 @@ OUString SAL_CALL Player::getImplementationName() return OUString( AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME ); } -// ------------------------------------------------------------------------------ + sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) @@ -716,7 +716,7 @@ sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName ) return cppu::supportsService(this, ServiceName); } -// ------------------------------------------------------------------------------ + uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames() throw (uno::RuntimeException) diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx index 9357a5d6db7f..e3b0bebcf13f 100644 --- a/avmedia/source/gstreamer/gstuno.cxx +++ b/avmedia/source/gstreamer/gstuno.cxx @@ -22,9 +22,9 @@ using namespace ::com::sun::star; -// ------------------- + // - factory methods - -// ------------------- + #ifdef AVMEDIA_GST_0_10 # define IMPL_NAME "com.sun.star.comp.media.Manager_GStreamer_0_10" diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx index 39da016e26c5..fee4626f071d 100644 --- a/avmedia/source/gstreamer/gstwindow.cxx +++ b/avmedia/source/gstreamer/gstwindow.cxx @@ -50,7 +50,7 @@ static ::osl::Mutex& ImplGetOwnStaticMutex() } // Window -// ------------------------------------------------------------------------------ + Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr, Player& rPlayer ) : mxMgr( rxMgr ), @@ -67,7 +67,7 @@ Window::~Window() } // XPlayerWindow -// ------------------------------------------------------------------------------ + void SAL_CALL Window::update( ) throw (uno::RuntimeException) @@ -106,7 +106,7 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) } // XWindow -// ------------------------------------------------------------------------------ + void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 /*Width*/, sal_Int32 /*Height*/, sal_Int16 /*Flags*/ ) throw (uno::RuntimeException) @@ -201,7 +201,7 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList } // XComponent -// ------------------------------------------------------------------------------ + void SAL_CALL Window::dispose( ) throw (uno::RuntimeException) @@ -219,7 +219,7 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis } // XServiceInfo -// ------------------------------------------------------------------------------ + OUString SAL_CALL Window::getImplementationName( ) throw (uno::RuntimeException) diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx index cfe96099c422..966d83a026d0 100644 --- a/avmedia/source/viewer/mediaevent_impl.cxx +++ b/avmedia/source/viewer/mediaevent_impl.cxx @@ -26,22 +26,22 @@ using namespace ::com::sun::star; namespace avmedia { namespace priv { -// --------------------------- + // - MediaEventListenersImpl - -// --------------------------- + MediaEventListenersImpl::MediaEventListenersImpl( Window& rEventWindow ) : mpNotifyWindow( &rEventWindow ) { } -// --------------------------------------------------------------------- + MediaEventListenersImpl::~MediaEventListenersImpl() { } -// --------------------------------------------------------------------- + void MediaEventListenersImpl::cleanUp() { @@ -49,14 +49,14 @@ void MediaEventListenersImpl::cleanUp() mpNotifyWindow = NULL; } -// --------------------------------------------------------------------- + void SAL_CALL MediaEventListenersImpl::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) throw (::com::sun::star::uno::RuntimeException) { } -// --------------------------------------------------------------------- + void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException) @@ -76,7 +76,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt:: } } -// --------------------------------------------------------------------- + void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException) @@ -95,7 +95,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt: } } -// --------------------------------------------------------------------- + void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException) @@ -137,7 +137,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw } } -// --------------------------------------------------------------------- + void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt::MouseEvent& /* e */ ) throw (::com::sun::star::uno::RuntimeException) @@ -150,7 +150,7 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt } } -// --------------------------------------------------------------------- + void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt::MouseEvent& /* e */ ) throw (::com::sun::star::uno::RuntimeException) @@ -163,7 +163,7 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt: } } -// --------------------------------------------------------------------- + void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException) @@ -178,7 +178,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt } } -// --------------------------------------------------------------------- + void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException) @@ -193,14 +193,14 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt:: } } -// --------------------------------------------------------------------- + void SAL_CALL MediaEventListenersImpl::focusGained( const ::com::sun::star::awt::FocusEvent& /* e */ ) throw (::com::sun::star::uno::RuntimeException) { } -// --------------------------------------------------------------------- + void SAL_CALL MediaEventListenersImpl::focusLost( const ::com::sun::star::awt::FocusEvent& /* e */ ) throw (::com::sun::star::uno::RuntimeException) diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 3835bc1e13ba..992bb40a3460 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -41,9 +41,9 @@ using namespace ::com::sun::star; namespace avmedia { -// --------------- + // - MediaWindow - -// --------------- + MediaWindow::MediaWindow( Window* parent, bool bInternalMediaControl ) : mpImpl( new priv::MediaWindowImpl( parent, this, bInternalMediaControl ) ) @@ -51,151 +51,151 @@ MediaWindow::MediaWindow( Window* parent, bool bInternalMediaControl ) : mpImpl->Show(); } -// ------------------------------------------------------------------------- + MediaWindow::~MediaWindow() {} -// ------------------------------------------------------------------------- + void MediaWindow::setURL( const OUString& rURL, const OUString& rReferer ) { mpImpl->setURL( rURL, OUString(), rReferer ); } -// ------------------------------------------------------------------------- + const OUString& MediaWindow::getURL() const { return mpImpl->getURL(); } -// ------------------------------------------------------------------------- + bool MediaWindow::isValid() const { return mpImpl->isValid(); } -// ------------------------------------------------------------------------- + void MediaWindow::MouseMove( const MouseEvent& /* rMEvt */ ) { } -// --------------------------------------------------------------------- + void MediaWindow::MouseButtonDown( const MouseEvent& /* rMEvt */ ) { } -// --------------------------------------------------------------------- + void MediaWindow::MouseButtonUp( const MouseEvent& /* rMEvt */ ) { } -// ------------------------------------------------------------------------- + void MediaWindow::KeyInput( const KeyEvent& /* rKEvt */ ) { } -// ------------------------------------------------------------------------- + void MediaWindow::KeyUp( const KeyEvent& /* rKEvt */ ) { } -// ------------------------------------------------------------------------- + void MediaWindow::Command( const CommandEvent& /* rCEvt */ ) { } -// ------------------------------------------------------------------------- + sal_Int8 MediaWindow::AcceptDrop( const AcceptDropEvent& /* rEvt */ ) { return 0; } -// ------------------------------------------------------------------------- + sal_Int8 MediaWindow::ExecuteDrop( const ExecuteDropEvent& /* rEvt */ ) { return 0; } -// ------------------------------------------------------------------------- + void MediaWindow::StartDrag( sal_Int8 /* nAction */, const Point& /* rPosPixel */ ) { } -// ------------------------------------------------------------------------- + Size MediaWindow::getPreferredSize() const { return mpImpl->getPreferredSize(); } -// ------------------------------------------------------------------------- + void MediaWindow::setPosSize( const Rectangle& rNewRect ) { mpImpl->setPosSize( rNewRect ); } -// ------------------------------------------------------------------------- + void MediaWindow::setPointer( const Pointer& rPointer ) { mpImpl->setPointer( rPointer ); } -// ------------------------------------------------------------------------- + bool MediaWindow::start() { return mpImpl->start(); } -// ------------------------------------------------------------------------- + void MediaWindow::updateMediaItem( MediaItem& rItem ) const { mpImpl->updateMediaItem( rItem ); } -// ------------------------------------------------------------------------- + void MediaWindow::executeMediaItem( const MediaItem& rItem ) { mpImpl->executeMediaItem( rItem ); } -// ------------------------------------------------------------------------- + void MediaWindow::show() { mpImpl->Show(); } -// ------------------------------------------------------------------------- + void MediaWindow::hide() { mpImpl->Hide(); } -// ------------------------------------------------------------------------- + Window* MediaWindow::getWindow() const { return mpImpl.get(); } -// ------------------------------------------------------------------------- + void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector ) { @@ -229,7 +229,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector ) } } -// ------------------------------------------------------------------------- + bool MediaWindow::executeMediaURLDialog(Window* /* pParent */, OUString& rURL, bool *const o_pbLink) @@ -318,7 +318,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */, return !rURL.isEmpty(); } -// ------------------------------------------------------------------------- + void MediaWindow::executeFormatErrorBox( Window* pParent ) { @@ -327,7 +327,7 @@ void MediaWindow::executeFormatErrorBox( Window* pParent ) aErrBox.Execute(); } -// ------------------------------------------------------------------------- + bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep, Size* pPreferredSizePixel ) { @@ -383,14 +383,14 @@ bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bo return bRet; } -// ------------------------------------------------------------------------- + uno::Reference< media::XPlayer > MediaWindow::createPlayer( const OUString& rURL, const OUString& rReferer ) { return priv::MediaWindowImpl::createPlayer( rURL, rReferer ); } -// ------------------------------------------------------------------------- + uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL, const OUString& rReferer, diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 73b4bf4fd80f..43416d3e760a 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -40,22 +40,22 @@ using namespace ::com::sun::star; namespace avmedia { namespace priv { -// ---------------------- + // - MediaWindowControl - -// ---------------------- + MediaWindowControl::MediaWindowControl( Window* pParent ) : MediaControl( pParent, MEDIACONTROLSTYLE_MULTILINE ) { } -// --------------------------------------------------------------------- + MediaWindowControl::~MediaWindowControl() { } -// --------------------------------------------------------------------- + void MediaWindowControl::update() { @@ -65,29 +65,29 @@ void MediaWindowControl::update() setState( aItem ); } -// --------------------------------------------------------------------- + void MediaWindowControl::execute( const MediaItem& rItem ) { static_cast< MediaWindowImpl* >( GetParent() )->executeMediaItem( rItem ); } -// -------------------- + // - MediaChildWindow - -// -------------------- + MediaChildWindow::MediaChildWindow( Window* pParent ) : SystemChildWindow( pParent, WB_CLIPCHILDREN ) { } -// --------------------------------------------------------------------- + MediaChildWindow::~MediaChildWindow() { } -// --------------------------------------------------------------------- + void MediaChildWindow::MouseMove( const MouseEvent& rMEvt ) { @@ -98,7 +98,7 @@ void MediaChildWindow::MouseMove( const MouseEvent& rMEvt ) GetParent()->MouseMove( aTransformedEvent ); } -// --------------------------------------------------------------------- + void MediaChildWindow::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -109,7 +109,7 @@ void MediaChildWindow::MouseButtonDown( const MouseEvent& rMEvt ) GetParent()->MouseButtonDown( aTransformedEvent ); } -// --------------------------------------------------------------------- + void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -120,7 +120,7 @@ void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt ) GetParent()->MouseButtonUp( aTransformedEvent ); } -// --------------------------------------------------------------------- + void MediaChildWindow::KeyInput( const KeyEvent& rKEvt ) { @@ -128,7 +128,7 @@ void MediaChildWindow::KeyInput( const KeyEvent& rKEvt ) GetParent()->KeyInput( rKEvt ); } -// --------------------------------------------------------------------- + void MediaChildWindow::KeyUp( const KeyEvent& rKEvt ) { @@ -136,7 +136,7 @@ void MediaChildWindow::KeyUp( const KeyEvent& rKEvt ) GetParent()->KeyUp( rKEvt ); } -// --------------------------------------------------------------------- + void MediaChildWindow::Command( const CommandEvent& rCEvt ) { @@ -147,9 +147,9 @@ void MediaChildWindow::Command( const CommandEvent& rCEvt ) GetParent()->Command( aTransformedEvent ); } -// ---------------------- + // - MediaWindowImpl - -// ---------------------- + MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bool bInternalMediaControl ) : Control( pParent ), @@ -173,7 +173,7 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo } } -// --------------------------------------------------------------------- + MediaWindowImpl::~MediaWindowImpl() { @@ -527,14 +527,14 @@ void MediaWindowImpl::onURLChanged() } } -// --------------------------------------------------------------------- + void MediaWindowImpl::setPosSize( const Rectangle& rRect ) { SetPosSizePixel( rRect.TopLeft(), rRect.GetSize() ); } -// --------------------------------------------------------------------- + void MediaWindowImpl::setPointer( const Pointer& rPointer ) { @@ -559,7 +559,7 @@ void MediaWindowImpl::setPointer( const Pointer& rPointer ) } } -// --------------------------------------------------------------------- + void MediaWindowImpl::Resize() { @@ -583,7 +583,7 @@ void MediaWindowImpl::Resize() maChildWindow.SetPosSizePixel( Point( 0, 0 ), aPlayerWindowSize ); } -// --------------------------------------------------------------------- + void MediaWindowImpl::StateChanged( StateChangedType eType ) { @@ -612,7 +612,7 @@ void MediaWindowImpl::StateChanged( StateChangedType eType ) } } -// --------------------------------------------------------------------- + void MediaWindowImpl::Paint( const Rectangle& ) { @@ -668,13 +668,13 @@ void MediaWindowImpl::Paint( const Rectangle& ) } } -// --------------------------------------------------------------------- + void MediaWindowImpl::GetFocus() { } -// --------------------------------------------------------------------- + void MediaWindowImpl::MouseMove( const MouseEvent& rMEvt ) { @@ -682,7 +682,7 @@ void MediaWindowImpl::MouseMove( const MouseEvent& rMEvt ) mpMediaWindow->MouseMove( rMEvt ); } -// --------------------------------------------------------------------- + void MediaWindowImpl::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -690,7 +690,7 @@ void MediaWindowImpl::MouseButtonDown( const MouseEvent& rMEvt ) mpMediaWindow->MouseButtonDown( rMEvt ); } -// --------------------------------------------------------------------- + void MediaWindowImpl::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -698,7 +698,7 @@ void MediaWindowImpl::MouseButtonUp( const MouseEvent& rMEvt ) mpMediaWindow->MouseButtonUp( rMEvt ); } -// --------------------------------------------------------------------- + void MediaWindowImpl::KeyInput( const KeyEvent& rKEvt ) { @@ -706,7 +706,7 @@ void MediaWindowImpl::KeyInput( const KeyEvent& rKEvt ) mpMediaWindow->KeyInput( rKEvt ); } -// --------------------------------------------------------------------- + void MediaWindowImpl::KeyUp( const KeyEvent& rKEvt ) { @@ -714,7 +714,7 @@ void MediaWindowImpl::KeyUp( const KeyEvent& rKEvt ) mpMediaWindow->KeyUp( rKEvt ); } -// --------------------------------------------------------------------- + void MediaWindowImpl::Command( const CommandEvent& rCEvt ) { @@ -722,21 +722,21 @@ void MediaWindowImpl::Command( const CommandEvent& rCEvt ) mpMediaWindow->Command( rCEvt ); } -// --------------------------------------------------------------------- + sal_Int8 MediaWindowImpl::AcceptDrop( const AcceptDropEvent& rEvt ) { return( mpMediaWindow ? mpMediaWindow->AcceptDrop( rEvt ) : 0 ); } -// --------------------------------------------------------------------- + sal_Int8 MediaWindowImpl::ExecuteDrop( const ExecuteDropEvent& rEvt ) { return( mpMediaWindow ? mpMediaWindow->ExecuteDrop( rEvt ) : 0 ); } -// --------------------------------------------------------------------- + void MediaWindowImpl::StartDrag( sal_Int8 nAction, const Point& rPosPixel ) { diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index b93720ffcd39..aef5be256316 100644 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -48,9 +48,9 @@ using namespace ::com::sun::star; namespace avmedia { namespace win { -// ---------------- + // - FrameGrabber - -// ---------------- + FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : mxMgr( rxMgr ) diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx index 19419aee8c23..94e45af48950 100644 --- a/avmedia/source/win/manager.cxx +++ b/avmedia/source/win/manager.cxx @@ -29,9 +29,9 @@ using namespace ::com::sun::star; namespace avmedia { namespace win { -// ---------------- + // - Manager - -// ---------------- + Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : mxMgr( rxMgr ) diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index b76d0914a0aa..7b396815fc20 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -76,9 +76,9 @@ bool isWindowsVistaOrHigher() return osvi.dwMajorVersion >= 6; } -// ---------------- + // - Player - -// ---------------- + Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : Player_BASE(m_aMutex), diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx index b42427e2172e..c39c00af671e 100644 --- a/avmedia/source/win/winuno.cxx +++ b/avmedia/source/win/winuno.cxx @@ -22,9 +22,9 @@ using namespace ::com::sun::star; -// ------------------- + // - factory methods - -// ------------------- + static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact ) { |