summaryrefslogtreecommitdiffstatshomepage
path: root/src/frontend/mame
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2022-02-17 17:28:31 -0500
committer AJR <ajrhacker@users.noreply.github.com>2022-02-17 17:28:31 -0500
commit2db924e5ec91c90b257eda774034e8b78a4a66c2 (patch)
treebbe2d5ba4614fc95f37404815142898f113c2bb0 /src/frontend/mame
parent5668cd4d793f62bb5e8e9cb1fd05cae861cfef77 (diff)
fileio.cpp: Remove optional second argument of path_iterator::next
Diffstat (limited to 'src/frontend/mame')
-rw-r--r--src/frontend/mame/audit.cpp5
-rw-r--r--src/frontend/mame/ui/dirmenu.cpp6
2 files changed, 7 insertions, 4 deletions
diff --git a/src/frontend/mame/audit.cpp b/src/frontend/mame/audit.cpp
index f4d1d2e1438..069c524022e 100644
--- a/src/frontend/mame/audit.cpp
+++ b/src/frontend/mame/audit.cpp
@@ -20,6 +20,7 @@
#include "softlist_dev.h"
#include "chd.h"
+#include "path.h"
#include <algorithm>
@@ -423,8 +424,10 @@ media_auditor::summary media_auditor::audit_samples()
emu_file file(m_enumerator.options().sample_path(), OPEN_FLAG_READ | OPEN_FLAG_NO_PRELOAD);
path_iterator path(searchpath);
std::string curpath;
- while (path.next(curpath, samplename))
+ while (path.next(curpath))
{
+ util::path_append(curpath, samplename);
+
// attempt to access the file (.flac) or (.wav)
std::error_condition filerr = file.open(curpath + ".flac");
if (filerr)
diff --git a/src/frontend/mame/ui/dirmenu.cpp b/src/frontend/mame/ui/dirmenu.cpp
index 32916d6e8f0..920a847c001 100644
--- a/src/frontend/mame/ui/dirmenu.cpp
+++ b/src/frontend/mame/ui/dirmenu.cpp
@@ -183,7 +183,7 @@ void menu_display_actual::populate(float &customtop, float &custombottom)
path_iterator path(m_searchpath);
std::string curpath;
m_folders.clear();
- while (path.next(curpath, nullptr))
+ while (path.next(curpath))
m_folders.push_back(curpath);
item_append((s_folders[m_ref].action == CHANGE) ? _("Change Folder") : _("Add Folder"), 0, (void *)ADD_CHANGE);
@@ -238,7 +238,7 @@ menu_add_change_folder::menu_add_change_folder(mame_ui_manager &mui, render_cont
path_iterator path(searchpath);
std::string curpath;
- while (path.next(curpath, nullptr))
+ while (path.next(curpath))
m_folders.push_back(curpath);
}
@@ -464,7 +464,7 @@ menu_remove_folder::menu_remove_folder(mame_ui_manager &mui, render_container &c
path_iterator path(m_searchpath);
std::string curpath;
- while (path.next(curpath, nullptr))
+ while (path.next(curpath))
m_folders.push_back(curpath);
}