diff options
author | 2022-01-30 15:58:19 -0500 | |
---|---|---|
committer | 2022-01-30 15:58:19 -0500 | |
commit | 8a4ebb5dbc42812aa6474910179f5ef0a386797c (patch) | |
tree | ef86a627c6771af9550e76c293bbdf5b555f154c | |
parent | fa321cc7cee09715d096e6a427ef4b1cb096732f (diff) |
frontend: Use util::core_file instead of emu_file where applicable
-rw-r--r-- | src/frontend/mame/cheat.cpp | 12 | ||||
-rw-r--r-- | src/frontend/mame/cheat.h | 10 | ||||
-rw-r--r-- | src/frontend/mame/ui/inifile.cpp | 8 | ||||
-rw-r--r-- | src/frontend/mame/ui/inifile.h | 2 | ||||
-rw-r--r-- | src/frontend/mame/ui/selgame.cpp | 9 | ||||
-rw-r--r-- | src/frontend/mame/ui/utils.cpp | 90 | ||||
-rw-r--r-- | src/frontend/mame/ui/utils.h | 16 |
7 files changed, 74 insertions, 73 deletions
diff --git a/src/frontend/mame/cheat.cpp b/src/frontend/mame/cheat.cpp index dbbd0ed78bc..1e6d7aaffbd 100644 --- a/src/frontend/mame/cheat.cpp +++ b/src/frontend/mame/cheat.cpp @@ -204,7 +204,7 @@ const char *cheat_parameter::text() // save - save a single cheat parameter //------------------------------------------------- -void cheat_parameter::save(emu_file &cheatfile) const +void cheat_parameter::save(util::core_file &cheatfile) const { // output the parameter tag cheatfile.printf("\t\t<parameter"); @@ -367,7 +367,7 @@ void cheat_script::execute(cheat_manager &manager, uint64_t &argindex) // save - save a single cheat script //------------------------------------------------- -void cheat_script::save(emu_file &cheatfile) const +void cheat_script::save(util::core_file &cheatfile) const { // output the script tag cheatfile.printf("\t\t<script"); @@ -531,7 +531,7 @@ void cheat_script::script_entry::execute(cheat_manager &manager, uint64_t &argin // save - save a single action or output //------------------------------------------------- -void cheat_script::script_entry::save(emu_file &cheatfile) const +void cheat_script::script_entry::save(util::core_file &cheatfile) const { if (m_format.empty()) { @@ -544,7 +544,7 @@ void cheat_script::script_entry::save(emu_file &cheatfile) const else { // output an output - cheatfile.printf("\t\t\t<output format=\"%s\"", m_format.c_str()); + cheatfile.printf("\t\t\t<output format=\"%s\"", m_format); if (!m_condition.is_empty()) cheatfile.printf(" condition=\"%s\"", cheat_manager::quote_expression(m_condition)); @@ -662,7 +662,7 @@ int cheat_script::script_entry::output_argument::values(uint64_t &argindex, uint // save - save a single output argument //------------------------------------------------- -void cheat_script::script_entry::output_argument::save(emu_file &cheatfile) const +void cheat_script::script_entry::output_argument::save(util::core_file &cheatfile) const { cheatfile.printf("\t\t\t\t<argument"); if (m_count != 1) @@ -762,7 +762,7 @@ cheat_entry::~cheat_entry() // save - save a single cheat entry //------------------------------------------------- -void cheat_entry::save(emu_file &cheatfile) const +void cheat_entry::save(util::core_file &cheatfile) const { // determine if we have scripts bool const has_scripts(m_off_script || m_on_script || m_run_script || m_change_script); diff --git a/src/frontend/mame/cheat.h b/src/frontend/mame/cheat.h index b8f3e89a4e5..820cd8dcd7f 100644 --- a/src/frontend/mame/cheat.h +++ b/src/frontend/mame/cheat.h @@ -102,7 +102,7 @@ public: bool set_next_state(); // actions - void save(emu_file &cheatfile) const; + void save(util::core_file &cheatfile) const; private: // a single item in a parameter item list @@ -160,7 +160,7 @@ public: // actions void execute(cheat_manager &manager, uint64_t &argindex); - void save(emu_file &cheatfile) const; + void save(util::core_file &cheatfile) const; private: // an entry within the script @@ -177,7 +177,7 @@ private: // actions void execute(cheat_manager &manager, uint64_t &argindex); - void save(emu_file &cheatfile) const; + void save(util::core_file &cheatfile) const; private: // an argument for output @@ -196,7 +196,7 @@ private: int values(uint64_t &argindex, uint64_t *result); // actions - void save(emu_file &cheatfile) const; + void save(util::core_file &cheatfile) const; private: // internal state @@ -267,7 +267,7 @@ public: bool select_default_state(); bool select_previous_state(); bool select_next_state(); - void save(emu_file &cheatfile) const; + void save(util::core_file &cheatfile) const; // UI helpers void menu_text(std::string &description, std::string &state, uint32_t &flags); diff --git a/src/frontend/mame/ui/inifile.cpp b/src/frontend/mame/ui/inifile.cpp index 87cdd9329b1..07d9dd85b62 100644 --- a/src/frontend/mame/ui/inifile.cpp +++ b/src/frontend/mame/ui/inifile.cpp @@ -97,7 +97,7 @@ void inifile_manager::load_ini_category(size_t file, size_t category, std::unord // initialize category //------------------------------------------------- -void inifile_manager::init_category(std::string &&filename, emu_file &file) +void inifile_manager::init_category(std::string &&filename, util::core_file &file) { categoryindex index; char rbuf[MAX_CHAR_INFO]; @@ -110,7 +110,11 @@ void inifile_manager::init_category(std::string &&filename, emu_file &file) auto const tail(std::find_if(head, std::end(rbuf), [] (char ch) { return !ch || (']' == ch); })); name.assign(head, tail); if ("FOLDER_SETTINGS" != name) - index.emplace_back(std::move(name), file.tell()); + { + u64 result; + if (!file.tell(result)) + index.emplace_back(std::move(name), result); + } } } std::stable_sort(index.begin(), index.end(), [] (auto const &x, auto const &y) { return 0 > core_stricmp(x.first.c_str(), y.first.c_str()); }); diff --git a/src/frontend/mame/ui/inifile.h b/src/frontend/mame/ui/inifile.h index 68adca3c917..68abaac566a 100644 --- a/src/frontend/mame/ui/inifile.h +++ b/src/frontend/mame/ui/inifile.h @@ -46,7 +46,7 @@ private: // ini file structure using categoryindex = std::vector<std::pair<std::string, int64_t>>; - void init_category(std::string &&filename, emu_file &file); + void init_category(std::string &&filename, util::core_file &file); // internal state ui_options &m_options; diff --git a/src/frontend/mame/ui/selgame.cpp b/src/frontend/mame/ui/selgame.cpp index d52274a6cb9..77fcefd208e 100644 --- a/src/frontend/mame/ui/selgame.cpp +++ b/src/frontend/mame/ui/selgame.cpp @@ -93,12 +93,9 @@ menu_select_game::menu_select_game(mame_ui_manager &mui, render_container &conta fake_ini = util::string_format(u8"\uFEFF%s = %s\n", tmp, sub_filter); } - emu_file file(ui().options().ui_path(), OPEN_FLAG_READ); - if (!file.open_ram(fake_ini.c_str(), fake_ini.size())) - { - m_persistent_data.filter_data().load_ini(file); - file.close(); - } + util::core_file::ptr file; + if (!util::core_file::open_ram(fake_ini.c_str(), fake_ini.size(), OPEN_FLAG_READ, file)) + m_persistent_data.filter_data().load_ini(*file); } // do this after processing the last used filter setting so it overwrites the placeholder diff --git a/src/frontend/mame/ui/utils.cpp b/src/frontend/mame/ui/utils.cpp index 27a27b45678..60fc8598823 100644 --- a/src/frontend/mame/ui/utils.cpp +++ b/src/frontend/mame/ui/utils.cpp @@ -165,7 +165,7 @@ public: virtual bool adjust_left() override { return false; } virtual bool adjust_right() override { return false; } - virtual void save_ini(emu_file &file, unsigned indent) const override + virtual void save_ini(util::core_file &file, unsigned indent) const override { file.puts(util::string_format("%2$*1$s%3$s = 1\n", 2 * indent, "", config_name())); } @@ -243,7 +243,7 @@ public: return true; } - virtual void save_ini(emu_file &file, unsigned indent) const override + virtual void save_ini(util::core_file &file, unsigned indent) const override { char const *const text(filter_text()); file.puts(util::string_format("%2$*1$s%3$s = %4$s\n", 2 * indent, "", this->config_name(), text ? text : "")); @@ -290,7 +290,7 @@ public: virtual bool wants_adjuster() const override { return true; } virtual char const *adjust_text() const override { return _("<set up filters>"); } - virtual void save_ini(emu_file &file, unsigned indent) const override + virtual void save_ini(util::core_file &file, unsigned indent) const override { auto const tail(std::find_if(std::begin(m_filters), std::end(m_filters), [] (typename Base::ptr const &flt) { return !flt; })); file.puts(util::string_format("%2$*1$s%3$s = %4$d\n", 2 * indent, "", this->config_name(), std::distance(std::begin(m_filters), tail))); @@ -346,7 +346,7 @@ public: protected: composite_filter_impl_base() { } - void populate(char const *value, emu_file *file, unsigned indent) + void populate(char const *value, util::core_file *file, unsigned indent) { // try to load filters from a file if (value && file) @@ -683,7 +683,7 @@ template <machine_filter::type Type = machine_filter::AVAILABLE> class available_machine_filter_impl : public simple_filter_impl_base<machine_filter, Type> { public: - available_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + available_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { return system.available; } }; @@ -693,7 +693,7 @@ template <machine_filter::type Type = machine_filter::WORKING> class working_machine_filter_impl : public simple_filter_impl_base<machine_filter, Type> { public: - working_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + working_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { return !(system.driver->flags & machine_flags::NOT_WORKING); } }; @@ -703,7 +703,7 @@ template <machine_filter::type Type = machine_filter::MECHANICAL> class mechanical_machine_filter_impl : public simple_filter_impl_base<machine_filter, Type> { public: - mechanical_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + mechanical_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { return system.driver->flags & machine_flags::MECHANICAL; } }; @@ -713,7 +713,7 @@ template <machine_filter::type Type = machine_filter::BIOS> class bios_machine_filter_impl : public simple_filter_impl_base<machine_filter, Type> { public: - bios_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + bios_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { return system.driver->flags & machine_flags::IS_BIOS_ROOT; } }; @@ -723,7 +723,7 @@ template <machine_filter::type Type = machine_filter::PARENTS> class parents_machine_filter_impl : public simple_filter_impl_base<machine_filter, Type> { public: - parents_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + parents_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { @@ -738,7 +738,7 @@ template <machine_filter::type Type = machine_filter::CHD> class chd_machine_filter_impl : public simple_filter_impl_base<machine_filter, Type> { public: - chd_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + chd_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { @@ -756,7 +756,7 @@ template <machine_filter::type Type = machine_filter::SAVE> class save_machine_filter_impl : public simple_filter_impl_base<machine_filter, Type> { public: - save_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + save_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { return system.driver->flags & machine_flags::SUPPORTS_SAVE; } }; @@ -766,7 +766,7 @@ template <machine_filter::type Type = machine_filter::VERTICAL> class vertical_machine_filter_impl : public simple_filter_impl_base<machine_filter, Type> { public: - vertical_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + vertical_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { return system.driver->flags & machine_flags::SWAP_XY; } }; @@ -780,7 +780,7 @@ public: class manufacturer_machine_filter : public choice_filter_impl_base<machine_filter, machine_filter::MANUFACTURER> { public: - manufacturer_machine_filter(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) + manufacturer_machine_filter(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : choice_filter_impl_base<machine_filter, machine_filter::MANUFACTURER>(data.manufacturers(), value) { } @@ -801,7 +801,7 @@ public: class year_machine_filter : public choice_filter_impl_base<machine_filter, machine_filter::YEAR> { public: - year_machine_filter(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) + year_machine_filter(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : choice_filter_impl_base<machine_filter, machine_filter::YEAR>(data.years(), value) { } @@ -819,7 +819,7 @@ template <template <machine_filter::type T> class Base, machine_filter::type Typ class inverted_machine_filter : public Base<Type> { public: - inverted_machine_filter(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) + inverted_machine_filter(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : Base<Type>(data, value, file, indent) { } @@ -855,7 +855,7 @@ template <machine_filter::type Type> class inclusive_machine_filter_impl : public simple_filter_impl_base<machine_filter, Type> { public: - inclusive_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + inclusive_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { return true; } }; @@ -872,7 +872,7 @@ using favorite_machine_filter = inclusive_machine_filter_impl<machine_filt class category_machine_filter : public simple_filter_impl_base<machine_filter, machine_filter::CATEGORY> { public: - category_machine_filter(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) + category_machine_filter(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : m_ini(0) , m_group(0) , m_include_clones(false) @@ -926,7 +926,7 @@ public: virtual bool wants_adjuster() const override { return mame_machine_manager::instance()->inifile().get_file_count(); } virtual char const *adjust_text() const override { return m_adjust_text.c_str(); } - virtual void save_ini(emu_file &file, unsigned indent) const override + virtual void save_ini(util::core_file &file, unsigned indent) const override { char const *const text(filter_text()); file.puts(util::string_format("%2$*1$s%3$s = %4$s\n", 2 * indent, "", this->config_name(), text ? text : "")); @@ -1202,7 +1202,7 @@ void category_machine_filter::menu_configure::handle(event const *ev) class custom_machine_filter : public composite_filter_impl_base<custom_machine_filter, machine_filter, machine_filter::CUSTOM> { public: - custom_machine_filter(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) + custom_machine_filter(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : composite_filter_impl_base<custom_machine_filter, machine_filter, machine_filter::CUSTOM>() , m_data(data) { @@ -1210,7 +1210,7 @@ public: } ptr create(type n) const { return machine_filter::create(n, m_data); } - ptr create(emu_file &file, unsigned indent) const { return machine_filter::create(file, m_data, indent); } + ptr create(util::core_file &file, unsigned indent) const { return machine_filter::create(file, m_data, indent); } static bool type_allowed(unsigned pos, type n) { @@ -1268,7 +1268,7 @@ private: class all_software_filter : public simple_filter_impl_base<software_filter, software_filter::ALL> { public: - all_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + all_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_software_info const &info) const override { return true; } }; @@ -1277,7 +1277,7 @@ public: class available_software_filter : public simple_filter_impl_base<software_filter, software_filter::AVAILABLE> { public: - available_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + available_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_software_info const &info) const override { return info.available; } }; @@ -1286,7 +1286,7 @@ public: class unavailable_software_filter : public simple_filter_impl_base<software_filter, software_filter::UNAVAILABLE> { public: - unavailable_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + unavailable_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_software_info const &info) const override { return !info.available; } }; @@ -1295,7 +1295,7 @@ public: class favorite_software_filter : public simple_filter_impl_base<software_filter, software_filter::FAVORITE> { public: - favorite_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) + favorite_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : m_manager(mame_machine_manager::instance()->favorite()) { } @@ -1310,7 +1310,7 @@ private: class parents_software_filter : public simple_filter_impl_base<software_filter, software_filter::PARENTS> { public: - parents_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + parents_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_software_info const &info) const override { return info.parentname.empty(); } }; @@ -1319,7 +1319,7 @@ public: class clones_software_filter : public simple_filter_impl_base<software_filter, software_filter::CLONES> { public: - clones_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + clones_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_software_info const &info) const override { return !info.parentname.empty(); } }; @@ -1328,7 +1328,7 @@ public: class years_software_filter : public choice_filter_impl_base<software_filter, software_filter::YEAR> { public: - years_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) + years_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : choice_filter_impl_base<software_filter, software_filter::YEAR>(data.years(), value) { } @@ -1340,7 +1340,7 @@ public: class publishers_software_filter : public choice_filter_impl_base<software_filter, software_filter::PUBLISHERS> { public: - publishers_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) + publishers_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : choice_filter_impl_base<software_filter, software_filter::PUBLISHERS>(data.publishers(), value) { } @@ -1361,7 +1361,7 @@ public: class supported_software_filter : public simple_filter_impl_base<software_filter, software_filter::SUPPORTED> { public: - supported_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + supported_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_software_info const &info) const override { return software_support::SUPPORTED == info.supported; } }; @@ -1371,7 +1371,7 @@ public: class partial_supported_software_filter : public simple_filter_impl_base<software_filter, software_filter::PARTIAL_SUPPORTED> { public: - partial_supported_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + partial_supported_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_software_info const &info) const override { return software_support::PARTIALLY_SUPPORTED == info.supported; } }; @@ -1380,7 +1380,7 @@ public: class unsupported_software_filter : public simple_filter_impl_base<software_filter, software_filter::UNSUPPORTED> { public: - unsupported_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + unsupported_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_software_info const &info) const override { return software_support::UNSUPPORTED == info.supported; } }; @@ -1389,7 +1389,7 @@ public: class region_software_filter : public choice_filter_impl_base<software_filter, software_filter::REGION> { public: - region_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) + region_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : choice_filter_impl_base<software_filter, software_filter::REGION>(data.regions(), value) { } @@ -1410,7 +1410,7 @@ public: class device_type_software_filter : public choice_filter_impl_base<software_filter, software_filter::DEVICE_TYPE> { public: - device_type_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) + device_type_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : choice_filter_impl_base<software_filter, software_filter::DEVICE_TYPE>(data.device_types(), value) { } @@ -1422,7 +1422,7 @@ public: class list_software_filter : public choice_filter_impl_base<software_filter, software_filter::LIST> { public: - list_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) + list_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : choice_filter_impl_base<software_filter, software_filter::LIST>(data.list_descriptions(), value) , m_data(data) { @@ -1488,7 +1488,7 @@ private: class developer_software_filter : public software_info_filter_base<software_filter::DEVELOPERS> { public: - developer_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) + developer_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : software_info_filter_base<software_filter::DEVELOPERS>("developer", data.developers(), value) { } @@ -1498,7 +1498,7 @@ public: class distributor_software_filter : public software_info_filter_base<software_filter::DISTRIBUTORS> { public: - distributor_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) + distributor_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : software_info_filter_base<software_filter::DISTRIBUTORS>("distributor", data.distributors(), value) { } @@ -1508,7 +1508,7 @@ public: class author_software_filter : public software_info_filter_base<software_filter::AUTHORS> { public: - author_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) + author_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : software_info_filter_base<software_filter::AUTHORS>("author", data.authors(), value) { } @@ -1518,7 +1518,7 @@ public: class programmer_software_filter : public software_info_filter_base<software_filter::PROGRAMMERS> { public: - programmer_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) + programmer_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : software_info_filter_base<software_filter::PROGRAMMERS>("programmer", data.programmers(), value) { } @@ -1533,7 +1533,7 @@ public: class custom_software_filter : public composite_filter_impl_base<custom_software_filter, software_filter, software_filter::CUSTOM> { public: - custom_software_filter(software_filter_data const &data, char const *value, emu_file *file, unsigned indent) + custom_software_filter(software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : composite_filter_impl_base<custom_software_filter, software_filter, software_filter::CUSTOM>() , m_data(data) { @@ -1541,7 +1541,7 @@ public: } ptr create(type n) const { return software_filter::create(n, m_data); } - ptr create(emu_file &file, unsigned indent) const { return software_filter::create(file, m_data, indent); } + ptr create(util::core_file &file, unsigned indent) const { return software_filter::create(file, m_data, indent); } static bool type_allowed(unsigned pos, type n) { @@ -1662,7 +1662,7 @@ std::string machine_filter_data::get_config_string() const } } -bool machine_filter_data::load_ini(emu_file &file) +bool machine_filter_data::load_ini(util::core_file &file) { machine_filter::ptr flt(machine_filter::create(file, *this)); if (flt) @@ -1761,7 +1761,7 @@ std::string software_filter_data::extract_publisher(std::string const &publisher // public machine filter interface //------------------------------------------------- -machine_filter::ptr machine_filter::create(type n, machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) +machine_filter::ptr machine_filter::create(type n, machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { assert(COUNT > n); switch (n) @@ -1816,7 +1816,7 @@ machine_filter::ptr machine_filter::create(type n, machine_filter_data const &da return nullptr; } -machine_filter::ptr machine_filter::create(emu_file &file, machine_filter_data const &data, unsigned indent) +machine_filter::ptr machine_filter::create(util::core_file &file, machine_filter_data const &data, unsigned indent) { char buffer[MAX_CHAR_INFO]; if (!file.gets(buffer, std::size(buffer))) @@ -1883,7 +1883,7 @@ software_filter::software_filter() { } -software_filter::ptr software_filter::create(type n, software_filter_data const &data, char const *value, emu_file *file, unsigned indent) +software_filter::ptr software_filter::create(type n, software_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { assert(COUNT > n); switch (n) @@ -1932,7 +1932,7 @@ software_filter::ptr software_filter::create(type n, software_filter_data const return nullptr; } -software_filter::ptr software_filter::create(emu_file &file, software_filter_data const &data, unsigned indent) +software_filter::ptr software_filter::create(util::core_file &file, software_filter_data const &data, unsigned indent) { char buffer[MAX_CHAR_INFO]; if (!file.gets(buffer, std::size(buffer))) diff --git a/src/frontend/mame/ui/utils.h b/src/frontend/mame/ui/utils.h index 415a5e6065e..098588086f2 100644 --- a/src/frontend/mame/ui/utils.h +++ b/src/frontend/mame/ui/utils.h @@ -144,7 +144,7 @@ public: virtual bool adjust_left() = 0; virtual bool adjust_right() = 0; - virtual void save_ini(emu_file &file, unsigned indent) const = 0; + virtual void save_ini(util::core_file &file, unsigned indent) const = 0; template <typename InputIt, class OutputIt> void apply(InputIt first, InputIt last, OutputIt dest) const @@ -198,7 +198,7 @@ public: virtual std::string adorned_display_name(type n) const = 0; static ptr create(type n, machine_filter_data const &data) { return create(n, data, nullptr, nullptr, 0); } - static ptr create(emu_file &file, machine_filter_data const &data) { return create(file, data, 0); } + static ptr create(util::core_file &file, machine_filter_data const &data) { return create(file, data, 0); } static char const *config_name(type n); static char const *display_name(type n); @@ -208,8 +208,8 @@ public: protected: machine_filter(); - static ptr create(type n, machine_filter_data const &data, char const *value, emu_file *file, unsigned indent); - static ptr create(emu_file &file, machine_filter_data const &data, unsigned indent); + static ptr create(type n, machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent); + static ptr create(util::core_file &file, machine_filter_data const &data, unsigned indent); }; DECLARE_ENUM_INCDEC_OPERATORS(machine_filter::type) @@ -249,7 +249,7 @@ public: virtual std::string adorned_display_name(type n) const = 0; static ptr create(type n, software_filter_data const &data) { return create(n, data, nullptr, nullptr, 0); } - static ptr create(emu_file &file, software_filter_data const &data) { return create(file, data, 0); } + static ptr create(util::core_file &file, software_filter_data const &data) { return create(file, data, 0); } static char const *config_name(type n); static char const *display_name(type n); @@ -259,8 +259,8 @@ public: protected: software_filter(); - static ptr create(type n, software_filter_data const &data, char const *value, emu_file *file, unsigned indent); - static ptr create(emu_file &file, software_filter_data const &data, unsigned indent); + static ptr create(type n, software_filter_data const &data, char const *value, util::core_file *file, unsigned indent); + static ptr create(util::core_file &file, software_filter_data const &data, unsigned indent); }; DECLARE_ENUM_INCDEC_OPERATORS(software_filter::type) @@ -294,7 +294,7 @@ public: return (m_filters.end() != it) ? it->second.get() : nullptr; } std::string get_config_string() const; - bool load_ini(emu_file &file); + bool load_ini(util::core_file &file); private: using filter_map = std::map<machine_filter::type, machine_filter::ptr>; |