Changeset 1316

Timestamp:

01/23/08 15:40:38 (7 months ago)

Author:

bjornroche

Message:

applied patch to fix ticket 64 -- added list of listeners for xruns in CoreAudio?.

Location:

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

Files:

• pa_mac_core.c (modified) (5 diffs)
• pa_mac_core_utilities.c (modified) (2 diffs)
• pa_mac_core_utilities.h (modified) (1 diff)

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

@@ -283 +283 @@
 
 /*
- * Callback for setting over/underrun flags.
- *
- */
-static OSStatus xrunCallback(
-    AudioDeviceID inDevice, 
-    UInt32 inChannel, 
-    Boolean isInput, 
-    AudioDevicePropertyID inPropertyID, 
-    void* inClientData)
-{
-   PaMacCoreStream *stream = (PaMacCoreStream *) inClientData;
-   if( stream->state != ACTIVE )
-      return 0; //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) );
-
-   return 0;
-}
-
-/*
  * Callback called when starting or stopping a stream.
  */
@@ -558 +536 @@
     VVDBUG(("PaMacCore_Initialize(): hostApiIndex=%d\n", hostApiIndex));
 
+    initializeXRunListenerList();
+
     auhalHostApi = (PaMacAUHAL*)PaUtil_AllocateMemory( sizeof(PaMacAUHAL) );
     if( !auhalHostApi )
@@ -680 +660 @@
     VVDBUG(("Terminate()\n"));
 
+    destroyXRunListenerList();
+
     /*
         IMPLEMENT ME:
@@ -951 +933 @@
     }
     /* -- add listener for dropouts -- */
