mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

com::sun::uno->css in avmedia and animations

Browse Source 
Change-Id: Ie4365a488728c39fedacae7650b4b90260e7e44a
Reviewed-on: https://gerrit.libreoffice.org/17153
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2015-07-17 10:50:48 +02:00
committed by Noel Grandin
parent 0f732c41bc
commit 40da0a9d1c
35 changed files with 519 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
animations/source/animcore/animcore.cxx Normal file → Executable file
View File

@@ -430,7 +430,7 @@ AnimationNode::AnimationNode( sal_Int16 nNodeType )
mnFadeColor(0), mnFadeColor(0),
mfVolume(1.0), mfVolume(1.0),
mnCommand(0), mnCommand(0),
mnIterateType( ::com::sun::star::presentation::ShapeAnimationSubType::AS_WHOLE ), mnIterateType( css::presentation::ShapeAnimationSubType::AS_WHOLE ),
mfIterateInterval(0.0) mfIterateInterval(0.0)
{ {
OSL_ENSURE((sal_uInt32)nNodeType < sizeof(mpTypes)/sizeof(Sequence<Type>*), "NodeType out of range"); OSL_ENSURE((sal_uInt32)nNodeType < sizeof(mpTypes)/sizeof(Sequence<Type>*), "NodeType out of range");
@@ -2129,7 +2129,7 @@ namespace
class theAnimationNodeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theAnimationNodeUnoTunnelId > {}; class theAnimationNodeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theAnimationNodeUnoTunnelId > {};
} }
const ::com::sun::star::uno::Sequence< sal_Int8 > & AnimationNode::getUnoTunnelId() const css::uno::Sequence< sal_Int8 > & AnimationNode::getUnoTunnelId()
{ {
return theAnimationNodeUnoTunnelId::get().getSeq(); return theAnimationNodeUnoTunnelId::get().getSeq();
} }
@@ -2168,79 +2168,79 @@ void AnimationNode::fireChangeListener()
} // namespace animcore } // namespace animcore
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
com_sun_star_animations_ParallelTimeContainer_get_implementation(::com::sun::star::uno::XComponentContext*, com_sun_star_animations_ParallelTimeContainer_get_implementation(css::uno::XComponentContext*,
::com::sun::star::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new animcore::AnimationNode(PAR)); return cppu::acquire(new animcore::AnimationNode(PAR));
} }
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
com_sun_star_animations_SequenceTimeContainer_get_implementation(::com::sun::star::uno::XComponentContext*, com_sun_star_animations_SequenceTimeContainer_get_implementation(css::uno::XComponentContext*,
::com::sun::star::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new animcore::AnimationNode(SEQ)); return cppu::acquire(new animcore::AnimationNode(SEQ));
} }
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
com_sun_star_animations_IterateContainer_get_implementation(::com::sun::star::uno::XComponentContext*, com_sun_star_animations_IterateContainer_get_implementation(css::uno::XComponentContext*,
::com::sun::star::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new animcore::AnimationNode(ITERATE)); return cppu::acquire(new animcore::AnimationNode(ITERATE));
} }
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
com_sun_star_animations_Animate_get_implementation(::com::sun::star::uno::XComponentContext*, com_sun_star_animations_Animate_get_implementation(css::uno::XComponentContext*,
::com::sun::star::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new animcore::AnimationNode(ANIMATE)); return cppu::acquire(new animcore::AnimationNode(ANIMATE));
} }
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
com_sun_star_animations_AnimateSet_get_implementation(::com::sun::star::uno::XComponentContext*, com_sun_star_animations_AnimateSet_get_implementation(css::uno::XComponentContext*,
::com::sun::star::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new animcore::AnimationNode(SET)); return cppu::acquire(new animcore::AnimationNode(SET));
} }
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
com_sun_star_animations_AnimateColor_get_implementation(::com::sun::star::uno::XComponentContext*, com_sun_star_animations_AnimateColor_get_implementation(css::uno::XComponentContext*,
::com::sun::star::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new animcore::AnimationNode(ANIMATECOLOR)); return cppu::acquire(new animcore::AnimationNode(ANIMATECOLOR));
} }
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
com_sun_star_animations_AnimateMotion_get_implementation(::com::sun::star::uno::XComponentContext*, com_sun_star_animations_AnimateMotion_get_implementation(css::uno::XComponentContext*,
::com::sun::star::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new animcore::AnimationNode(ANIMATEMOTION)); return cppu::acquire(new animcore::AnimationNode(ANIMATEMOTION));
} }
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
com_sun_star_animations_AnimateTransform_get_implementation(::com::sun::star::uno::XComponentContext*, com_sun_star_animations_AnimateTransform_get_implementation(css::uno::XComponentContext*,
::com::sun::star::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new animcore::AnimationNode(ANIMATETRANSFORM)); return cppu::acquire(new animcore::AnimationNode(ANIMATETRANSFORM));
} }
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
com_sun_star_animations_TransitionFilter_get_implementation(::com::sun::star::uno::XComponentContext*, com_sun_star_animations_TransitionFilter_get_implementation(css::uno::XComponentContext*,
::com::sun::star::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new animcore::AnimationNode(TRANSITIONFILTER)); return cppu::acquire(new animcore::AnimationNode(TRANSITIONFILTER));
} }
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
com_sun_star_animations_Audio_get_implementation(::com::sun::star::uno::XComponentContext*, com_sun_star_animations_Audio_get_implementation(css::uno::XComponentContext*,
::com::sun::star::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new animcore::AnimationNode(AUDIO)); return cppu::acquire(new animcore::AnimationNode(AUDIO));
} }
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
com_sun_star_animations_Command_get_implementation(::com::sun::star::uno::XComponentContext*, com_sun_star_animations_Command_get_implementation(css::uno::XComponentContext*,
::com::sun::star::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new animcore::AnimationNode(COMMAND)); return cppu::acquire(new animcore::AnimationNode(COMMAND));
} }

24
avmedia/source/framework/mediacontrol.cxx
View File

