[Scummvm-git-logs] scummvm master -> 816f65cd683f23778976ca40122a0c44de9218a7

[sluicebox]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
816f65cd68 SCI: Remove AIFF handling from SCI16 code


Commit: 816f65cd683f23778976ca40122a0c44de9218a7
    https://github.com/scummvm/scummvm/commit/816f65cd683f23778976ca40122a0c44de9218a7
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-06-10T14:28:15-06:00

Commit Message:
SCI: Remove AIFF handling from SCI16 code

Only SCI32 Mac games use AIFF audio. This should have been
removed when SCI32 code was moved into its own classes.

Changed paths:
    engines/sci/sound/audio.cpp


diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index 042b1cf3ee..80e03e8d22 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -453,15 +453,6 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32
 
 			memoryStream->seek(0, SEEK_SET);
 			audioStream = Audio::makeWAVStream(memoryStream, DisposeAfterUse::YES);
-		} else if (audioRes->size() > 4 && audioRes->getUint32BEAt(0) == MKTAG('F','O','R','M')) {
-			// AIFF detected
-			Audio::RewindableAudioStream *rewindStream = Audio::makeAIFFStream(memoryStream, DisposeAfterUse::YES);
-			audioSeekStream = dynamic_cast<Audio::SeekableAudioStream *>(rewindStream);
-
-			if (!audioSeekStream) {
-				warning("AIFF file is not seekable");
-				delete rewindStream;
-			}
 		} else if (audioRes->size() > 14 &&
 				   audioRes->getUint16BEAt(0) == 1 &&
 				   audioRes->getUint16BEAt(2) == 1 &&