Changeset 1356 for portaudio/branches

Timestamp:

02/22/08 00:35:29 (10 months ago)

Author:

rossb

Message:

patch from Eliot Blennerhassett to use new stream read write functions that first appeared in HPI version 3.05.05. resolves ticket #51

Files:

• portaudio/branches/v19-devel/src/hostapi/asihpi/pa_linux_asihpi.c (modified) (10 diffs)

portaudio/branches/v19-devel/src/hostapi/asihpi/pa_linux_asihpi.c

@@ -1932 +1932 @@
     PaUtilZeroer *zeroer;
     PaSampleFormat outputFormat;
+#if (HPI_VER < HPI_VERSION_CONSTRUCTOR( 3, 5, 5 ))
     HPI_DATA data;
-
+#endif
     assert( stream );
     out = stream->output;
@@ -1949 +1950 @@
     zeroer(out->tempBuffer, 1, out->tempBufferSize / Pa_GetSampleSize(outputFormat) );
     /* Write temp buffer to hardware fifo twice, to get started */
+#if (HPI_VER >= HPI_VERSION_CONSTRUCTOR( 3, 5, 5 ))
+    PA_ASIHPI_UNLESS_( HPI_OutStreamWriteBuf( out->hpiDevice->subSys, out->hpiStream, 
+                                              out->tempBuffer, out->tempBufferSize, &out->hpiFormat),
+                                              paUnanticipatedHostError );
+    PA_ASIHPI_UNLESS_( HPI_OutStreamWriteBuf( out->hpiDevice->subSys, out->hpiStream, 
+                                              out->tempBuffer, out->tempBufferSize, &out->hpiFormat),
+                                              paUnanticipatedHostError );
+#else
     PA_ASIHPI_UNLESS_( HPI_DataCreate( &data, &out->hpiFormat, out->tempBuffer, out->tempBufferSize ),
                        paUnanticipatedHostError );
@@ -1955 +1964 @@
     PA_ASIHPI_UNLESS_( HPI_OutStreamWrite( out->hpiDevice->subSys,
                                            out->hpiStream, &data ), paUnanticipatedHostError );
-
+#endif
 error:
     return result;
@@ -2027 +2036 @@
         /* Create and start callback engine thread */
         /* Also waits 1 second for stream to be started by engine thread (otherwise aborts) */
-        PA_ENSURE_( PaUnixThread_New( &stream->thread, &CallbackThreadFunc, stream, 1., 0 ) );
+        PA_ENSURE_( PaUnixThread_New( &stream->thread, &CallbackThreadFunc, stream, 1., 0 /*rtSched*/ ) );
     }
     else
@@ -2474 +2483 @@
     {
         PaAsiHpiStreamInfo info;
+        
+#if (HPI_VER < HPI_VERSION_CONSTRUCTOR( 3, 5, 5 ))
         HPI_DATA data;
+#endif
         HW32 framesToGet = *numFrames;
 
@@ -2500 +2512 @@
         }
 
+#if (HPI_VER >= HPI_VERSION_CONSTRUCTOR( 3, 5, 5 ))
+        /* Read block of data into temp buffer */
+        PA_ASIHPI_UNLESS_( HPI_InStreamReadBuf( stream->input->hpiDevice->subSys,
+                                             stream->input->hpiStream, 
+                                             stream->input->tempBuffer,
+                                             framesToGet * stream->input->bytesPerFrame),
+                           paUnanticipatedHostError );
+#else
         /* Setup HPI data structure around temp buffer */
         HPI_DataCreate( &data, &stream->input->hpiFormat, stream->input->tempBuffer,
@@ -2507 +2527 @@
                                              stream->input->hpiStream, &data ),
                            paUnanticipatedHostError );
+#endif
         /* Register temp buffer with buffer processor (always FULL buffer) */
         PaUtil_SetInputFrameCount( &stream->bufferProcessor, *numFrames );
@@ -2550 +2571 @@
     {
         PaAsiHpiStreamInfo info;
+#if (HPI_VER < HPI_VERSION_CONSTRUCTOR( 3, 5, 5 ))
         HPI_DATA data;
-
+#endif
         /* Check for underflows after the (potentially time-consuming) callback */
         PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->output, &info ) );
@@ -2559 +2581 @@
         }
 
+#if (HPI_VER >= HPI_VERSION_CONSTRUCTOR( 3, 5, 5 ))
+        /* Write temp buffer to HPI stream */
+        PA_ASIHPI_UNLESS_( HPI_OutStreamWriteBuf( stream->output->hpiDevice->subSys,
+                                           stream->output->hpiStream, 
+                                           stream->output->tempBuffer,
+                                           numFrames * stream->output->bytesPerFrame, 
+                                           &stream->output->hpiFormat),
+                           paUnanticipatedHostError );
+#else
         /* Setup HPI data structure around temp buffer */
         HPI_DataCreate( &data, &stream->output->hpiFormat, stream->output->tempBuffer,
@@ -2566 +2597 @@
                                                stream->output->hpiStream, &data ),
                            paUnanticipatedHostError );
+#endif
     }