summaryrefslogtreecommitdiffstats
path: root/src/frontend/mame/pluginopts.cpp
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2016-06-24 23:28:42 +0200
committer couriersud <couriersud@arcor.de>2016-06-24 23:28:42 +0200
commit798bb7956756fcb8f356dcaeeaf7fe1e31dab8da (patch)
tree038713be6e2512f886d55a9ac9a9afc92a70d9c8 /src/frontend/mame/pluginopts.cpp
parentbc37304ef96e335810e7dc10367e7e7faa2d3c1d (diff)
parentb3491464e41b6afea81e188fe6a350d4f778854b (diff)
Merge remote-tracking branch 'origin/master' into netlist_dev
Diffstat (limited to 'src/frontend/mame/pluginopts.cpp')
-rw-r--r--src/frontend/mame/pluginopts.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/frontend/mame/pluginopts.cpp b/src/frontend/mame/pluginopts.cpp
index e56a72dfced..0dd9ca7bcf9 100644
--- a/src/frontend/mame/pluginopts.cpp
+++ b/src/frontend/mame/pluginopts.cpp
@@ -39,13 +39,13 @@ plugin_options::plugin_options()
void plugin_options::parse_json(std::string path)
{
// first try to open as a directory
- osd_directory *directory = osd_opendir(path.c_str());
- if (directory != nullptr)
+ osd::directory::ptr directory = osd::directory::open(path);
+ if (directory)
{
// iterate over all files in the directory
- for (const osd_directory_entry *entry = osd_readdir(directory); entry != nullptr; entry = osd_readdir(directory))
+ for (const osd::directory::entry *entry = directory->read(); entry != nullptr; entry = directory->read())
{
- if (entry->type == ENTTYPE_FILE)
+ if (entry->type == osd::directory::entry::entry_type::FILE)
{
std::string name = entry->name;
if (name == "plugin.json")
@@ -80,7 +80,7 @@ void plugin_options::parse_json(std::string path)
}
}
- else if (entry->type == ENTTYPE_DIR)
+ else if (entry->type == osd::directory::entry::entry_type::DIR)
{
std::string name = entry->name;
if (!(name == "." || name == ".."))
@@ -89,8 +89,5 @@ void plugin_options::parse_json(std::string path)
}
}
}
-
- // close the directory and be done
- osd_closedir(directory);
}
}