From e8bbea1fc6e94e14768509d322f6c624403ffb36 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 22 Aug 2021 09:06:15 +1000 Subject: formats, osd, util: Started refactoring file I/O stuff. (#8456) Added more modern generic I/O interfaces with implementation backed by stdio, osd_file and core_file, replacing io_generic. Also replaced core_file's build-in zlib compression with a filter. unzip.cpp, un7z.cpp: Added option to supply abstract I/O interface rather than filename. Converted osd_file, core_file, archive_file, chd_file and device_image_interface to use std::error_condition rather than their own error enums. Allow mounting TI-99 RPK from inside archives. --- src/lib/util/cdrom.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/lib/util/cdrom.h') diff --git a/src/lib/util/cdrom.h b/src/lib/util/cdrom.h index 27d41da845e..1847a1db83a 100644 --- a/src/lib/util/cdrom.h +++ b/src/lib/util/cdrom.h @@ -7,15 +7,15 @@ Generic MAME cd-rom implementation ***************************************************************************/ - -#ifndef MAME_UTIL_CDROM_H -#define MAME_UTIL_CDROM_H +#ifndef MAME_LIB_UTIL_CDROM_H +#define MAME_LIB_UTIL_CDROM_H #pragma once -#include "osdcore.h" #include "chd.h" +#include "osdcore.h" + /*************************************************************************** @@ -137,8 +137,8 @@ void cdrom_convert_subtype_string_to_track_info(const char *typestring, cdrom_tr void cdrom_convert_subtype_string_to_pregap_info(const char *typestring, cdrom_track_info *info); const char *cdrom_get_type_string(uint32_t trktype); const char *cdrom_get_subtype_string(uint32_t subtype); -chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc); -chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc); +std::error_condition cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc); +std::error_condition cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc); // ECC utilities bool ecc_verify(const uint8_t *sector); @@ -184,4 +184,4 @@ static inline uint32_t lba_to_msf_alt(int lba) return ret; } -#endif // MAME_UTIL_CDROM_H +#endif // MAME_LIB_UTIL_CDROM_H -- cgit v1.2.3-70-g09d2