[Scummvm-git-logs] scummvm master -> 9ba4d973ecfdbfe97ac1391d7e5320a9c9e53afe

[bluegr]

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:
9ba4d973ec TONY: Remove hack for AmigaOS4


Commit: 9ba4d973ecfdbfe97ac1391d7e5320a9c9e53afe
    https://github.com/scummvm/scummvm/commit/9ba4d973ecfdbfe97ac1391d7e5320a9c9e53afe
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-05-15T13:08:37+03:00

Commit Message:
TONY: Remove hack for AmigaOS4

This was fixed in one of the OS updates

Changed paths:
    engines/tony/sound.cpp


diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp
index bec9c96217c..1473ae2f04f 100644
--- a/engines/tony/sound.cpp
+++ b/engines/tony/sound.cpp
@@ -578,32 +578,6 @@ bool FPStream::loadFile(const Common::String &fileName, int bufSize) {
 	// Save the size of the stream
 	_size = _file.size();
 
-#ifdef __amigaos4__
-	// HACK: AmigaOS 4 has weird performance problems with reading in the audio thread,
-	// so we read the whole stream into memory.
-	switch (codec) {
-	case FPCODEC_ADPCM:
-		_rewindableStream = Audio::makeADPCMStream(_file.readStream(_size), DisposeAfterUse::YES, 0, Audio::kADPCMDVI, 44100, 2);
-		break;
-	case FPCODEC_MP3:
-#ifdef USE_MAD
-		_rewindableStream = Audio::makeMP3Stream(&_file, DisposeAfterUse::YES);
-#endif
-		break;
-	case FPCODEC_OGG:
-#ifdef USE_VORBIS
-		_rewindableStream = Audio::makeVorbisStream(&_file, DisposeAfterUse::YES);
-#endif
-		break;
-	case FPCODEC_FLAC:
-#ifdef USE_FLAC
-		_rewindableStream = Audio::makeFLACStream(&_file, DisposeAfterUse::YES);
-#endif
-		break;
-	default:
-		break;
-	}
-#else
 	switch (codec) {
 	case FPCODEC_ADPCM:
 		_rewindableStream = Audio::makeADPCMStream(&_file, DisposeAfterUse::NO, 0, Audio::kADPCMDVI, 44100, 2);
@@ -626,7 +600,6 @@ bool FPStream::loadFile(const Common::String &fileName, int bufSize) {
 	default:
 		break;
 	}
-#endif
 
 	// All done
 	_fileLoaded = true;