diff options
author | Max Horn | 2004-09-25 23:33:34 +0000 |
---|---|---|
committer | Max Horn | 2004-09-25 23:33:34 +0000 |
commit | f66960c4b9d6c090259d2522529035a4b8c6162e (patch) | |
tree | 06c5ec3d978ca7fe88334c4d9d1a932e4c8e9b1c /sound | |
parent | 61b7e2155a958c471771da3339a8f1ffcfd633de (diff) | |
download | scummvm-rg350-f66960c4b9d6c090259d2522529035a4b8c6162e.tar.gz scummvm-rg350-f66960c4b9d6c090259d2522529035a4b8c6162e.tar.bz2 scummvm-rg350-f66960c4b9d6c090259d2522529035a4b8c6162e.zip |
Remove obsolete path param
svn-id: r15278
Diffstat (limited to 'sound')
-rw-r--r-- | sound/audiostream.cpp | 7 | ||||
-rw-r--r-- | sound/audiostream.h | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index d61f572f34..5714623a13 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -67,7 +67,7 @@ static const StreamFileFormat STREAM_FILEFORMATS[] = { { NULL, NULL, NULL } // Terminator }; -AudioStream* AudioStream::openStreamFile(const char* filename, const char *path) +AudioStream* AudioStream::openStreamFile(const char *filename) { char buffer[1024]; const uint len = strlen(filename); @@ -82,10 +82,7 @@ AudioStream* AudioStream::openStreamFile(const char* filename, const char *path) for (int i = 0; i < ARRAYSIZE(STREAM_FILEFORMATS)-1 && stream == NULL; ++i) { strcpy(ext, STREAM_FILEFORMATS[i].fileExtension); - if (path != NULL) - fileHandle->open(buffer, File::kFileReadMode, path); - else - fileHandle->open(buffer); + fileHandle->open(buffer); if (fileHandle->isOpen()) stream = STREAM_FILEFORMATS[i].openStreamFile(fileHandle, fileHandle->size()); } diff --git a/sound/audiostream.h b/sound/audiostream.h index bf31d5ae7c..b616e9b565 100644 --- a/sound/audiostream.h +++ b/sound/audiostream.h @@ -82,11 +82,10 @@ public: * In case of an error, the file handle will be closed, but deleting * it is still the responsibilty of the caller. * @param filename a filename without an extension - * @param path an (optional) file path which is passed to File::open() * @return an Audiostream ready to use in case of success; * NULL in case of an error (e.g. invalid/nonexisting file) */ - static AudioStream* openStreamFile(const char *filename, const char *path = NULL); + static AudioStream* openStreamFile(const char *filename); }; class AppendableAudioStream : public AudioStream { |