Mercurial > sdl-ios-xcode
comparison src/cdrom/macosx/AudioFilePlayer.cpp @ 773:da0a2ad35bf4
Date: Sun, 4 Jan 2004 23:48:19 +0100
From: Max Horn
Subject: Re: Again Audio CD patch
Am 04.01.2004 um 22:38 schrieb Sam Lantinga:
>
> Okay, I fixed the buffering problems by simply using a 4 second buffer
> instead of a 1 second buffer. However, using your code I can't play an
> entire CD - the playback stops after the first song.
>
Found the problem: FSReadFork returns eofErr when the file is finished.
However, we check its return value for errors, and if anything but
noErr occurs, the reader thread aborts its current iteration. That is
bad, because it aborts before it can ever set the flag which tells that
the file is over (also, any remaining data which FSRead did return is
lost - so you'd not hear about to 4 seconds from the end of the file.
Furthermore, the computed data size was 8 bytes to high (I forgot to
account for the fact that the size of an (A)IFF chunk always contains
the chunk header & size fields, too). This is enough to make it work.
However, the end condition is rather fragile, so I tuned some other
things to be pessimistic (check for <= 0 instead of == 0, when eofErr
is encountered enforce mReadFilePosition == mFileLength). You never
know...
The attached patch fixes the issue for me.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Mon, 05 Jan 2004 00:57:51 +0000 |
parents | 5c5656163ebd |
children | f8d5ddc7aef1 |
comparison
equal
deleted
inserted
replaced
772:5c5656163ebd | 773:da0a2ad35bf4 |
---|---|
350 | 350 |
351 result = FSSetForkPosition(mForkRefNum, fsFromMark, ssndData.offset); | 351 result = FSSetForkPosition(mForkRefNum, fsFromMark, ssndData.offset); |
352 THROW_RESULT("AudioFilePlayer::OpenFile(): FSSetForkPosition") | 352 THROW_RESULT("AudioFilePlayer::OpenFile(): FSSetForkPosition") |
353 | 353 |
354 // Data size | 354 // Data size |
355 outFileDataSize = chunk.ckSize - ssndData.offset; | 355 outFileDataSize = chunk.ckSize - ssndData.offset - 8; |
356 | 356 |
357 // File format | 357 // File format |
358 mFileDescription.mSampleRate = 44100; | 358 mFileDescription.mSampleRate = 44100; |
359 mFileDescription.mFormatID = kAudioFormatLinearPCM; | 359 mFileDescription.mFormatID = kAudioFormatLinearPCM; |
360 mFileDescription.mFormatFlags = kLinearPCMFormatFlagIsPacked | kLinearPCMFormatFlagIsSignedInteger; | 360 mFileDescription.mFormatFlags = kLinearPCMFormatFlagIsPacked | kLinearPCMFormatFlagIsSignedInteger; |