-    ERR_WRAP( AudioDeviceAddPropertyListener( *audioDevice,
-                                              0,
-                                              outStreamParams ? false : true,
-                                              kAudioDeviceProcessorOverload,
-                                              xrunCallback,
-                                              (void *)stream) );
-
+    result = AudioDeviceAddPropertyListener( *audioDevice,
+                                             0,
+                                             outStreamParams ? false : true,
+                                             kAudioDeviceProcessorOverload,
+                                             xrunCallback,
+                                             addToXRunListenerList( (void *)stream, *audioDevice ) ) ;
+    if( result == kAudioHardwareIllegalOperationError ) {
+       // -- already registered, we're good
+    } else {
+       // -- not already registered, just check for errors
+       ERR_WRAP( result );
+    }
     /* -- listen for stream start and stop -- */
     ERR_WRAP( AudioUnitAddPropertyListener( *audioUnit,
@@ -2140 +2127 @@
 
     if( stream ) {
-       if( stream->outputUnit )
-          AudioDeviceRemovePropertyListener( stream->outputDevice,
-                                             0,
-                                             false,
-                                             kAudioDeviceProcessorOverload,
-                                             xrunCallback );
-       if( stream->inputUnit && stream->outputUnit != stream->inputUnit )
-          AudioDeviceRemovePropertyListener( stream->inputDevice,
-                                             0,
-                                             true,
-                                             kAudioDeviceProcessorOverload,
-                                             xrunCallback );
+       if( stream->outputUnit ) {
+          int count = removeFromXRunListenerList( stream, stream->outputDevice );
+          if( count == 0 )
+             AudioDeviceRemovePropertyListener( stream->outputDevice,
+                                                0,
+                                                false,
+                                                kAudioDeviceProcessorOverload,
+                                                xrunCallback );
+       }
+       if( stream->inputUnit && stream->outputUnit != stream->inputUnit ) {
+          int count = removeFromXRunListenerList( stream, stream->inputDevice );
+          if( count == 0 )
+             AudioDeviceRemovePropertyListener( stream->inputDevice,
+                                                0,
+                                                true,
+                                                kAudioDeviceProcessorOverload,
+                                                xrunCallback );
+       }
        if( stream->outputUnit && stream->outputUnit != stream->inputUnit ) {
           AudioUnitUninitialize( stream->outputUnit );

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

@@ -58 +58 @@
 
 #include "pa_mac_core_utilities.h"
+#include "pa_mac_core_internal.h"
+#include <strings.h>
 
 PaError PaMacCore_SetUnixError( int err, int line )
@@ -619 +621 @@
    return paNoError;
 }
+
+/**********************
+ *
+ * XRun stuff
+ *
+ **********************/
+
+struct PaMacXRunListNode_s {
+   PaMacCoreStream *stream;
+   AudioDeviceID audioDevice;
+   struct PaMacXRunListNode_s *next;
+} ;
+
+typedef struct PaMacXRunListNode_s PaMacXRunListNode;
+
+OSStatus xrunCallback(
+    AudioDeviceID inDevice, 
+    UInt32 inChannel, 
+    Boolean isInput, 
+    AudioDevicePropertyID inPropertyID, 
+    void* inClientData)
+{
+   PaMacXRunListNode *node = (PaMacXRunListNode *) inClientData;
+
+   node = node->next ; //skip the first node
+
+   for( ; node; node=node->next ) {
+      if( node->audioDevice != inDevice )
+         continue; //not the same device. continue.
+
+      PaMacCoreStream *stream = node->stream;
+
+      if( stream->state != ACTIVE )
+         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) );
+   }
+
+   return 0;
+}
+
+/** Always empty, so that it can always be the one returned by
+    addToXRunListenerList. note that it's not a pointer. */
+static PaMacXRunListNode firstXRunListNode;
+static int xRunListSize;
+
+void initializeXRunListenerList()
+{
+   xRunListSize = 0;
+   bzero( (void *) &firstXRunListNode, sizeof(firstXRunListNode) );
+}
+void destroyXRunListenerList()
+{
+   PaMacXRunListNode *node;
+   node = firstXRunListNode.next;
+   while( node ) {
+      PaMacXRunListNode *tmp = node;
+      node = node->next;
+      free( tmp );
+   }
+   xRunListSize = 0;
+}
+
+void *addToXRunListenerList( void *stream, AudioDeviceID audioDevice )
+{
+   PaMacXRunListNode *newNode;
+   // setup new node:
+   newNode = (PaMacXRunListNode *) malloc( sizeof( PaMacXRunListNode ) );
+   newNode->stream = (PaMacCoreStream *) stream;
+   newNode->audioDevice = audioDevice;
+   newNode->next = firstXRunListNode.next;
+   // insert:
+   firstXRunListNode.next = newNode;
+
+   return &firstXRunListNode;
+}
+
+int removeFromXRunListenerList( void *stream, AudioDeviceID audioDevice )
+{
+   PaMacXRunListNode *node, *prev;
+   prev = &firstXRunListNode;
+   node = firstXRunListNode.next;
+   while( node ) {
+      if( node->stream == stream && node->audioDevice == audioDevice ) {
+         //found it:
+         --xRunListSize;
+         prev->next = node->next;
+         free( node );
+         return xRunListSize;
+      }
+      prev = prev->next;
+      node = node->next;
+   }
+
+   // failure
+   return xRunListSize;
+}
+

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

@@ -203 +203 @@
                                 UInt32 requestedFramesPerBuffer, 
                                 UInt32 *actualFramesPerBuffer );
+
+
+/*********************
+ *
+ *  xrun handling
+ *
+ *********************/
+
+OSStatus xrunCallback(
+    AudioDeviceID inDevice, 
+    UInt32 inChannel, 
+    Boolean isInput, 
+    AudioDevicePropertyID inPropertyID, 
+    void* inClientData ) ;
+
+void initializeXRunListenerList();
+void destroyXRunListenerList();
+
+/**Returns the list, so that it can be passed to CorAudio.*/
+void *addToXRunListenerList( void *stream, AudioDeviceID audioDevice );
+/**Returns the number of Listeners in the list remaining.*/
+int removeFromXRunListenerList( void *stream, AudioDeviceID audioDevice );
+
 #endif /* PA_MAC_CORE_UTILITIES_H__*/