Changeset 1318

Timestamp:

01/26/08 14:18:29 (7 months ago)

Author:

bjornroche

Message:

tweaked handling of xruns in core audio slightly. should be cleaner this way

Location:

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

Files:

• pa_mac_core.c (modified) (3 diffs)
• pa_mac_core_utilities.c (modified) (7 diffs)
• pa_mac_core_utilities.h (modified) (1 diff)

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

@@ -938 +938 @@
                                              kAudioDeviceProcessorOverload,
                                              xrunCallback,
-                                             addToXRunListenerList( (void *)stream, *audioDevice ) ) ;
+                                             addToXRunListenerList( (void *)stream ) ) ;
     if( result == kAudioHardwareIllegalOperationError ) {
        // -- already registered, we're good
@@ -2128 +2128 @@
     if( stream ) {
        if( stream->outputUnit ) {
-          int count = removeFromXRunListenerList( stream, stream->outputDevice );
+          int count = removeFromXRunListenerList( stream );
           if( count == 0 )
              AudioDeviceRemovePropertyListener( stream->outputDevice,
@@ -2137 +2137 @@
        }
        if( stream->inputUnit && stream->outputUnit != stream->inputUnit ) {
-          int count = removeFromXRunListenerList( stream, stream->inputDevice );
+          int count = removeFromXRunListenerList( stream );
           if( count == 0 )
              AudioDeviceRemovePropertyListener( stream->inputDevice,

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

@@ -631 +631 @@
 struct PaMacXRunListNode_s {
    PaMacCoreStream *stream;
-   AudioDeviceID audioDevice;
    struct PaMacXRunListNode_s *next;
 } ;
@@ -649 +648 @@
 
    for( ; node; node=node->next ) {
-      if( node->audioDevice != inDevice )
-         continue; //not the same device. continue.
-
       PaMacCoreStream *stream = node->stream;
 
@@ -657 +653 @@
          continue; //if the stream isn't active, we don't care if the device is dropping
 
-      if( isInput )
-         OSAtomicOr32( paInputOverflow, (uint32_t *)&(stream->xrunFlags) );
-      else
-         OSAtomicOr32( paOutputUnderflow, (uint32_t *)&(stream->xrunFlags) );
+      if( isInput ) {
+         if( stream->inputDevice == inDevice )
+            OSAtomicOr32( paInputOverflow, (uint32_t *)&(stream->xrunFlags) );
+      } else {
+         if( stream->outputDevice == inDevice )
+            OSAtomicOr32( paOutputUnderflow, (uint32_t *)&(stream->xrunFlags) );
+      }
    }
 
@@ -688 +687 @@
 }
 
-void *addToXRunListenerList( void *stream, AudioDeviceID audioDevice )
+void *addToXRunListenerList( void *stream )
 {
    PaMacXRunListNode *newNode;
@@ -694 +693 @@
    newNode = (PaMacXRunListNode *) malloc( sizeof( PaMacXRunListNode ) );
    newNode->stream = (PaMacCoreStream *) stream;
-   newNode->audioDevice = audioDevice;
    newNode->next = firstXRunListNode.next;
    // insert:
@@ -702 +700 @@
 }
 
-int removeFromXRunListenerList( void *stream, AudioDeviceID audioDevice )
+int removeFromXRunListenerList( void *stream )
 {
    PaMacXRunListNode *node, *prev;
@@ -708 +706 @@
    node = firstXRunListNode.next;
    while( node ) {
-      if( node->stream == stream && node->audioDevice == audioDevice ) {
+      if( node->stream == stream ) {
          //found it:
          --xRunListSize;

portaudio/branches/v19-devel/src/hostapi/coreaudio/pa_mac_core_utilities.h

@@ -222 +222 @@
 
 /**Returns the list, so that it can be passed to CorAudio.*/
-void *addToXRunListenerList( void *stream, AudioDeviceID audioDevice );
+void *addToXRunListenerList( void *stream );
 /**Returns the number of Listeners in the list remaining.*/
-int removeFromXRunListenerList( void *stream, AudioDeviceID audioDevice );
+int removeFromXRunListenerList( void *stream );
 
 #endif /* PA_MAC_CORE_UTILITIES_H__*/