Changeset 664

Timestamp:

12/16/09 16:33:32 (2 years ago)

Author:

erikd

Message:

driver_pulseaudio.c : Handle the case where pa_simple_new() returns NULL.

Files:

• sweep/trunk/src/driver_pulseaudio.c (modified) (5 diffs)

sweep/trunk/src/driver_pulseaudio.c

@@ -122 +122 @@
-pulse_read (sw_handle * handle, sw_audio_t * buf, size_t count)
-{
+  struct pa_simple * pa ;
-  int error;
-  size_t byte_count;
-
+  if ((pa = (struct pa_simple *)handle->custom_data) == NULL)
+    return 0;
+
-  byte_count = count * sizeof (sw_audio_t);
-
-(struct pa_simple *)handle->custom_dat
+p
-    fprintf(stderr, __FILE__": pa_simple_read() failed: %s\n", pa_strerror(error));
-    return 0;
@@ -138 +142 @@
-    sw_framecount_t offset)
-{
+  struct pa_simple * pa ;
-  int error;
-  size_t byte_count;
-
+  if ((pa = (struct pa_simple *)handle->custom_data) == NULL)
+    return 0;
+
-  byte_count = count * sizeof (sw_audio_t);
-
-(struct pa_simple *)handle->custom_dat
+p
-    fprintf(stderr, __FILE__": pa_simple_write() failed: %s\n", pa_strerror(error));
-    return 0;
@@ -165 +173 @@
-pulse_flush (sw_handle * handle)
-{
-
-
-
+
+
+
+
+
+
+
-    fprintf(stderr, __FILE__": pa_simple_flush() failed: %s\n", pa_strerror(error));
-  }
@@ -175 +187 @@
-pulse_drain (sw_handle * handle)
-{
-
-
-
+
+
+
+
+
+
+
-    fprintf(stderr, __FILE__": pa_simple_drain() failed: %s\n", pa_strerror(error));
-  }
@@ -185 +201 @@
-pulse_close (sw_handle * handle)
-{
+  struct pa_simple * pa ;
+
-  pulse_drain(handle);
-
+
+
+
+
+
-  handle->custom_data = NULL;
-}