diff options
| author | Max Horn | 2011-06-03 17:30:30 +0200 |
|---|---|---|
| committer | Max Horn | 2011-06-03 17:30:30 +0200 |
| commit | 3cc2e5b9278e5f1ac846ff2a62c55361a69a8867 (patch) | |
| tree | e9b709f6baf19e0ea78151f12505cdaa925bedfd | |
| parent | 11bd6da595247773155b6155beb795ea25456fa7 (diff) | |
| download | scummvm-rg350-3cc2e5b9278e5f1ac846ff2a62c55361a69a8867.tar.gz scummvm-rg350-3cc2e5b9278e5f1ac846ff2a62c55361a69a8867.tar.bz2 scummvm-rg350-3cc2e5b9278e5f1ac846ff2a62c55361a69a8867.zip | |
COMMON: Access mac res fork via FSNode instead of StdioStream
This fixes linker problems with the unit tests on Mac OS X. it is also
"more proper" to use the high-level FSNode API. StdioStream is a
(relatively) low-level wrapper intended for use inside of backends only.
| -rw-r--r-- | common/macresman.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/macresman.cpp b/common/macresman.cpp index 70c6e0a7ce..6cbc08da19 100644 --- a/common/macresman.cpp +++ b/common/macresman.cpp @@ -32,7 +32,6 @@ #ifdef MACOSX #include "common/config-manager.h" -#include "backends/fs/stdiostream.h" #endif namespace Common { @@ -108,7 +107,7 @@ bool MacResManager::open(String filename) { #ifdef MACOSX // Check the actual fork on a Mac computer String fullPath = ConfMan.get("path") + "/" + filename + "/..namedfork/rsrc"; - SeekableReadStream *macResForkRawStream = StdioStream::makeFromPath(fullPath, false); + SeekableReadStream *macResForkRawStream = FSNode(fullPath).createReadStream();; if (macResForkRawStream && loadFromRawFork(*macResForkRawStream)) { _baseFileName = filename; @@ -168,7 +167,7 @@ bool MacResManager::open(FSNode path, String filename) { #ifdef MACOSX // Check the actual fork on a Mac computer String fullPath = path.getPath() + "/" + filename + "/..namedfork/rsrc"; - SeekableReadStream *macResForkRawStream = StdioStream::makeFromPath(fullPath, false); + SeekableReadStream *macResForkRawStream = FSNode(fullPath).createReadStream(); if (macResForkRawStream && loadFromRawFork(*macResForkRawStream)) { _baseFileName = filename; |