diff options
author | 2016-03-18 22:41:17 +0100 | |
---|---|---|
committer | 2016-03-18 22:41:17 +0100 | |
commit | e39daaf5bdcf21d64abf239e1133963643dc6df1 (patch) | |
tree | 1f1b5f333e84bf056ce82c27bebdbad933f26c0d /src/emu/fileio.h | |
parent | 421656e108e7091ee9e1b14c84f0a3f6efc2ad2e (diff) | |
parent | b79020559ea3617b2d6bd4c92041d314045e2938 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Diffstat (limited to 'src/emu/fileio.h')
-rw-r--r-- | src/emu/fileio.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/emu/fileio.h b/src/emu/fileio.h index c54c740d686..a29372f071d 100644 --- a/src/emu/fileio.h +++ b/src/emu/fileio.h @@ -15,7 +15,6 @@ #include "corefile.h" #include "hash.h" -#include "unzip.h" // some systems use macros for getc/putc rather than functions #ifdef getc @@ -27,7 +26,7 @@ //************************************************************************** // forward declarations -class _7z_file; +namespace util { class archive_file; } // ======================> path_iterator @@ -146,12 +145,8 @@ private: // internal helpers osd_file::error attempt_zipped(); - osd_file::error load_zipped_file(); - bool zip_filename_match(const zip_file::file_header &header, const std::string &filename); - bool zip_header_is_path(const zip_file::file_header &header); - osd_file::error attempt__7zped(); - osd_file::error load__7zped_file(); + osd_file::error load_zipped_file(); // internal state std::string m_filename; // original filename provided @@ -163,14 +158,10 @@ private: UINT32 m_openflags; // flags we used for the open hash_collection m_hashes; // collection of hashes - zip_file::ptr m_zipfile; // ZIP file pointer + std::unique_ptr<util::archive_file> m_zipfile; // ZIP file pointer dynamic_buffer m_zipdata; // ZIP file data UINT64 m_ziplength; // ZIP file length - std::unique_ptr<_7z_file> m__7zfile; // 7Z file pointer - dynamic_buffer m__7zdata; // 7Z file data - UINT64 m__7zlength; // 7Z file length - bool m_remove_on_close; // flag: remove the file when closing bool m_restrict_to_mediapath; // flag: restrict to paths inside the media-path }; |