Added getter for AudioStreamBasicDescription for EZOutput and made EZ…

…Recorder erase file if it already exists
engmsaleh · Mar 15, 2014 · a957fed · a957fed
1 parent 7eac04b
commit a957fed
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 43 deletions.
diff --git a/EZAudio/EZOutput.h b/EZAudio/EZOutput.h
@@ -166,6 +166,16 @@ inNumberFrames:(UInt32)inNumberFrames
 -(void)stopPlayback;
 
 #pragma mark - Getters
+///-----------------------------------------------------------
+/// @name Getting The Output Audio Format
+///-----------------------------------------------------------
+
+/**
+ Provides the AudioStreamBasicDescription structure containing the format of the microphone's audio.
+ @return An AudioStreamBasicDescription structure describing the format of the microphone's audio.
+ */
+-(AudioStreamBasicDescription)audioStreamBasicDescription;
+
 ///-----------------------------------------------------------
 /// @name Getting The State Of The Output
 ///-----------------------------------------------------------

diff --git a/EZAudio/EZOutput.m b/EZAudio/EZOutput.m
@@ -342,26 +342,34 @@ -(void)stopPlayback {
 }
 
 #pragma mark - Getters
+-(AudioStreamBasicDescription)audioStreamBasicDescription {
+  return _outputASBD;
+}
+
 -(BOOL)isPlaying {
   return _isPlaying;
 }
 
 #pragma mark - Setters
 -(void)setAudioStreamBasicDescription:(AudioStreamBasicDescription)asbd {
+  BOOL wasPlaying = NO;
   if( self.isPlaying ){
-    NSAssert(self.isPlaying,@"Cannot set the AudioStreamBasicDescription while output is performing playback");
+    [self stopPlayback];
+    wasPlaying = YES;
   }
-  else {
-    _customASBD = YES;
-    _outputASBD = asbd;
-    // Set the format for output
-    [EZAudio checkResult:AudioUnitSetProperty(_outputUnit,
-                                              kAudioUnitProperty_StreamFormat,
-                                              kAudioUnitScope_Input,
-                                              0,
-                                              &_outputASBD,
-                                              sizeof(_outputASBD))
-               operation:"Couldn't set the ASBD for input scope/bos 0"];
+  _customASBD = YES;
+  _outputASBD = asbd;
+  // Set the format for output
+  [EZAudio checkResult:AudioUnitSetProperty(_outputUnit,
+                                            kAudioUnitProperty_StreamFormat,
+                                            kAudioUnitScope_Input,
+                                            0,
+                                            &_outputASBD,
+                                            sizeof(_outputASBD))
+             operation:"Couldn't set the ASBD for input scope/bos 0"];
+  if( wasPlaying )
+  {
+    [self startPlayback];
   }
 }
 

diff --git a/EZAudio/EZRecorder.m b/EZAudio/EZRecorder.m
@@ -90,40 +90,40 @@ -(void)_configureRecorderForNewFile {
 
 -(void)_configureRecorder {
 
-  // Create the extended audio file
-  OSStatus result = ExtAudioFileCreateWithURL(_destinationFileURL,
-                                              kAudioFileCAFType,
-                                              &_destinationFormat,
-                                              NULL,
-                                              0,
-                                              &_destinationFile);
-//  [EZAudio checkResult:ExtAudioFileCreateWithURL(_destinationFileURL,
+//  // Create the extended audio file
+//  OSStatus result = ExtAudioFileCreateWithURL(_destinationFileURL,
 //                                              kAudioFileCAFType,
 //                                              &_destinationFormat,
 //                                              NULL,
-//                                              kAudioFileFlags_EraseFile,
-//                                              &_destinationFile)
-//             operation:"Could not open audio file"];
-
-  if( result != noErr )
-  {
-
-    // Open the existing audio file for writing
-    AudioFileID audioFileID;
-
-    [EZAudio checkResult:AudioFileOpenURL(_destinationFileURL,
-                                          kAudioFileWritePermission|kAudioFileReadPermission,
-                                          kAudioFileCAFType,
-                                          &audioFileID)
-               operation:"Failed to open existing audio file"];
-
-    // Wrap the audio file with an extended audio file reference
-    [EZAudio checkResult:ExtAudioFileWrapAudioFileID(audioFileID,
-                                                     true,
-                                                     &_destinationFile)
-               operation:"Failed to wrap audio file reference with extended audio file"];
-
-  }
+//                                              0,
+//                                              &_destinationFile);
+  [EZAudio checkResult:ExtAudioFileCreateWithURL(_destinationFileURL,
+                                              kAudioFileCAFType,
+                                              &_destinationFormat,
+                                              NULL,
+                                              kAudioFileFlags_EraseFile,
+                                              &_destinationFile)
+             operation:"Could not open audio file"];
+
+//  if( result != noErr )
+//  {
+//    
+//    // Open the existing audio file for writing
+//    AudioFileID audioFileID;
+//
+//    [EZAudio checkResult:AudioFileOpenURL(_destinationFileURL,
+//                                          kAudioFileWritePermission|kAudioFileReadPermission,
+//                                          kAudioFileCAFType,
+//                                          &audioFileID)
+//               operation:"Failed to open existing audio file"];
+//    
+//    // Wrap the audio file with an extended audio file reference
+//    [EZAudio checkResult:ExtAudioFileWrapAudioFileID(audioFileID,
+//                                                     true,
+//                                                     &_destinationFile)
+//               operation:"Failed to wrap audio file reference with extended audio file"];
+//    
+//  }
 
   // Set the client format
   _clientFormat = _destinationFormat;