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.

## Makefile.am for the main SDL library

# These are the subdirectories that are always built
CORE_SUBDIRS =			\
	main

# These are the subdirectories which may be built
EXTRA_SUBDIRS =			\
	 audio video events joystick cdrom thread timer endian file cpuinfo hermes

# These are the subdirectories which will be built now
SUBDIRS = $(CORE_SUBDIRS) @SDL_EXTRADIRS@

# These are the subdirectories which will be distributed with "make dist"
DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS)

# The SDL library target
lib_LTLIBRARIES = libSDL.la

libSDL_la_SOURCES = $(GENERAL_SRCS)
libSDL_la_LDFLAGS = 		\
	-no-undefined		\
        -release $(LT_RELEASE)	\
	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libSDL_la_LIBADD =		\
	main/libarch.la		\
	@SDL_EXTRALIBS@		\
	@SYSTEM_LIBS@
libSDL_la_DEPENDENCIES =	\
	main/libarch.la		\
	@SDL_EXTRALIBS@

# The SDL library sources
GENERAL_SRCS = 		\
	SDL.c			\
	SDL_error.c		\
	SDL_error_c.h		\
	SDL_fatal.c		\
	SDL_fatal.h		\
	SDL_getenv.c		\
	SDL_loadso.c