diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 09:27:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 12:49:02 +0200 |
| commit | 50151db9f740afee7f11a10cc5c61b437bf87caf (patch) | |
| tree | b41921d86a46931bc06457172994fb3a7dabe92b /avmedia | |
| parent | bfde4866e07746eafa2f0d6173c29d805cc35ad0 (diff) | |
convert FSysStyle to o3tl::typed_flags
Change-Id: I58a63a0e6f619442f21827064644ecd8ca57b8ff
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/modeltools.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/opengl/oglplayer.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx index 9aacfc3b6015..d2d5380af9cd 100644 --- a/avmedia/source/framework/modeltools.cxx +++ b/avmedia/source/framework/modeltools.cxx @@ -164,7 +164,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, const uno::Reference< // Convert URL to a file path for loading const INetURLObject aURLObj(sTempFileURL); - std::string sUrl = OUStringToOString( aURLObj.getFSysPath(INetURLObject::FSYS_DETECT), RTL_TEXTENCODING_UTF8 ).getStr(); + std::string sUrl = OUStringToOString( aURLObj.getFSysPath(FSysStyle::Detect), RTL_TEXTENCODING_UTF8 ).getStr(); // Parse json, read externals' URI and modify this relative URI's so they remain valid in the new context. std::vector<std::string> vExternals; diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 50fdf4c2a1be..bfc25d40b0fb 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -71,7 +71,7 @@ bool OGLPlayer::create( const OUString& rURL ) // Convert URL to a system path const INetURLObject aURLObj(m_sURL); - const std::string sFilePath = OUStringToOString( aURLObj.getFSysPath(INetURLObject::FSYS_DETECT), RTL_TEXTENCODING_UTF8 ).getStr(); + const std::string sFilePath = OUStringToOString( aURLObj.getFSysPath(FSysStyle::Detect), RTL_TEXTENCODING_UTF8 ).getStr(); // Load *.json file and init renderer m_pHandle = gltf_renderer_init(sFilePath, m_vInputFiles); |