diff options
| -rw-r--r-- | slideshow/source/engine/animationnodes/animationcommandnode.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/animationnodes/animationcommandnode.hxx | 4 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/externalshapebase.hxx | 4 | ||||
| -rw-r--r-- | slideshow/source/inc/iexternalmediashapebase.hxx (renamed from slideshow/source/inc/externalmediashape.hxx) | 11 |
4 files changed, 11 insertions, 10 deletions
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx b/slideshow/source/engine/animationnodes/animationcommandnode.cxx index c7cbf0969268..be7b2b767972 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx @@ -49,7 +49,7 @@ AnimationCommandNode::AnimationCommandNode( uno::Reference<animations::XAnimatio uno::Reference< drawing::XShape > xShape( mxCommandNode->getTarget(), uno::UNO_QUERY ); ShapeSharedPtr pShape( getContext().mpSubsettableShapeManager->lookupShape( xShape ) ); - mpShape = ::boost::dynamic_pointer_cast< ExternalMediaShape >( pShape ); + mpShape = ::boost::dynamic_pointer_cast< IExternalMediaShapeBase >( pShape ); } void AnimationCommandNode::dispose() diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx b/slideshow/source/engine/animationnodes/animationcommandnode.hxx index 3ce5f23f5374..f9e61fd5c59d 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SLIDESHOW_ANIMATIONCOMMANDNODE_HXX #include "basecontainernode.hxx" -#include "externalmediashape.hxx" +#include "iexternalmediashapebase.hxx" #include "soundplayer.hxx" #include "com/sun/star/animations/XCommand.hpp" @@ -49,7 +49,7 @@ private: virtual bool hasPendingAnimation() const SAL_OVERRIDE; private: - ExternalMediaShapeSharedPtr mpShape; + IExternalMediaShapeBaseSharedPtr mpShape; ::com::sun::star::uno::Reference< ::com::sun::star::animations::XCommand > mxCommandNode; }; diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx index 4de13609c8d0..1f240aa564bc 100644 --- a/slideshow/source/engine/shapes/externalshapebase.hxx +++ b/slideshow/source/engine/shapes/externalshapebase.hxx @@ -22,7 +22,7 @@ #include <vector> -#include "externalmediashape.hxx" +#include "iexternalmediashapebase.hxx" #include "unoview.hxx" #include "subsettableshapemanager.hxx" #include "slideshowexceptions.hxx" @@ -44,7 +44,7 @@ namespace slideshow (including mutual overdraw). It therefore reports yes for the isBackgroundDetached() question. */ - class ExternalShapeBase : public ExternalMediaShape + class ExternalShapeBase : public IExternalMediaShapeBase { public: /** Create a shape for the given XShape for an external shape diff --git a/slideshow/source/inc/externalmediashape.hxx b/slideshow/source/inc/iexternalmediashapebase.hxx index c55d0ba1f570..134a4dfc396f 100644 --- a/slideshow/source/inc/externalmediashape.hxx +++ b/slideshow/source/inc/iexternalmediashapebase.hxx @@ -29,12 +29,13 @@ namespace slideshow { namespace internal { - /** Represents a shape containing media (video, sound). + /** Represents a shape containing playable content rendered by + external engine (e.g. media or applet). This interface adds media handling methods to a shape. It allows starting/stopping and pausing playback. - */ - class ExternalMediaShape : public Shape + */ + class IExternalMediaShapeBase : public Shape { public: // Animation methods @@ -51,7 +52,7 @@ namespace slideshow This method leaves playback mode on all registered views. The media is then rewound to the start, and - removed from screen (for videos) + removed from screen (for videos) */ virtual void stop() = 0; @@ -75,7 +76,7 @@ namespace slideshow virtual void setMediaTime(double fTime) = 0; }; - typedef ::boost::shared_ptr< ExternalMediaShape > ExternalMediaShapeSharedPtr; + typedef ::boost::shared_ptr< IExternalMediaShapeBase > IExternalMediaShapeBaseSharedPtr; } } |