/[pcsx2_0.9.7]/trunk/3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
ViewVC logotype

Diff of /trunk/3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h	2010/11/12 00:35:47	272
+++ trunk/3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h	2010/11/12 01:10:22	273
@@ -15,7 +15,7 @@
  * Olivier Tristan for feedback and testing
  * Glenn Zelniker and Z-Systems engineering for sponsoring the Blocking I/O
  * interface.
- *
+ * 
  *
  * Based on the Open Source API proposed by Ross Bencina
  * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
@@ -41,13 +41,13 @@
  */
 
 /*
- * The text above constitutes the entire PortAudio license; however,
+ * The text above constitutes the entire PortAudio license; however, 
  * the PortAudio community also makes the following non-binding requests:
  *
  * Any person wishing to distribute modifications to the Software is
  * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
  * license above.
  */
 
@@ -142,7 +142,6 @@
     AudioTimeStamp startTime;
     /* FIXME: instead of volatile, these should be properly memory barriered */
     volatile PaStreamCallbackFlags xrunFlags;
-    volatile bool isTimeSet;
     volatile enum {
        STOPPED          = 0, /* playback is completely stopped,
                                 and the user has called StopStream(). */
@@ -159,6 +158,18 @@
     //these may be different from the stream sample rate due to SR conversion:
     double outDeviceSampleRate;
     double inDeviceSampleRate;
+	
+	/* data updated by main thread and notifications, protected by timingInformationMutex */
+	int timingInformationMutexIsInitialized;
+	pthread_mutex_t timingInformationMutex;
+	Float64 recipricalOfActualOutputSampleRate;
+	UInt32 deviceOutputLatencySamples;
+	UInt32 deviceInputLatencySamples;
+	
+	/* while the io proc is active, the following values are only accessed and manipulated by the ioproc */
+	Float64 recipricalOfActualOutputSampleRate_ioProcCopy;
+	UInt32 deviceOutputLatencySamples_ioProcCopy;
+	UInt32 deviceInputLatencySamples_ioProcCopy;
 }
 PaMacCoreStream;
 

 

  ViewVC Help
Powered by ViewVC 1.1.22