Changeset 1056

Timestamp:

11/08/07 22:43:11 (14 months ago)

Author:

stephen_booth

Message:

Added EOS detection

Location:

trunk/Audio

Files:

• AudioScheduler.m (modified) (1 diff)
• ScheduledAudioRegion.h (modified) (2 diffs)
• ScheduledAudioRegion.m (modified) (2 diffs)

trunk/Audio/AudioScheduler.m

@@ -93 +93 @@
 
         // Determine if region rendering is complete
-        if([[[scheduler regionBeingRendered] decoder] currentFrame] == [[[scheduler regionBeingRendered] decoder] totalFrames] 
-           && [[scheduler regionBeingRendered] framesRendered] == [[scheduler regionBeingRendered] framesScheduled]) {
+        if([[scheduler regionBeingRendered] atEnd] && [[scheduler regionBeingRendered] framesRendered] == [[scheduler regionBeingRendered] framesScheduled]) {
 
                 // Notify the delegate

trunk/Audio/ScheduledAudioRegion.h

@@ -29 +29 @@
 {
         id <AudioDecoderMethods>        _decoder;
+        BOOL                                            _atEnd;
         
         AudioTimeStamp                          _startTime;
@@ -49 +50 @@
 - (id <AudioDecoderMethods>) decoder;
 - (void) setDecoder:(id <AudioDecoderMethods>)decoder;
+
+- (BOOL) atEnd;
 
 - (AudioTimeStamp) startTime;

trunk/Audio/ScheduledAudioRegion.m

@@ -197 +197 @@
 - (SInt64)                      framesScheduled                                                 { return _framesScheduled; }
 - (SInt64)                      framesRendered                                                  { return _framesRendered; }
+- (BOOL)                        atEnd                                                                   { return _atEnd; }
 
 - (unsigned) numberOfSlicesInBuffer
@@ -241 +242 @@
         NSParameterAssert(sliceIndex < [self numberOfSlicesInBuffer]);
 
-        return [[self decoder] readAudio:_sliceBuffer[sliceIndex].mBufferList frameCount:[self numberOfFramesPerSlice]];
+        UInt32 framesRead = [[self decoder] readAudio:_sliceBuffer[sliceIndex].mBufferList frameCount:[self numberOfFramesPerSlice]];
+        
+        if(0 == framesRead)
+                _atEnd = YES;
+        
+        return framesRead;
 }