convert MediaState to scoped enum

Change-Id: Idf14f7d344be6c690cdd721cd5f7eb7c328b590c

avmedia/source/framework/mediacontrol.cxx

@@ -318,7 +318,7 @@ void MediaControl::implUpdateToolboxes()
         maPlayToolBox->Enable();
         maMuteToolBox->Enable();
 
-        if( MEDIASTATE_PLAY == maItem.getState() )
+        if( MediaState::Play == maItem.getState() )
         {
             maPlayToolBox->CheckItem( AVMEDIA_TOOLBOXITEM_PLAY, true );
             maPlayToolBox->CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE, false );
@@ -498,7 +498,7 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
                     else
                     {
                         aExecItem.setURL( aURL, "", ""/*TODO?*/ );
-                        aExecItem.setState( MEDIASTATE_PLAY );
+                        aExecItem.setState( MediaState::Play );
                     }
                 }
             }
@@ -515,7 +515,7 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
 
             case( AVMEDIA_TOOLBOXITEM_PLAY ):
             {
-                aExecItem.setState( MEDIASTATE_PLAY );
+                aExecItem.setState( MediaState::Play );
 
                 if( maItem.getTime() == maItem.getDuration() )
                     aExecItem.setTime( 0.0 );
@@ -526,13 +526,13 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
 
             case( AVMEDIA_TOOLBOXITEM_PAUSE ):
             {
-                aExecItem.setState( MEDIASTATE_PAUSE );
+                aExecItem.setState( MediaState::Pause );
             }
             break;
 
             case( AVMEDIA_TOOLBOXITEM_STOP ):
             {
-                aExecItem.setState( MEDIASTATE_STOP );
+                aExecItem.setState( MediaState::Stop );
                 aExecItem.setTime( 0.0 );
             }
             break;

avmedia/source/framework/mediaitem.cxx

@@ -63,7 +63,7 @@ struct MediaItem::Impl
 
     explicit Impl(AVMediaSetMask nMaskSet)
         : m_nMaskSet( nMaskSet )
-        , m_eState( MEDIASTATE_STOP )
+        , m_eState( MediaState::Stop )
         , m_fTime( 0.0 )
         , m_fDuration( 0.0 )
         , m_nVolumeDB( 0 )

avmedia/source/viewer/mediawindow_impl.cxx

@@ -325,9 +325,9 @@ bool MediaWindowImpl::start()
 void MediaWindowImpl::updateMediaItem( MediaItem& rItem ) const
 {
     if( isPlaying() )
-        rItem.setState( MEDIASTATE_PLAY );
+        rItem.setState( MediaState::Play );
     else
-        rItem.setState( ( 0.0 == getMediaTime() ) ? MEDIASTATE_STOP : MEDIASTATE_PAUSE );
+        rItem.setState( ( 0.0 == getMediaTime() ) ? MediaState::Stop : MediaState::Pause );
 
     rItem.setDuration( getDuration() );
     rItem.setTime( getMediaTime() );
@@ -370,21 +370,21 @@ void MediaWindowImpl::executeMediaItem( const MediaItem& rItem )
     {
         switch (rItem.getState())
         {
-            case MEDIASTATE_PLAY:
+            case MediaState::Play:
             {
                 if (!isPlaying())
                     start();
             }
             break;
 
-            case MEDIASTATE_PAUSE:
+            case MediaState::Pause:
             {
                 if (isPlaying())
                     stop();
             }
             break;
 
-            case MEDIASTATE_STOP:
+            case MediaState::Stop:
             {
                 if (isPlaying())
                 {

include/avmedia/mediaitem.hxx

@@ -29,6 +29,8 @@
 #include <memory>
 #include <o3tl/typed_flags_set.hxx>
 
+class SvStream;
+
 enum class AVMediaSetMask
 {
     NONE        = 0x000,
@@ -48,26 +50,17 @@ namespace o3tl
     template<> struct typed_flags<AVMediaSetMask> : is_typed_flags<AVMediaSetMask, 0x1ff> {};
 }
 
-class SvStream;
 
 namespace avmedia
 {
 
 
-// - MediaState -
-
-
-enum MediaState
+enum class MediaState
 {
-    MEDIASTATE_STOP = 0,
-    MEDIASTATE_PLAY = 1,
-    MEDIASTATE_PAUSE = 2
+    Stop, Play, Pause
 };
 
 
-// - MediaItem -
-
-
 class AVMEDIA_DLLPUBLIC MediaItem : public SfxPoolItem
 {
 public:
@@ -80,13 +73,13 @@ public:
 
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
-    virtual bool GetPresentation( SfxItemPresentation ePres,
+    virtual bool            GetPresentation( SfxItemPresentation ePres,
                                                  SfxMapUnit eCoreUnit,
                                                  SfxMapUnit ePresUnit,
                                                  OUString&  rText,
                                                  const IntlWrapper *pIntl ) const SAL_OVERRIDE;
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+    virtual bool            QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+    virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
 
     void                    merge( const MediaItem& rMediaItem );
 
@@ -110,19 +103,19 @@ public:
     void                    setVolumeDB( sal_Int16 nDB );
     sal_Int16               getVolumeDB() const;
 
-    void                    setZoom( ::com::sun::star::media::ZoomLevel eZoom );
-    ::com::sun::star::media::ZoomLevel  getZoom() const;
+    void                    setZoom( ::css::media::ZoomLevel eZoom );
+    ::css::media::ZoomLevel getZoom() const;
 
     void                    setURL( const OUString& rURL,
                                     const OUString& rTempURL,
                                     const OUString& rReferer);
-    const OUString&  getURL() const;
+    const OUString&         getURL() const;
 
     void                    setMimeType( const OUString& rMimeType );
     OUString                getMimeType() const;
-    const OUString&  getTempURL() const;
+    const OUString&         getTempURL() const;
 
-    const OUString&  getReferer() const;
+    const OUString&         getReferer() const;
 
 private:
 
@@ -133,15 +126,14 @@ private:
 typedef ::avmedia::MediaItem avmedia_MediaItem;
 
 bool AVMEDIA_DLLPUBLIC EmbedMedia(
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>
-            const& xModel,
-        OUString const& rSourceURL,
+        const ::css::uno::Reference< ::css::frame::XModel>& xModel,
+        const OUString& rSourceURL,
         OUString & o_rEmbeddedURL);
 
 OUString GetFilename(OUString const& rSourceURL);
 
-::com::sun::star::uno::Reference< ::com::sun::star::io::XStream> CreateStream(
-    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage> const& xStorage, OUString const& rFilename);
+::css::uno::Reference< ::css::io::XStream> CreateStream(
+    const ::css::uno::Reference< ::css::embed::XStorage>& xStorage, const OUString& rFilename);
 }
 
 #endif

svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx

@@ -97,7 +97,7 @@ void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rIte
         mpMediaWindow->updateMediaItem( rItem );
 
         // show/hide is now dependent of play state
-        if(avmedia::MEDIASTATE_STOP == rItem.getState())
+        if(avmedia::MediaState::Stop == rItem.getState())
         {
             mpMediaWindow->hide();
         }