@@ -346,11 +346,11 @@ void MediaControl::implUpdateToolboxes()
switch( maItem.getZoom() ) switch( maItem.getZoom() )
{ {
case( ::com::sun::star::media::ZoomLevel_ZOOM_1_TO_2 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_50; break; case( css::media::ZoomLevel_ZOOM_1_TO_2 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_50; break;
case( ::com::sun::star::media::ZoomLevel_ORIGINAL ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_100; break; case( css::media::ZoomLevel_ORIGINAL ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_100; break;
case( ::com::sun::star::media::ZoomLevel_ZOOM_2_TO_1 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_200; break; case( css::media::ZoomLevel_ZOOM_2_TO_1 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_200; break;
case( ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_FIT; break; case( css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_FIT; break;
case( ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_SCALED; break; case( css::media::ZoomLevel_FIT_TO_WINDOW ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_SCALED; break;
default: nSelectEntryPos = AVMEDIA_ZOOMLEVEL_INVALID; break; default: nSelectEntryPos = AVMEDIA_ZOOMLEVEL_INVALID; break;
} }
@@ -571,17 +571,17 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p )
if( p ) if( p )
{ {
MediaItem aExecItem; MediaItem aExecItem;
::com::sun::star::media::ZoomLevel eLevel; css::media::ZoomLevel eLevel;
switch( p->GetSelectEntryPos() ) switch( p->GetSelectEntryPos() )
{ {
case( AVMEDIA_ZOOMLEVEL_50 ): eLevel = ::com::sun::star::media::ZoomLevel_ZOOM_1_TO_2; break; case( AVMEDIA_ZOOMLEVEL_50 ): eLevel = css::media::ZoomLevel_ZOOM_1_TO_2; break;
case( AVMEDIA_ZOOMLEVEL_100 ): eLevel = ::com::sun::star::media::ZoomLevel_ORIGINAL; break; case( AVMEDIA_ZOOMLEVEL_100 ): eLevel = css::media::ZoomLevel_ORIGINAL; break;
case( AVMEDIA_ZOOMLEVEL_200 ): eLevel = ::com::sun::star::media::ZoomLevel_ZOOM_2_TO_1; break; case( AVMEDIA_ZOOMLEVEL_200 ): eLevel = css::media::ZoomLevel_ZOOM_2_TO_1; break;
case( AVMEDIA_ZOOMLEVEL_FIT ): eLevel = ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT; break; case( AVMEDIA_ZOOMLEVEL_FIT ): eLevel = css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT; break;
case( AVMEDIA_ZOOMLEVEL_SCALED ): eLevel = ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW; break; case( AVMEDIA_ZOOMLEVEL_SCALED ): eLevel = css::media::ZoomLevel_FIT_TO_WINDOW; break;
default: eLevel = ::com::sun::star::media::ZoomLevel_NOT_AVAILABLE; break; default: eLevel = css::media::ZoomLevel_NOT_AVAILABLE; break;
} }
aExecItem.setZoom( eLevel ); aExecItem.setZoom( eLevel );

8
avmedia/source/framework/mediaitem.cxx
View File

@@ -59,7 +59,7 @@ struct MediaItem::Impl
sal_Int16 m_nVolumeDB; sal_Int16 m_nVolumeDB;
bool m_bLoop; bool m_bLoop;
bool m_bMute; bool m_bMute;
::com::sun::star::media::ZoomLevel m_eZoom; css::media::ZoomLevel m_eZoom;
explicit Impl(AVMediaSetMask nMaskSet) explicit Impl(AVMediaSetMask nMaskSet)
: m_nMaskSet( nMaskSet ) : m_nMaskSet( nMaskSet )
@@ -69,7 +69,7 @@ struct MediaItem::Impl
, m_nVolumeDB( 0 ) , m_nVolumeDB( 0 )
, m_bLoop( false ) , m_bLoop( false )
, m_bMute( false ) , m_bMute( false )
, m_eZoom( ::com::sun::star::media::ZoomLevel_NOT_AVAILABLE ) , m_eZoom( css::media::ZoomLevel_NOT_AVAILABLE )
{ {
} }
Impl(Impl const& rOther) Impl(Impl const& rOther)
@@ -322,13 +322,13 @@ sal_Int16 MediaItem::getVolumeDB() const
return m_pImpl->m_nVolumeDB; return m_pImpl->m_nVolumeDB;
} }
void MediaItem::setZoom( ::com::sun::star::media::ZoomLevel eZoom ) void MediaItem::setZoom( css::media::ZoomLevel eZoom )
{ {
m_pImpl->m_eZoom = eZoom; m_pImpl->m_eZoom = eZoom;
m_pImpl->m_nMaskSet |= AVMediaSetMask::ZOOM; m_pImpl->m_nMaskSet |= AVMediaSetMask::ZOOM;
} }
::com::sun::star::media::ZoomLevel MediaItem::getZoom() const css::media::ZoomLevel MediaItem::getZoom() const
{ {
return m_pImpl->m_eZoom; return m_pImpl->m_eZoom;
} }

10
avmedia/source/framework/soundhandler.cxx
View File

@@ -165,7 +165,7 @@ SoundHandler::~SoundHandler()
} }
/*-************************************************************************************************************ /*-************************************************************************************************************
@interface ::com::sun::star::frame::XDispatch @interface css::frame::XDispatch
@short try to load audio file @short try to load audio file
@descr This method try to load given audio file by URL and play it. We use vcl/Sound class to do that. @descr This method try to load given audio file by URL and play it. We use vcl/Sound class to do that.
@@ -242,7 +242,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
} }
/*-************************************************************************************************************ /*-************************************************************************************************************
@interface ::com::sun::star::document::XExtendedFilterDetection @interface css::document::XExtendedFilterDetection
@short try to detect file (given as argument included in "lDescriptor") @short try to detect file (given as argument included in "lDescriptor")
@descr We try to detect, if given file could be handled by this class and is a well known one. @descr We try to detect, if given file could be handled by this class and is a well known one.
@@ -338,9 +338,9 @@ IMPL_LINK_NOARG_TYPED(SoundHandler, implts_PlayerNotify, Idle *, void)
} // namespace framework } // namespace framework
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
com_sun_star_comp_framework_SoundHandler_get_implementation(::com::sun::star::uno::XComponentContext*, com_sun_star_comp_framework_SoundHandler_get_implementation(css::uno::XComponentContext*,
::com::sun::star::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new avmedia::SoundHandler); return cppu::acquire(new avmedia::SoundHandler);
} }

12
avmedia/source/gstreamer/gstframegrabber.hxx
View File

@@ -31,8 +31,8 @@ namespace avmedia { namespace gstreamer {
// - FrameGrabber - // - FrameGrabber -
typedef ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber, typedef ::cppu::WeakImplHelper< css::media::XFrameGrabber,
::com::sun::star::lang::XServiceInfo > FrameGrabber_BASE; css::lang::XServiceInfo > FrameGrabber_BASE;
class FrameGrabber : public FrameGrabber_BASE, private boost::noncopyable class FrameGrabber : public FrameGrabber_BASE, private boost::noncopyable
{ {
@@ -45,12 +45,12 @@ public:
virtual ~FrameGrabber(); virtual ~FrameGrabber();
// XFrameGrabber // XFrameGrabber
virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private: private:
explicit FrameGrabber( const OUString &aURL ); explicit FrameGrabber( const OUString &aURL );

16
avmedia/source/gstreamer/gstmanager.hxx
View File

@@ -30,24 +30,24 @@
namespace avmedia { namespace gstreamer { namespace avmedia { namespace gstreamer {
class Manager : public ::cppu::WeakImplHelper< ::com::sun::star::media::XManager, class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
explicit Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); explicit Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~Manager(); virtual ~Manager();
// XManager // XManager
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
}; };
} // namespace gstreamer } // namespace gstreamer

54
avmedia/source/gstreamer/gstplayer.hxx
View File

@@ -35,15 +35,15 @@ namespace avmedia { namespace gstreamer {
// - Player - // - Player -
typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::media::XPlayer, typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
::com::sun::star::lang::XServiceInfo > GstPlayer_BASE; css::lang::XServiceInfo > GstPlayer_BASE;
class Player : public ::cppu::BaseMutex, class Player : public ::cppu::BaseMutex,
public GstPlayer_BASE public GstPlayer_BASE
{ {
public: public:
explicit Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); explicit Player( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~Player(); virtual ~Player();
void preparePlaybin( const OUString& rURL, GstElement *pSink ); void preparePlaybin( const OUString& rURL, GstElement *pSink );
@@ -52,44 +52,44 @@ public:
GstBusSyncReply processSyncMessage( GstMessage *message ); GstBusSyncReply processSyncMessage( GstMessage *message );
// XPlayer // XPlayer
virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL start( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL stop( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL stop( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isPlaying( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isPlaying( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual double SAL_CALL getDuration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual double SAL_CALL getDuration( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual double SAL_CALL getMediaTime( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual double SAL_CALL getMediaTime( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isMute( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isMute( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::cppu::OComponentHelper // ::cppu::OComponentHelper
virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SAL_CALL disposing() SAL_OVERRIDE;
protected: protected:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
OUString maURL; OUString maURL;
// Add elements and pipeline here // Add elements and pipeline here
GstElement* mpPlaybin; // the playbin is also a pipeline GstElement* mpPlaybin; // the playbin is also a pipeline
bool mbFakeVideo; bool mbFakeVideo;
gdouble mnUnmutedVolume; gdouble mnUnmutedVolume;
bool mbPlayPending; bool mbPlayPending;
bool mbMuted; bool mbMuted;
bool mbLooping; bool mbLooping;
bool mbInitialized; bool mbInitialized;
long mnWindowID; long mnWindowID;
GstVideoOverlay* mpXOverlay; GstVideoOverlay* mpXOverlay;

66
avmedia/source/gstreamer/gstwindow.hxx
View File

@@ -34,60 +34,60 @@ namespace avmedia { namespace gstreamer {
class Player; class Player;
class Window : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow, class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr, Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr,
Player& rPlayer ); Player& rPlayer );
virtual ~Window(); virtual ~Window();
bool create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ); bool create( const css::uno::Sequence< css::uno::Any >& aArguments );
void processGraphEvent(); void processGraphEvent();
void updatePointer(); void updatePointer();
// XPlayerWindow // XPlayerWindow
virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL update( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XWindow // XWindow
virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent // XComponent
virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
::osl::Mutex maMutex; ::osl::Mutex maMutex;
::com::sun::star::media::ZoomLevel meZoomLevel; css::media::ZoomLevel meZoomLevel;
Player& mrPlayer; Player& mrPlayer;
int mnPointerType; int mnPointerType;

16
avmedia/source/macavf/framegrabber.hxx
View File

@@ -31,28 +31,28 @@ namespace avmedia { namespace macavf {
// - FrameGrabber - // - FrameGrabber -
// ---------------- // ----------------
class FrameGrabber : public ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber, class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
explicit FrameGrabber( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); explicit FrameGrabber( const css::uno::Reference< css::lang::XMultiServiceFactory >& );
virtual ~FrameGrabber(); virtual ~FrameGrabber();
bool create( const ::rtl::OUString& rURL ); bool create( const ::rtl::OUString& rURL );
bool create( AVAsset* pMovie ); bool create( AVAsset* pMovie );
// XFrameGrabber // XFrameGrabber
virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
AVAssetImageGenerator* mpImageGen; AVAssetImageGenerator* mpImageGen;
}; };

16
avmedia/source/macavf/manager.hxx
View File

@@ -31,24 +31,24 @@
namespace avmedia { namespace macavf { namespace avmedia { namespace macavf {
class Manager : public ::cppu::WeakImplHelper< ::com::sun::star::media::XManager, class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~Manager(); virtual ~Manager();
// XManager // XManager
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
}; };
} // namespace macavf } // namespace macavf

48
avmedia/source/macavf/player.hxx
View File

@@ -36,44 +36,44 @@ namespace avmedia { namespace macavf {
class Player class Player
: public MacAVObserverHandler : public MacAVObserverHandler
, public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayer, , public ::cppu::WeakImplHelper< css::media::XPlayer,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
explicit Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); explicit Player( const css::uno::Reference< css::lang::XMultiServiceFactory >& );
virtual ~Player(); virtual ~Player();
bool create( const ::rtl::OUString& rURL ); bool create( const ::rtl::OUString& rURL );
bool create( AVAsset* ); bool create( AVAsset* );
// XPlayer // XPlayer
virtual void SAL_CALL start() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL start() throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL stop() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL stop() throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isPlaying() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isPlaying() throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual double SAL_CALL getDuration() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual double SAL_CALL getDuration() throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual double SAL_CALL getMediaTime() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual double SAL_CALL getMediaTime() throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setStopTime( double fTime ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setStopTime( double fTime ) throw (css::uno::RuntimeException);
virtual double SAL_CALL getStopTime() throw (::com::sun::star::uno::RuntimeException); virtual double SAL_CALL getStopTime() throw (css::uno::RuntimeException);
virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isPlaybackLoop() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isPlaybackLoop() throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isMute() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isMute() throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Int16 SAL_CALL getVolumeDB() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getVolumeDB() throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
AVPlayer* getAVPlayer() const { return mpPlayer; } AVPlayer* getAVPlayer() const { return mpPlayer; }
virtual bool handleObservation( NSString* pKeyPath ) SAL_OVERRIDE; virtual bool handleObservation( NSString* pKeyPath ) SAL_OVERRIDE;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
AVPlayer* mpPlayer; AVPlayer* mpPlayer;

64
avmedia/source/macavf/window.hxx
View File

@@ -47,12 +47,12 @@ class Player;
class Window class Window
: public MacAVObserverHandler : public MacAVObserverHandler
, public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow, , public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_rxMgr, Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& i_rxMgr,
Player& i_rPlayer, Player& i_rPlayer,
NSView* i_pParentView NSView* i_pParentView
); );
@@ -62,49 +62,49 @@ public:
void updatePointer(); void updatePointer();
// XPlayerWindow // XPlayerWindow
virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL update( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XWindow // XWindow
virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XComponent // XComponent
virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual bool handleObservation( NSString* pKeyPath ) SAL_OVERRIDE; virtual bool handleObservation( NSString* pKeyPath ) SAL_OVERRIDE;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
::osl::Mutex maMutex; ::osl::Mutex maMutex;
::cppu::OMultiTypeInterfaceContainerHelper maListeners; ::cppu::OMultiTypeInterfaceContainerHelper maListeners;
::com::sun::star::media::ZoomLevel meZoomLevel; css::media::ZoomLevel meZoomLevel;
Player& mrPlayer; Player& mrPlayer;
int mnPointerType; int mnPointerType;

12
avmedia/source/opengl/oglmanager.hxx
View File

@@ -22,19 +22,19 @@ class OGLManager : public ::cppu::WeakImplHelper< com::sun::star::media::XManage
{ {
public: public:
explicit OGLManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rMgr ); explicit OGLManager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rMgr );
virtual ~OGLManager(); virtual ~OGLManager();
// XManager // XManager
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const OUString& rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& rURL ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xMgr; css::uno::Reference< css::lang::XMultiServiceFactory > m_xMgr;
}; };
} // namespace ogl } // namespace ogl

4
avmedia/source/opengl/oglplayer.cxx
View File

@@ -184,7 +184,7 @@ void SAL_CALL OGLPlayer::setMediaTime( double fTime ) throw ( uno::RuntimeExcept
gltf_animation_set_time(m_pHandle, fTime); gltf_animation_set_time(m_pHandle, fTime);
} }
double SAL_CALL OGLPlayer::getMediaTime() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) double SAL_CALL OGLPlayer::getMediaTime() throw ( css::uno::RuntimeException, std::exception )
{ {
osl::MutexGuard aGuard(m_aMutex); osl::MutexGuard aGuard(m_aMutex);
assert(m_pHandle); assert(m_pHandle);
@@ -338,7 +338,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber()
} }
OUString SAL_CALL OGLPlayer::getImplementationName() OUString SAL_CALL OGLPlayer::getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) throw ( css::uno::RuntimeException, std::exception )
{ {
return OUString("com.sun.star.comp.avmedia.Player_OpenGL"); return OUString("com.sun.star.comp.avmedia.Player_OpenGL");
} }

22
avmedia/source/quicktime/framegrabber.hxx
View File

@@ -31,29 +31,29 @@ namespace avmedia { namespace quicktime {
// - FrameGrabber - // - FrameGrabber -
class FrameGrabber : public ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber, class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
FrameGrabber( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); FrameGrabber( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~FrameGrabber(); virtual ~FrameGrabber();
bool create( const OUString& rURL ); bool create( const OUString& rURL );
// XFrameGrabber // XFrameGrabber
virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
OUString maURL; OUString maURL;
QTMovie* mpMovie; QTMovie* mpMovie;
bool mbInitialized; bool mbInitialized;
}; };
} // namespace quicktime } // namespace quicktime

16
avmedia/source/quicktime/manager.hxx
View File

@@ -31,24 +31,24 @@
namespace avmedia { namespace quicktime { namespace avmedia { namespace quicktime {
class Manager : public ::cppu::WeakImplHelper< ::com::sun::star::media::XManager, class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~Manager(); virtual ~Manager();
// XManager // XManager
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
}; };
} // namespace quicktime } // namespace quicktime

48
avmedia/source/quicktime/player.hxx
View File

@@ -32,41 +32,41 @@ namespace avmedia { namespace quicktime {
*/ */
class Player : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayer, class Player : public ::cppu::WeakImplHelper< css::media::XPlayer,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); Player( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~Player(); virtual ~Player();
bool create( const OUString& rURL ); bool create( const OUString& rURL );
// XPlayer // XPlayer
virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL start( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL stop( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL stop( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isPlaying( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isPlaying( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual double SAL_CALL getDuration( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual double SAL_CALL getDuration( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual double SAL_CALL getMediaTime( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual double SAL_CALL getMediaTime( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isMute( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isMute( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
QTMovie* getMovie(); QTMovie* getMovie();
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
OUString maURL; OUString maURL;
@@ -75,8 +75,8 @@ private:
float mnUnmutedVolume; float mnUnmutedVolume;
double mnStopTime; double mnStopTime;
bool mbMuted; bool mbMuted;
bool mbInitialized; bool mbInitialized;
}; };
} // namespace quicktime } // namespace quicktime

2
avmedia/source/quicktime/player.mm
View File

@@ -341,7 +341,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( ) uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
throw (::com::sun::star::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
uno::Reference< media::XFrameGrabber > xRet; uno::Reference< media::XFrameGrabber > xRet;
OSL_TRACE ("Player::createFrameGrabber"); OSL_TRACE ("Player::createFrameGrabber");

64
avmedia/source/quicktime/window.hxx
View File

@@ -34,12 +34,12 @@ namespace avmedia { namespace quicktime {
class Player; class Player;
class Window : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow, class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_rxMgr, Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& i_rxMgr,
Player& i_rPlayer, Player& i_rPlayer,
NSView* i_pParentView NSView* i_pParentView
); );
@@ -49,47 +49,47 @@ public:
void updatePointer(); void updatePointer();
// XPlayerWindow // XPlayerWindow
virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL update( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XWindow // XWindow
virtual void SAL_CALL setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setVisible( sal_Bool ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setVisible( sal_Bool ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setEnable( sal_Bool ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setEnable( sal_Bool ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XComponent // XComponent
virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
::osl::Mutex maMutex; ::osl::Mutex maMutex;
::cppu::OMultiTypeInterfaceContainerHelper maListeners; ::cppu::OMultiTypeInterfaceContainerHelper maListeners;
::com::sun::star::media::ZoomLevel meZoomLevel; css::media::ZoomLevel meZoomLevel;
Player& mrPlayer; Player& mrPlayer;
int mnPointerType; int mnPointerType;

44
avmedia/source/viewer/mediaevent_impl.cxx
View File

@@ -51,15 +51,15 @@ void MediaEventListenersImpl::cleanUp()
void SAL_CALL MediaEventListenersImpl::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) void SAL_CALL MediaEventListenersImpl::disposing( const css::lang::EventObject& /* Source */ )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
} }
void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::KeyEvent& e ) void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
const ::osl::MutexGuard aGuard( maMutex ); const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard; const SolarMutexGuard aAppGuard;
@@ -78,8 +78,8 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::
void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt::KeyEvent& e ) void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
const ::osl::MutexGuard aGuard( maMutex ); const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard; const SolarMutexGuard aAppGuard;
@@ -97,8 +97,8 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt:
void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt::MouseEvent& e ) void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent& e )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
const ::osl::MutexGuard aGuard( maMutex ); const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard; const SolarMutexGuard aAppGuard;
@@ -118,8 +118,8 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt
// ----------------------------------------------gvd----------------------- // ----------------------------------------------gvd-----------------------
void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent& e )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
const ::osl::MutexGuard aGuard( maMutex ); const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard; const SolarMutexGuard aAppGuard;
@@ -139,8 +139,8 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw
void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt::MouseEvent& /* e */ ) void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent& /* e */ )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
const ::osl::MutexGuard aGuard( maMutex ); const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard; const SolarMutexGuard aAppGuard;
@@ -152,8 +152,8 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt
void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt::MouseEvent& /* e */ ) void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent& /* e */ )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
const ::osl::MutexGuard aGuard( maMutex ); const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard; const SolarMutexGuard aAppGuard;
@@ -165,8 +165,8 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt:
void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent& e )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
const ::osl::MutexGuard aGuard( maMutex ); const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard; const SolarMutexGuard aAppGuard;
@@ -180,8 +180,8 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt
void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
const ::osl::MutexGuard aGuard( maMutex ); const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard; const SolarMutexGuard aAppGuard;
@@ -195,15 +195,15 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::
void SAL_CALL MediaEventListenersImpl::focusGained( const ::com::sun::star::awt::FocusEvent& /* e */ ) void SAL_CALL MediaEventListenersImpl::focusGained( const css::awt::FocusEvent& /* e */ )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
} }
void SAL_CALL MediaEventListenersImpl::focusLost( const ::com::sun::star::awt::FocusEvent& /* e */ ) void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& /* e */ )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
} }

30
avmedia/source/viewer/mediaevent_impl.hxx
View File

@@ -35,10 +35,10 @@ namespace avmedia
// - MediaEventListenersImpl - // - MediaEventListenersImpl -
class MediaEventListenersImpl : public ::cppu::WeakImplHelper< ::com::sun::star::awt::XKeyListener, class MediaEventListenersImpl : public ::cppu::WeakImplHelper< css::awt::XKeyListener,
::com::sun::star::awt::XMouseListener, css::awt::XMouseListener,
::com::sun::star::awt::XMouseMotionListener, css::awt::XMouseMotionListener,
::com::sun::star::awt::XFocusListener > css::awt::XFocusListener >
{ {
public: public:
@@ -50,23 +50,23 @@ namespace avmedia
protected: protected:
// XKeyListener // XKeyListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XMouseListener // XMouseListener
virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XMouseMotionListener // XMouseMotionListener
virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XFocusListener // XFocusListener
virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private: private:

8
avmedia/source/vlc/vlcframegrabber.cxx
View File

@@ -67,7 +67,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
} }
::uno::Reference< css::graphic::XGraphic > SAL_CALL VLCFrameGrabber::grabFrame( double fMediaTime ) ::uno::Reference< css::graphic::XGraphic > SAL_CALL VLCFrameGrabber::grabFrame( double fMediaTime )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) throw ( css::uno::RuntimeException, std::exception )
{ {
osl::Condition condition; osl::Condition condition;
@@ -114,19 +114,19 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
return Graphic( bitmap ).GetXGraphic(); return Graphic( bitmap ).GetXGraphic();
} }
::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) ::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() throw ( css::uno::RuntimeException, std::exception )
{ {
return AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME; return AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME;
} }
sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& serviceName ) sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& serviceName )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) throw ( css::uno::RuntimeException, std::exception )
{ {
return cppu::supportsService(this, serviceName); return cppu::supportsService(this, serviceName);
} }
::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames() ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) throw ( css::uno::RuntimeException, std::exception )
{ {
::uno::Sequence< OUString > aRet(1); ::uno::Sequence< OUString > aRet(1);
aRet[0] = AVMEDIA_VLC_GRABBER_SERVICENAME; aRet[0] = AVMEDIA_VLC_GRABBER_SERVICENAME;

16
avmedia/source/vlc/vlcframegrabber.hxx
View File

@@ -29,8 +29,8 @@
namespace avmedia { namespace avmedia {
namespace vlc { namespace vlc {
typedef ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber, typedef ::cppu::WeakImplHelper< css::media::XFrameGrabber,
::com::sun::star::lang::XServiceInfo > FrameGrabber_BASE; css::lang::XServiceInfo > FrameGrabber_BASE;
class VLCFrameGrabber : public FrameGrabber_BASE class VLCFrameGrabber : public FrameGrabber_BASE
{ {
@@ -41,15 +41,15 @@ class VLCFrameGrabber : public FrameGrabber_BASE
public: public:
VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url ); VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url );
::com::sun::star::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
::rtl::OUString SAL_CALL getImplementationName() ::rtl::OUString SAL_CALL getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
}; };
} }

22
avmedia/source/vlc/vlcmanager.hxx
View File

@@ -28,26 +28,26 @@
namespace avmedia { namespace avmedia {
namespace vlc { namespace vlc {
class Manager : public ::cppu::WeakImplHelper< ::com::sun::star::media::XManager, class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
std::unique_ptr<wrapper::Instance> mInstance; std::unique_ptr<wrapper::Instance> mInstance;
wrapper::EventHandler mEventHandler; wrapper::EventHandler mEventHandler;
public: public:
explicit Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); explicit Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~Manager(); virtual ~Manager();
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mPlayer; css::uno::Reference< css::media::XPlayer > mPlayer;
rtl::OUString mURL; rtl::OUString mURL;
bool m_is_vlc_found; bool m_is_vlc_found;
}; };
} }

38
avmedia/source/vlc/vlcplayer.cxx
View File

@@ -66,7 +66,7 @@ unsigned VLCPlayer::getHeight() const
return mPlayer.getHeight(); return mPlayer.getHeight();
} }
void SAL_CALL VLCPlayer::start() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) void SAL_CALL VLCPlayer::start() throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
if (!mPlayer.play()) if (!mPlayer.play())
@@ -75,19 +75,19 @@ void SAL_CALL VLCPlayer::start() throw ( ::com::sun::star::uno::RuntimeException
} }
} }
void SAL_CALL VLCPlayer::stop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) void SAL_CALL VLCPlayer::stop() throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
mPlayer.pause(); mPlayer.pause();
} }
sal_Bool SAL_CALL VLCPlayer::isPlaying() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) sal_Bool SAL_CALL VLCPlayer::isPlaying() throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
return mPlayer.isPlaying(); return mPlayer.isPlaying();
} }
double SAL_CALL VLCPlayer::getDuration() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) double SAL_CALL VLCPlayer::getDuration() throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
return static_cast<double>( mMedia.getDuration() ) / MS_IN_SEC; return static_cast<double>( mMedia.getDuration() ) / MS_IN_SEC;
@@ -99,7 +99,7 @@ void SAL_CALL VLCPlayer::setScale( float factor )
mPlayer.setScale( factor ); mPlayer.setScale( factor );
} }
void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
if ( fTime < 0.00000001 && !mPlayer.isPlaying() ) if ( fTime < 0.00000001 && !mPlayer.isPlaying() )
@@ -110,7 +110,7 @@ void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( ::com::sun::star::
mPlayer.setTime( fTime * MS_IN_SEC ); mPlayer.setTime( fTime * MS_IN_SEC );
} }
double SAL_CALL VLCPlayer::getMediaTime() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) double SAL_CALL VLCPlayer::getMediaTime() throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
return static_cast<double>( mPlayer.getTime() ) / MS_IN_SEC; return static_cast<double>( mPlayer.getTime() ) / MS_IN_SEC;
@@ -124,7 +124,7 @@ void VLCPlayer::replay()
start(); start();
} }
void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
mPlaybackLoop = bSet; mPlaybackLoop = bSet;
@@ -135,37 +135,37 @@ void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( ::com::sun::st
mEventManager.onEndReached(); mEventManager.onEndReached();
} }
sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
return mPlaybackLoop; return mPlaybackLoop;
} }
void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
mPlayer.setVolume( static_cast<sal_Int16>( ( nDB + 40 ) * 10.0 / 4 ) ); mPlayer.setVolume( static_cast<sal_Int16>( ( nDB + 40 ) * 10.0 / 4 ) );
} }
::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) ::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
return static_cast<sal_Int16>( mPlayer.getVolume() / 10.0 * 4 - 40 ); return static_cast<sal_Int16>( mPlayer.getVolume() / 10.0 * 4 - 40 );
} }
void SAL_CALL VLCPlayer::setMute( sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) void SAL_CALL VLCPlayer::setMute( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
mPlayer.setMute( bSet ); mPlayer.setMute( bSet );
} }
sal_Bool SAL_CALL VLCPlayer::isMute() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) sal_Bool SAL_CALL VLCPlayer::isMute() throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
return mPlayer.getMute(); return mPlayer.getMute();
} }
css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() throw ( css::uno::RuntimeException, std::exception )
{ {
return css::awt::Size( 480, 360 ); return css::awt::Size( 480, 360 );
} }
@@ -216,7 +216,7 @@ void VLCPlayer::setVideoSize( unsigned width, unsigned height )
} }
uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments ) uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
@@ -235,11 +235,11 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWind
setWindowID( winID ); setWindowID( winID );
} }
return ::com::sun::star::uno::Reference< css::media::XPlayerWindow >( window ); return css::uno::Reference< css::media::XPlayerWindow >( window );
} }
uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabber() uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabber()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) throw ( css::uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
@@ -253,19 +253,19 @@ uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabb
} }
::rtl::OUString SAL_CALL VLCPlayer::getImplementationName() ::rtl::OUString SAL_CALL VLCPlayer::getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) throw ( css::uno::RuntimeException, std::exception )
{ {
return AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME; return AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME;
} }
sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName ) sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) throw ( css::uno::RuntimeException, std::exception )
{ {
return cppu::supportsService(this, serviceName); return cppu::supportsService(this, serviceName);
} }
::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames() ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) throw ( css::uno::RuntimeException, std::exception )
{ {
uno::Sequence< OUString > aRet(1); uno::Sequence< OUString > aRet(1);
aRet[0] = AVMEDIA_VLC_PLAYER_SERVICENAME; aRet[0] = AVMEDIA_VLC_PLAYER_SERVICENAME;

62
avmedia/source/vlc/vlcplayer.hxx
View File

@@ -33,22 +33,22 @@
namespace avmedia { namespace avmedia {
namespace vlc { namespace vlc {
typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::media::XPlayer, typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
::com::sun::star::lang::XServiceInfo > VLC_Base; css::lang::XServiceInfo > VLC_Base;
class VLCPlayer : public ::cppu::BaseMutex, class VLCPlayer : public ::cppu::BaseMutex,
public VLC_Base public VLC_Base
{ {
wrapper::Instance& mInstance; wrapper::Instance& mInstance;
wrapper::EventHandler& mEventHandler; wrapper::EventHandler& mEventHandler;
wrapper::Media mMedia; wrapper::Media mMedia;
wrapper::Player mPlayer; wrapper::Player mPlayer;
wrapper::EventManager mEventManager; wrapper::EventManager mEventManager;
const rtl::OUString mUrl; const rtl::OUString mUrl;
bool mPlaybackLoop; bool mPlaybackLoop;
::com::sun::star::uno::Reference< css::media::XFrameGrabber > mrFrameGrabber; css::uno::Reference< css::media::XFrameGrabber > mrFrameGrabber;
intptr_t mPrevWinID; intptr_t mPrevWinID;
public: public:
VLCPlayer( const rtl::OUString& url, VLCPlayer( const rtl::OUString& url,
wrapper::Instance& instance, wrapper::Instance& instance,
@@ -61,30 +61,30 @@ public:
void SAL_CALL setScale( float factor ); void SAL_CALL setScale( float factor );
void SAL_CALL setWindowID( const intptr_t windowID ); void SAL_CALL setWindowID( const intptr_t windowID );
void SAL_CALL start() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void SAL_CALL start() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void SAL_CALL stop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void SAL_CALL stop() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
sal_Bool SAL_CALL isPlaying() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL isPlaying() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
double SAL_CALL getDuration() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; double SAL_CALL getDuration() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void SAL_CALL setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void SAL_CALL setMediaTime( double fTime ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
double SAL_CALL getMediaTime() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; double SAL_CALL getMediaTime() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
sal_Bool SAL_CALL isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL isPlaybackLoop() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
::sal_Int16 SAL_CALL getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; ::sal_Int16 SAL_CALL getVolumeDB() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void SAL_CALL setMute( sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void SAL_CALL setMute( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
sal_Bool SAL_CALL isMute() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL isMute() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
::com::sun::star::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
::com::sun::star::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
::rtl::OUString SAL_CALL getImplementationName() ::rtl::OUString SAL_CALL getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;;
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;;
private: private:
void replay(); void replay();

54
avmedia/source/vlc/vlcwindow.hxx
View File

@@ -26,13 +26,13 @@ namespace avmedia {
namespace vlc { namespace vlc {
class VLCPlayer; class VLCPlayer;
class VLCWindow : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow, class VLCWindow : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
VLCPlayer& mPlayer; VLCPlayer& mPlayer;
const intptr_t mPrevWinID; const intptr_t mPrevWinID;
::com::sun::star::media::ZoomLevel meZoomLevel; css::media::ZoomLevel meZoomLevel;
::com::sun::star::awt::Rectangle mSize; css::awt::Rectangle mSize;
public: public:
VLCWindow( VLCPlayer& player, const intptr_t prevWinID ); VLCWindow( VLCPlayer& player, const intptr_t prevWinID );
virtual ~VLCWindow(); virtual ~VLCWindow();
@@ -44,29 +44,29 @@ public:
::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL setFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL setFocus() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
}; };
} }

18
avmedia/source/win/framegrabber.hxx
View File

@@ -32,28 +32,28 @@ namespace avmedia { namespace win {
// - FrameGrabber - // - FrameGrabber -
class FrameGrabber : public ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber, class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
explicit FrameGrabber( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); explicit FrameGrabber( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
~FrameGrabber(); ~FrameGrabber();
bool create( const OUString& rURL ); bool create( const OUString& rURL );
// XFrameGrabber // XFrameGrabber
virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException);
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
OUString maURL; OUString maURL;
IMediaDet* implCreateMediaDet( const OUString& rURL ) const; IMediaDet* implCreateMediaDet( const OUString& rURL ) const;
}; };

16
avmedia/source/win/manager.hxx
View File

@@ -30,24 +30,24 @@
namespace avmedia { namespace win { namespace avmedia { namespace win {
class Manager : public ::cppu::WeakImplHelper< ::com::sun::star::media::XManager, class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
explicit Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); explicit Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
~Manager(); ~Manager();
// XManager // XManager
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException);
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
}; };
} // namespace win } // namespace win

44
avmedia/source/win/player.hxx
View File

@@ -46,15 +46,15 @@ namespace avmedia { namespace win {
// - Player - // - Player -
typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::media::XPlayer, typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
::com::sun::star::lang::XServiceInfo > Player_BASE; css::lang::XServiceInfo > Player_BASE;
class Player : public cppu::BaseMutex, class Player : public cppu::BaseMutex,
public Player_BASE public Player_BASE
{ {
public: public:
explicit Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); explicit Player( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
~Player(); ~Player();
bool create( const OUString& rURL ); bool create( const OUString& rURL );
@@ -65,33 +65,33 @@ public:
const IVideoWindow* getVideoWindow() const; const IVideoWindow* getVideoWindow() const;
// XPlayer // XPlayer
virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL start( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL stop( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL stop( ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL isPlaying( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isPlaying( ) throw (css::uno::RuntimeException);
virtual double SAL_CALL getDuration( ) throw (::com::sun::star::uno::RuntimeException); virtual double SAL_CALL getDuration( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException);
virtual double SAL_CALL getMediaTime( ) throw (::com::sun::star::uno::RuntimeException); virtual double SAL_CALL getMediaTime( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL isMute( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isMute( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException);
virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (css::uno::RuntimeException);
virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (::com::sun::star::uno::RuntimeException); virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException);
// ::cppu::OComponentHelper // ::cppu::OComponentHelper
virtual void SAL_CALL disposing(); virtual void SAL_CALL disposing();
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
OUString maURL; OUString maURL;
IGraphBuilder* mpGB; IGraphBuilder* mpGB;

8
avmedia/source/win/window.cxx
View File

@@ -530,7 +530,7 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener ); maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
} }
void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ) void Window::fireMousePressedEvent( const css::awt::MouseEvent& rEvt )
{ {
::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseListener>::get()); ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseListener>::get());
@@ -543,7 +543,7 @@ void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEv
} }
} }
void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ) void Window::fireMouseReleasedEvent( const css::awt::MouseEvent& rEvt )
{ {
::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseListener>::get()); ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseListener>::get());
@@ -556,7 +556,7 @@ void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rE
} }
} }
void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ) void Window::fireMouseMovedEvent( const css::awt::MouseEvent& rEvt )
{ {
::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseMotionListener>::get()); ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseMotionListener>::get());
@@ -569,7 +569,7 @@ void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt
} }
} }
void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt ) void Window::fireSetFocusEvent( const css::awt::FocusEvent& rEvt )
{ {
::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XFocusListener>::get()); ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XFocusListener>::get());

78
avmedia/source/win/window.hxx
View File

@@ -36,70 +36,70 @@ namespace avmedia { namespace win {
class Player; class Player;
class Window : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow, class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr, Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr,
Player& rPlayer ); Player& rPlayer );
~Window(); ~Window();
bool create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ); bool create( const css::uno::Sequence< css::uno::Any >& aArguments );
void processGraphEvent(); void processGraphEvent();
void updatePointer(); void updatePointer();
// XPlayerWindow // XPlayerWindow
virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL update( ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException);
virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException); virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException);
// XWindow // XWindow
virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException);
virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException); virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException);
// XComponent // XComponent
virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException);
public: public:
void fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ); void fireMousePressedEvent( const css::awt::MouseEvent& rEvt );
void fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ); void fireMouseReleasedEvent( const css::awt::MouseEvent& rEvt );
void fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ); void fireMouseMovedEvent( const css::awt::MouseEvent& rEvt );
void fireKeyPressedEvent( const ::com::sun::star::awt::KeyEvent& rEvt ); void fireKeyPressedEvent( const css::awt::KeyEvent& rEvt );
void fireKeyReleasedEvent( const ::com::sun::star::awt::KeyEvent& rEvt ); void fireKeyReleasedEvent( const css::awt::KeyEvent& rEvt );
void fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt ); void fireSetFocusEvent( const css::awt::FocusEvent& rEvt );
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
::osl::Mutex maMutex; ::osl::Mutex maMutex;
::cppu::OMultiTypeInterfaceContainerHelper maListeners; ::cppu::OMultiTypeInterfaceContainerHelper maListeners;
::com::sun::star::media::ZoomLevel meZoomLevel; css::media::ZoomLevel meZoomLevel;
Player& mrPlayer; Player& mrPlayer;
int mnFrameWnd; int mnFrameWnd;
int mnParentWnd; int mnParentWnd;

