summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/ui/filesel.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2016-03-13 13:54:57 +1100
committer Vas Crabb <vas@vastheman.com>2016-03-14 18:55:00 +1100
commit42fbb9c3967fcda37f2d9ae17d5796a79cf027b9 (patch)
treea43047ee00431e5e22bfc5f8f612ff775586e415 /src/emu/ui/filesel.cpp
parent5fc27747031b6ed6f6c0582502098ebfb960be67 (diff)
Make osd_file a polymorphic class that's held with smart pointers
Make avi_file a class that's held with smart pointers, encapsulate various AVI I/O structures Make zip_file and _7z_file classes rather than having free functions everywhere Hide zip/7z class implementation behind an interface, no longer need to call close() to send back to the cache Don't dump as much crap in global namespace Add solaris PTY implementation Improve variable expansion for SDL OSD - supports ~/$FOO/${BAR} syntax Rearrange stuff so the same things are in file module for all OSDs Move file stuff into its own module 7z/zip open and destruct are still not thread-safe due to lack of interlocks around cache access Directory functions still need to be moved to file module SDL OSD may not initialise WinSock on Windows
Diffstat (limited to 'src/emu/ui/filesel.cpp')
-rw-r--r--src/emu/ui/filesel.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/ui/filesel.cpp b/src/emu/ui/filesel.cpp
index ec8d4c2ea22..89658407279 100644
--- a/src/emu/ui/filesel.cpp
+++ b/src/emu/ui/filesel.cpp
@@ -536,7 +536,7 @@ void ui_menu_file_selector::append_entry_menu_item(const file_selector_entry *en
void ui_menu_file_selector::populate()
{
zippath_directory *directory = nullptr;
- file_error err;
+ osd_file::error err;
const osd_directory_entry *dirent;
const file_selector_entry *entry;
const file_selector_entry *selected_entry = nullptr;
@@ -579,7 +579,7 @@ void ui_menu_file_selector::populate()
}
// build the menu for each item
- if (err == FILERR_NONE)
+ if (err == osd_file::error::NONE)
{
while((dirent = zippath_readdir(directory)) != nullptr)
{
@@ -621,7 +621,7 @@ void ui_menu_file_selector::populate()
void ui_menu_file_selector::handle()
{
- file_error err;
+ osd_file::error err;
const file_selector_entry *entry;
const file_selector_entry *selected_entry = nullptr;
int bestmatch = 0;
@@ -657,7 +657,7 @@ void ui_menu_file_selector::handle()
case SELECTOR_ENTRY_TYPE_DIRECTORY:
// drive/directory - first check the path
err = zippath_opendir(entry->fullpath, nullptr);
- if (err != FILERR_NONE)
+ if (err != osd_file::error::NONE)
{
// this path is problematic; present the user with an error and bail
machine().ui().popup_time(1, "Error accessing %s", entry->fullpath);