diff options
author | 2016-03-21 08:27:06 +0100 | |
---|---|---|
committer | 2016-03-21 08:27:06 +0100 | |
commit | a99df788017c2bf5a56034d4f9152bf8ab95a168 (patch) | |
tree | 3beec27b413c75b8f9f88199519e45fd07959bf8 /src/devices/sound/samples.cpp | |
parent | b224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff) | |
parent | 3afd990226a2c647290579bebb5537bd0fd3faac (diff) |
Merge with master
Diffstat (limited to 'src/devices/sound/samples.cpp')
-rw-r--r-- | src/devices/sound/samples.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/sound/samples.cpp b/src/devices/sound/samples.cpp index 62bd8e02657..0b92b51202d 100644 --- a/src/devices/sound/samples.cpp +++ b/src/devices/sound/samples.cpp @@ -618,20 +618,20 @@ bool samples_device::load_samples() { // attempt to open as FLAC first emu_file file(machine().options().sample_path(), OPEN_FLAG_READ); - file_error filerr = file.open(basename, PATH_SEPARATOR, samplename, ".flac"); - if (filerr != FILERR_NONE && altbasename != nullptr) + osd_file::error filerr = file.open(basename, PATH_SEPARATOR, samplename, ".flac"); + if (filerr != osd_file::error::NONE && altbasename != nullptr) filerr = file.open(altbasename, PATH_SEPARATOR, samplename, ".flac"); // if not, try as WAV - if (filerr != FILERR_NONE) + if (filerr != osd_file::error::NONE) filerr = file.open(basename, PATH_SEPARATOR, samplename, ".wav"); - if (filerr != FILERR_NONE && altbasename != nullptr) + if (filerr != osd_file::error::NONE && altbasename != nullptr) filerr = file.open(altbasename, PATH_SEPARATOR, samplename, ".wav"); // if opened, read it - if (filerr == FILERR_NONE) + if (filerr == osd_file::error::NONE) read_sample(file, m_sample[index]); - else if (filerr == FILERR_NOT_FOUND) + else if (filerr == osd_file::error::NOT_FOUND) { logerror("%s: Sample '%s' NOT FOUND\n", tag(), samplename); ok = false; |