19
include/animations/animationnodehelper.hxx
View File

@@ -38,38 +38,37 @@ namespace anim
/** pushes the given node to the given vector and recursivly calls itself for each child node. /** pushes the given node to the given vector and recursivly calls itself for each child node.
*/ */
inline void create_deep_vector( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, inline void create_deep_vector( const css::uno::Reference< css::animations::XAnimationNode >& xNode,
std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& rVector ) std::vector< css::uno::Reference< css::animations::XAnimationNode > >& rVector )
{ {
rVector.push_back( xNode ); rVector.push_back( xNode );
try try
{ {
// get an XEnumerationAccess to the children // get an XEnumerationAccess to the children
::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > css::uno::Reference< css::container::XEnumerationAccess >
xEnumerationAccess( xNode, xEnumerationAccess( xNode, css::uno::UNO_QUERY );
::com::sun::star::uno::UNO_QUERY );
if( xEnumerationAccess.is() ) if( xEnumerationAccess.is() )
{ {
::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > css::uno::Reference< css::container::XEnumeration >
xEnumeration( xEnumerationAccess->createEnumeration(), xEnumeration( xEnumerationAccess->createEnumeration(),
::com::sun::star::uno::UNO_QUERY ); css::uno::UNO_QUERY );
if( xEnumeration.is() ) if( xEnumeration.is() )
{ {
while( xEnumeration->hasMoreElements() ) while( xEnumeration->hasMoreElements() )
{ {
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > css::uno::Reference< css::animations::XAnimationNode >
xChildNode( xEnumeration->nextElement(), xChildNode( xEnumeration->nextElement(),
::com::sun::star::uno::UNO_QUERY_THROW ); css::uno::UNO_QUERY_THROW );
create_deep_vector( xChildNode, rVector ); create_deep_vector( xChildNode, rVector );
} }
} }
} }
} }
catch( ::com::sun::star::uno::Exception& ) catch( css::uno::Exception& )
{ {
} }
} }

