Skip to content

Commit

Permalink
SCUMM: Cleanup WMA codec error handling
Browse files Browse the repository at this point in the history
  • Loading branch information
bluegr committed Dec 20, 2024
1 parent 82cbe1b commit b61e4ed
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions engines/scumm/soundse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,6 @@ Audio::SeekableAudioStream *SoundSE::getXWBTrack(int track) {

XWBEntry entry = _xwbMusicEntries[track];

// TODO: Remove this, once WMA streams are supported!
if (entry.codec == kXWBCodecWMA) {
delete cdAudioFile;
return nullptr;
}

auto subStream = new Common::SeekableSubReadStream(
cdAudioFile,
entry.offset,
Expand Down Expand Up @@ -193,7 +187,6 @@ Audio::SeekableAudioStream *SoundSE::createXWBStream(Common::SeekableSubReadStre
);
}
case kXWBCodecWMA:
error("createXWBStream: WMA codec not implemented");
// TODO: Implement WMA codec
/*return new Audio::WMACodec(
2,
Expand All @@ -203,7 +196,9 @@ Audio::SeekableAudioStream *SoundSE::createXWBStream(Common::SeekableSubReadStre
entry.align,
stream
);*/

warning("createXWBStream: WMA codec not implemented");
delete stream;
return nullptr;
}

error("createXWBStream: Unknown XWB codec %d", entry.codec);
Expand Down

0 comments on commit b61e4ed

Please sign in to comment.