summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/fileio.h
diff options
context:
space:
mode:
author Brad Hughes <bradhugh@outlook.com>2016-03-18 13:38:01 -0400
committer Brad Hughes <bradhugh@outlook.com>2016-03-18 13:38:01 -0400
commitce5bd9a3d22e5200c4566e98f0cfb0877c2892c0 (patch)
tree01a8bacfae3f19293b01f83a13c3413ba2de53d6 /src/emu/fileio.h
parent603d5509df7e3d0455d048ab5ec71397183ac44c (diff)
parent708614a9d0508feb6044ebe4f03930147a817199 (diff)
Merge branch 'master' of https://github.com/mamedev/mame.git
Diffstat (limited to 'src/emu/fileio.h')
-rw-r--r--src/emu/fileio.h15
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
};