Changeset 4764:03260f93b84f in roaraudio

Timestamp:

02/14/11 16:32:25 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

PulseAudio? is very broken by design. this patch tries to workaround some major bugs of it. DO NEVER EVER TRY TO USE PULSE*.

Location:

roard

Files:

• driver_pulsesimple.c (modified) (5 diffs)
• include/driver.h (modified) (1 diff)

roard/driver_pulsesimple.c

@@ -30 +30 @@
 int     driver_pulsesimple_open         (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) {
  struct driver_pulsesimple * self;
+ const char                * subdev = NULL;
+ int                         pulseerror = -1;
  pa_stream_direction_t dir = PA_STREAM_PLAYBACK;
  pa_sample_spec        ss;
@@ -82 +84 @@
   return -1;
 
- self->handle = pa_simple_new(device, "roard", dir, NULL, "RoarAudio Sound Server", &ss, NULL, NULL, NULL);
+ self->handle = pa_simple_new(device, "roard", dir, subdev, "RoarAudio Sound Server", &ss, NULL, NULL, &pulseerror);
 
  if ( self->handle == NULL ) {
+  ROAR_ERR("driver_pulsesimple_open(inst=%p, device='%s', info=%p, fh=%i, sstream=%p): can not open device: %s", inst, device, info, fh, sstream, pa_strerror(pulseerror));
   roar_mm_free(self);
+  ROAR_DBG("driver_pulsesimple_open(inst=%p, device='%s', info=%p, fh=%i, sstream=%p) = -1", inst, device, info, fh, sstream);
   return -1;
  }
@@ -103 +107 @@
  struct driver_pulsesimple * self = vio->inst;
 
+ ROAR_DBG("driver_pulsesimple_close(vio=%p) = ?", vio);
+
  pa_simple_free(self->handle);
 
@@ -113 +119 @@
  struct driver_pulsesimple * self = vio->inst;
 
- return pa_simple_write(self->handle, buf, count, NULL);
+ ROAR_DBG("driver_pulsesimple_write(vio=%p, buf=%p, count=%llu) = ?", vio, buf, (long long unsigned int)count);
+
+ return pa_simple_write(self->handle, buf, count, NULL) == 0 ? count : -1;
 }
 
 int     driver_pulsesimple_sync         (struct roar_vio_calls * vio) {
  struct driver_pulsesimple * self = vio->inst;
+
+ ROAR_DBG("driver_pulsesimple_sync(vio=%p) = ?", vio);
 
  return pa_simple_drain(self->handle, NULL);
@@ -127 +137 @@
  (void)self;
 
+ ROAR_DBG("driver_pulsesimple_ctl(vio=%p) = ?", vio);
+
  return -1;
 }

roard/include/driver.h

@@ -129 +129 @@
 #ifdef ROAR_HAVE_LIBPULSE
 #include <pulse/simple.h>
+#include <pulse/error.h>
 #include "driver_pulsesimple.h"
 #endif