thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AUDIO: Simplify complicated loop condition.

Browse source 
- The loop is exited with break; when stream gets assigned, so stream == NULL is always true.
- When iterating using the length of an array a terminator element is unnecessary.
This commit is contained in:
Christoph Mallon 2011-08-07 10:05:07 +02:00
parent a5a8833c05
commit e3e0a317e7
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
audio/audiostream.cpp
View file

@ -61,15 +61,13 @@ static const StreamFileFormat STREAM_FILEFORMATS[] = {
{ "MPEG Layer 3", ".mp3", makeMP3Stream }, { "MPEG Layer 3", ".mp3", makeMP3Stream },
#endif #endif
{ "MPEG-4 Audio", ".m4a", makeQuickTimeStream }, { "MPEG-4 Audio", ".m4a", makeQuickTimeStream },
{ NULL, NULL, NULL } // Terminator
}; };
SeekableAudioStream *SeekableAudioStream::openStreamFile(const Common::String &basename) { SeekableAudioStream *SeekableAudioStream::openStreamFile(const Common::String &basename) {
SeekableAudioStream *stream = NULL; SeekableAudioStream *stream = NULL;
Common::File *fileHandle = new Common::File(); Common::File *fileHandle = new Common::File();
for (int i = 0; i < ARRAYSIZE(STREAM_FILEFORMATS)-1 && stream == NULL; ++i) { for (int i = 0; i < ARRAYSIZE(STREAM_FILEFORMATS); ++i) {
Common::String filename = basename + STREAM_FILEFORMATS[i].fileExtension; Common::String filename = basename + STREAM_FILEFORMATS[i].fileExtension;
fileHandle->open(filename); fileHandle->open(filename);
if (fileHandle->isOpen()) { if (fileHandle->isOpen()) {