8
include/avmedia/mediawindow.hxx
View File

@@ -103,9 +103,9 @@ namespace avmedia
static void executeFormatErrorBox( vcl::Window* pParent ); static void executeFormatErrorBox( vcl::Window* pParent );
static bool isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep = false, Size* pPreferredSizePixel = NULL ); static bool isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep = false, Size* pPreferredSizePixel = NULL );
static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 ); static css::uno::Reference< css::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 );
static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > grabFrame( const OUString& rURL, const OUString& rReferer, static css::uno::Reference< css::graphic::XGraphic > grabFrame( const OUString& rURL, const OUString& rReferer,
const OUString& sMimeType, double fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME ); const OUString& sMimeType, double fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME );
static BitmapEx getAudioLogo(); static BitmapEx getAudioLogo();
@@ -115,8 +115,8 @@ namespace avmedia
MediaWindow(const MediaWindow&) SAL_DELETED_FUNCTION; MediaWindow(const MediaWindow&) SAL_DELETED_FUNCTION;
MediaWindow& operator =( const MediaWindow& ) SAL_DELETED_FUNCTION; MediaWindow& operator =( const MediaWindow& ) SAL_DELETED_FUNCTION;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxIFace; css::uno::Reference< css::uno::XInterface > mxIFace;
VclPtr<priv::MediaWindowImpl> mpImpl; VclPtr<priv::MediaWindowImpl> mpImpl;
}; };
} }

2
include/avmedia/modeltools.hxx
View File

@@ -23,7 +23,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput);
#endif #endif
bool AVMEDIA_DLLPUBLIC Embed3DModel( bool AVMEDIA_DLLPUBLIC Embed3DModel(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel, const css::uno::Reference< css::frame::XModel>& xModel,
const OUString& rSourceURL, OUString& o_rEmbeddedURL); const OUString& rSourceURL, OUString& o_rEmbeddedURL);
bool AVMEDIA_DLLPUBLIC IsModel(const OUString& rMimeType); bool AVMEDIA_DLLPUBLIC IsModel(const OUString& rMimeType);