diff options
| author | vng <viktor.govako@gmail.com> | 2014-11-06 18:56:37 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:32:27 +0300 |
| commit | a41ef3827cebe7cba0ab1b4cefa2475cf528ae92 (patch) | |
| tree | a142ff6de2b7eaaf83ebd408c4c367415aeb2186 /platform/platform.hpp | |
| parent | f11866738a7443635a0b8ab6a39470d370a352ff (diff) | |
[android] Better logic in Platform::GetReader() according to different markets.
Diffstat (limited to 'platform/platform.hpp')
| -rw-r--r-- | platform/platform.hpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/platform/platform.hpp b/platform/platform.hpp index ca246994ec..0fd612f229 100644 --- a/platform/platform.hpp +++ b/platform/platform.hpp @@ -43,10 +43,13 @@ protected: /// Extended resource files. /// Used in Android only (downloaded zip files as a container). vector<string> m_extResFiles; + /// Default search scope for resource files. + /// Used in Android only and initialized according to the market type (Play, Amazon, Samsung). + string m_androidDefResScope; /// Internal function to get full path for input file. - /// Uses m_writeableDir and m_resourcesDir. - string ReadPathForFile(string const & file, string const & searchScope) const; + /// Uses m_writeableDir [w], m_resourcesDir [r], m_settingsDir [s]. + string ReadPathForFile(string const & file, string searchScope = string()) const; /// Hash some unique string into uniform format. static string HashUniqueID(string const & s); @@ -78,9 +81,9 @@ public: /// @return reader for file decriptor. /// @throws FileAbsentException /// @param[in] file name or full path which we want to read, don't forget to free memory or wrap it to ReaderPtr - /// @param[in] searchScope looks for file in dirs in given order: [w]ritable, [r]esources, by [f]ull path - /// @TODO add [e]xternal resource scope for Android (obb support) - ModelReader * GetReader(string const & file, string const & searchScope = "wrf") const; + /// @param[in] searchScope looks for file in dirs in given order: \n + /// [w]ritable, [r]esources, [s]ettings, by [f]ull path, [e]xternal resources, + ModelReader * GetReader(string const & file, string const & searchScope = string()) const; /// @name File operations //@{ |