Changeset 1311

Timestamp:

01/12/08 13:15:22 (8 months ago)

Author:

bjornroche

Message:

fixed code inside asserts as suggested by Jorge Acerda Macia.

Location:

portaudio/branches/v19-devel/src/hostapi/coreaudio

Files:

• pa_mac_core.c (modified) (1 diff)
• pa_mac_core_blocking.c (modified) (6 diffs)

portaudio/branches/v19-devel/src/hostapi/coreaudio/pa_mac_core.c

@@ -315 +315 @@
    UInt32 isRunning;
    UInt32 size = sizeof( isRunning );
-   assert( !AudioUnitGetProperty( ci, kAudioOutputUnitProperty_IsRunning, inScope, inElement, &isRunning, &size ) );
+   OSStatus err;
+   err = AudioUnitGetProperty( ci, kAudioOutputUnitProperty_IsRunning, inScope, inElement, &isRunning, &size );
+   assert( !err );
    if( isRunning )
       return; //We are only interested in when we are stopping

portaudio/branches/v19-devel/src/hostapi/coreaudio/pa_mac_core_blocking.c

@@ -122 +122 @@
    void *data;
    int result;
+   OSStatus err;
 
    /* zeroify things */
@@ -170 +171 @@
       }
 
-      assert( 0 == PaUtil_InitializeRingBuffer(
+      err = PaUtil_InitializeRingBuffer(
             &blio->inputRingBuffer,
             ringBufferSize*blio->inputSampleSizePow2*inChan,
-            data ) );
+            data );
+      assert( !err );
    }
    if( outChan ) {
@@ -183 +185 @@
       }
 
-      assert( 0 == PaUtil_InitializeRingBuffer(
+      err = PaUtil_InitializeRingBuffer(
             &blio->outputRingBuffer,
             ringBufferSize*blio->outputSampleSizePow2*outChan,
-            data ) );
+            data );
+      assert( !err );
    }
 
@@ -345 +348 @@
    long toRead;
    long toWrite;
+   long read;
+   long written;
 
    /* set flags returned by OS: */
@@ -361 +366 @@
       /* copy the data */
       /*printf( "reading %d\n", toRead );*/
-      assert( toRead == PaUtil_WriteRingBuffer( &blio->inputRingBuffer, input, toRead ) );
+      read = PaUtil_WriteRingBuffer( &blio->inputRingBuffer, input, toRead );
+      assert( toRead == read );
 #ifdef PA_MAC__BLIO_MUTEX
       /* Priority inversion. See notes below. */
@@ -384 +390 @@
       /* copy the data */
       /*printf( "writing %d\n", toWrite );*/
-      assert( toWrite == PaUtil_ReadRingBuffer( &blio->outputRingBuffer, output, toWrite ) );
+      written = PaUtil_ReadRingBuffer( &blio->outputRingBuffer, output, toWrite );
+      assert( toWrite == written );
 #ifdef PA_MAC__BLIO_MUTEX
       /* We have a priority inversion here. However, we will only have to