diff options
author | Noel Grandin <noel@peralex.com> | 2015-06-01 15:47:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-06-04 08:30:23 +0200 |
commit | 52e4ba4b98fdee1f0624e7195927725171984096 (patch) | |
tree | 24f0f69012fb502d759d1868c234fcde17adbec5 /avmedia/source/framework | |
parent | 758916a88d6dfbabc31b8430b1cc605cb2c1e890 (diff) |
convert MediaState to scoped enum
Change-Id: Idf14f7d344be6c690cdd721cd5f7eb7c328b590c
Diffstat (limited to 'avmedia/source/framework')
-rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 10 | ||||
-rw-r--r-- | avmedia/source/framework/mediaitem.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 4a33e599a969..0338135f769a 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/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; diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index bf85b48b7b70..91fb5d0eea7f 100644 --- a/avmedia/source/framework/mediaitem.cxx +++ b/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 ) |