Changeset 1313

Timestamp:

01/13/08 17:22:36 (7 months ago)

Author:

aknudsen

Message:

Patch from Stelios Bounanos: set host error info more consistently in OSS

Files:

• portaudio/branches/v19-devel/src/hostapi/oss/pa_unix_oss.c (modified) (8 diffs)

portaudio/branches/v19-devel/src/hostapi/oss/pa_unix_oss.c

@@ -406 +406 @@
     {
         sr = 44100;
-        if( ioctl( devHandle, SNDCTL_DSP_SPEED, &sr ) < 0 )
-        {
-            result = paUnanticipatedHostError;
-            goto error;
-        }
+        ENSURE_( ioctl( devHandle, SNDCTL_DSP_SPEED, &sr ), paUnanticipatedHostError );
 
         *defaultSampleRate = sr;
@@ -1872 +1868 @@
                            unsigned long frames )
 {
+    PaError result = paNoError;
     PaOssStream *stream = (PaOssStream*)s;
     int bytesRequested, bytesRead;
@@ -1892 +1889 @@
 
         bytesRequested = framesRequested * PaOssStreamComponent_FrameSize( stream->capture );
-        bytesRead = read( stream->capture->fd, stream->capture->buffer, bytesRequested );
+        ENSURE_( (bytesRead = read( stream->capture->fd, stream->capture->buffer, bytesRequested )),
+                 paUnanticipatedHostError );
         if ( bytesRequested != bytesRead )
+        {
+            PA_DEBUG(( "Requested %d bytes, read %d\n", bytesRequested, bytesRead ));
             return paUnanticipatedHostError;
+        }
 
         PaUtil_SetInputFrameCount( &stream->bufferProcessor, stream->capture->hostFrames );
@@ -1901 +1902 @@
         frames -= framesRequested;
     }
-    return paNoError;
+
+error:
+    return result;
 }
 
@@ -1907 +1910 @@
 static PaError WriteStream( PaStream *s, const void *buffer, unsigned long frames )
 {
+    PaError result = paNoError;
     PaOssStream *stream = (PaOssStream*)s;
     int bytesRequested, bytesWritten;
@@ -1932 +1936 @@
 
         bytesRequested = framesConverted * PaOssStreamComponent_FrameSize( stream->playback );
-        bytesWritten = write( stream->playback->fd, stream->playback->buffer, bytesRequested );
+        ENSURE_( (bytesWritten = write( stream->playback->fd, stream->playback->buffer, bytesRequested )),
+                 paUnanticipatedHostError );
 
         if ( bytesRequested != bytesWritten )
+        {
+            PA_DEBUG(( "Requested %d bytes, wrote %d\n", bytesRequested, bytesWritten ));
             return paUnanticipatedHostError;
-    }
-    return paNoError;
+        }
+    }
+
+error:
+    return result;
 }
 
@@ -1943 +1953 @@
 static signed long GetStreamReadAvailable( PaStream* s )
 {
+    PaError result = paNoError;
     PaOssStream *stream = (PaOssStream*)s;
     audio_buf_info info;
 
-    if( ioctl( stream->capture->fd, SNDCTL_DSP_GETISPACE, &info ) < 0 )
-        return paUnanticipatedHostError;
+    ENSURE_( ioctl( stream->capture->fd, SNDCTL_DSP_GETISPACE, &info ), paUnanticipatedHostError );
     return info.fragments * stream->capture->hostFrames;
+
+error:
+    return result;
 }
 
@@ -1955 +1968 @@
 static signed long GetStreamWriteAvailable( PaStream* s )
 {
+    PaError result = paNoError;
     PaOssStream *stream = (PaOssStream*)s;
     int delay = 0;
 
-    if( ioctl( stream->playback->fd, SNDCTL_DSP_GETODELAY, &delay ) < 0 )
-        return paUnanticipatedHostError;
-
+    ENSURE_( ioctl( stream->playback->fd, SNDCTL_DSP_GETODELAY, &delay ), paUnanticipatedHostError );
     return (PaOssStreamComponent_BufferSize( stream->playback ) - delay) / PaOssStreamComponent_FrameSize( stream->playback );
-}
-
+
+error:
+    return result;
+}
+