Changeset 1017

Timestamp:

10/20/07 11:58:35 (15 months ago)

Author:

stephen_booth

Message:

Pass ScheduledAudioRegion? to callback

Files:

• trunk/Audio/AudioScheduler.m (modified) (4 diffs)

trunk/Audio/AudioScheduler.m

@@ -60 +60 @@
 scheduledAudioSliceCompletionProc(void *userData, ScheduledAudioSlice *slice)
 {
-        NSAutoreleasePool       *pool           = [[NSAutoreleasePool alloc] init];
-        AudioScheduler          *scheduler      = (AudioScheduler *)userData;
+        NSCParameterAssert(NULL != userData);
+        NSCParameterAssert(NULL != slice);
+        
+        NSAutoreleasePool               *pool           = [[NSAutoreleasePool alloc] init];
+        NSArray                                 *dataArray      = (NSArray *)userData;
+        AudioScheduler                  *scheduler      = (AudioScheduler *)[dataArray objectAtIndex:0];
+        ScheduledAudioRegion    *region         = (ScheduledAudioRegion *)[dataArray objectAtIndex:1];
 
 #if DEBUG
@@ -72 +77 @@
 
                 // Update the scheduler
-                [scheduler setRegionBeingRendered:[scheduler regionBeingScheduled]];
+                [scheduler setRegionBeingRendered:region];
 
                 // Notify the delegate
@@ -101 +106 @@
         }
 
+        [dataArray release];
         [pool release];
 }
@@ -449 +455 @@
                                         }
                                         
+                                        // To handle the case where the file contains fewer frames than the buffer,
+                                        // pass the region and self to the callback proc to ensure that the callback
+                                        // knows the ScheduledAudioRegion the audio that was just rendered came from
+                                        NSArray *array = [[NSArray alloc] initWithObjects:self, [self regionBeingScheduled], nil];                                      
+                                        
                                         // Schedule it
                                         slice->mTimeStamp.mFlags                = kAudioTimeStampSampleTimeValid;
                                         slice->mTimeStamp.mSampleTime   = [self scheduledStartTime].mSampleTime + [self framesScheduled];
                                         slice->mCompletionProc                  = scheduledAudioSliceCompletionProc;
-                                        slice->mCompletionProcUserData  = (void *)self;
+                                        slice->mCompletionProcUserData  = (void *)array;
                                         slice->mFlags                                   = 0;
                                         slice->mNumberFrames                    = frameCount;