diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 08:47:18 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:07:53 -0500 |
| commit | 3c4333c24882d6699b65d109f2cfbf7daf3122c6 (patch) | |
| tree | 739dacdd38ddd2053aaa3ad7f0ffc053eb515d52 /avmedia | |
| parent | 6b631a02d36aa09f7c06793e8b4482d3b67ab258 (diff) | |
convert DecodeMechanism to scoped enum
(cherry picked from commit bfde4866e07746eafa2f0d6173c29d805cc35ad0)
(cherry picked from commit 3de922d4a695e253d4ca2d42b70e0b35b52e9b7c)
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/gstreamer/gstmanager.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/macavf/manager.mm | 2 | ||||
| -rw-r--r-- | avmedia/source/quicktime/manager.mm | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/win/manager.cxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx index d12a66e34f88..f064cb13a388 100644 --- a/avmedia/source/gstreamer/gstmanager.cxx +++ b/avmedia/source/gstreamer/gstmanager.cxx @@ -46,7 +46,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& uno::Reference< media::XPlayer > xRet( pPlayer ); const INetURLObject aURL( rURL ); - if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) ) + if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ) ) ) xRet.clear(); return xRet; diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm index 1283cb54101e..a8ff2ec2928d 100644 --- a/avmedia/source/macavf/manager.mm +++ b/avmedia/source/macavf/manager.mm @@ -46,7 +46,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU OSL_TRACE( "avmediamacavf: Manager::createPlayer" ); - if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) ) + if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ) ) ) xRet.clear(); return xRet; diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm index 0b2ac8ded0e5..bcb27b6d4073 100644 --- a/avmedia/source/quicktime/manager.mm +++ b/avmedia/source/quicktime/manager.mm @@ -47,7 +47,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU SAL_INFO( "avmedia.quicktime", "Manager::createPlayer" ); - if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) ) + if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ) ) ) xRet.clear(); return xRet; diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 9ae9070190b9..312bf09b868d 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -276,7 +276,7 @@ bool MediaWindow::executeMediaURLDialog(vcl::Window*, if( aDlg.Execute() == ERRCODE_NONE ) { const INetURLObject aURL( aDlg.GetPath() ); - rURL = aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); + rURL = aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ); if (o_pbLink) { @@ -317,7 +317,7 @@ bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bo try { uno::Reference< media::XPlayer > xPlayer( priv::MediaWindowImpl::createPlayer( - aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ), + aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), rReferer, nullptr ) ); if( xPlayer.is() ) diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index d0028011c53a..5566251e9f48 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -285,7 +285,7 @@ void MediaWindowImpl::setURL( const OUString& rURL, INetURLObject aURL( rURL ); if (aURL.GetProtocol() != INetProtocol::NotValid) - maFileURL = aURL.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS); + maFileURL = aURL.GetMainURL(INetURLObject::DecodeMechanism::Unambiguous); else maFileURL = rURL; } diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx index b829190f6622..c024f7ff19a7 100644 --- a/avmedia/source/win/manager.cxx +++ b/avmedia/source/win/manager.cxx @@ -48,7 +48,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& uno::Reference< media::XPlayer > xRet( pPlayer ); const INetURLObject aURL( rURL ); - if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) ) + if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ) ) ) xRet.clear(); return xRet; |