Changeset 3869:c63e1367041c in roaraudio

Timestamp:

05/19/10 22:14:22 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed long outstanding Con vs. VIO bug

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/basic.h (modified) (2 diffs)
• libroar/basic.c (modified) (6 diffs)
• roard/driver_portaudio.c (modified) (5 diffs)
• roard/include/driver_portaudio.h (modified) (2 diffs)

ChangeLog

@@ -6 +6 @@
         * Fixed some problems with minimal builds
         * Some Copyright fixes
+        * much better VIO support for connections
 
 v. 0.3beta5 - Sun May 02 2010 12:41 CEST

include/libroar/basic.h

@@ -47 +47 @@
 #endif
 
+#define ROAR_CON_FLAGS_NONE        0x00
+#define ROAR_CON_FLAGS_FH          0x01
+#define ROAR_CON_FLAGS_VIO         0x02
+
 struct roar_message {
  int cmd;
@@ -72 +76 @@
 int roar_get_connection_fh  (struct roar_connection * con);
 int roar_get_connection_vio (struct roar_connection * con, struct roar_vio_calls * vio);
+struct roar_vio_calls * roar_get_connection_vio2 (struct roar_connection * con);
 int roar_disconnect   (struct roar_connection * con);
 

libroar/basic.c

@@ -231 +231 @@
  memset(con, 0, sizeof(struct roar_connection));
 
- con->__fh = fh;
+ con->flags = ROAR_CON_FLAGS_FH;
+ con->__fh  = fh;
+
+ if ( roar_vio_open_fh_socket(&(con->viocon), fh) != -1 )
+  con->flags |= ROAR_CON_FLAGS_VIO;
 
  roar_errno = ROAR_ERROR_NONE;
@@ -238 +242 @@
 
 int roar_get_connection_fh (struct roar_connection * con) {
- roar_debug_warn_sysio("roar_get_connection_fh", "roar_get_connection_vio", NULL);
+ roar_debug_warn_sysio("roar_get_connection_fh", "roar_get_connection_vio2", NULL);
 
  if ( con == NULL )
   return -1;
 
+ if ( !(con->flags & ROAR_CON_FLAGS_FH) )
+  return -1;
+
  return con->__fh;
 }
 
 int roar_get_connection_vio (struct roar_connection * con, struct roar_vio_calls * vio) {
+ roar_debug_warn_obsolete("roar_get_connection_vio", "roar_get_connection_vio2", NULL);
+
  if ( con == NULL || vio == NULL )
   return -1;
 
+ if ( !(con->flags & ROAR_CON_FLAGS_FH) )
+  return -1;
+
  return roar_vio_open_fh_socket(vio, con->__fh);
 }
 
+struct roar_vio_calls * roar_get_connection_vio2 (struct roar_connection * con) {
+ if ( con == NULL )
+  return NULL;
+
+ if ( con->flags & ROAR_CON_FLAGS_VIO )
+  return &(con->viocon);
+
+// TODO: try to open the VIO.
+
+ return NULL;
+}
+
 int roar_disconnect (struct roar_connection * con) {
- struct roar_vio_calls vio;
+ struct roar_vio_calls * vio;
  struct roar_message m;
 
@@ -264 +288 @@
  roar_req(con, &m, NULL);
 
- if ( roar_get_connection_vio(con, &vio) != -1 ) {
-  roar_vio_close(&vio);
+ if ( (vio = roar_get_connection_vio2(con)) != NULL ) {
+  roar_vio_close(vio);
  }
 
@@ -329 +353 @@
 #define _ROAR_MESS_BUF_LEN (1 /* version */ + 1 /* cmd */ + 2 /* stream */ + 4 /* pos */ + 2 /* datalen */)
 int roar_send_message (struct roar_connection * con, struct roar_message * mes, char * data) {
- struct roar_vio_calls vio;
-
- if ( roar_get_connection_vio(con, &vio) == -1 )
-  return -1;
-
- return roar_vsend_message(&vio, mes, data);
+ struct roar_vio_calls * vio;
+
+ if ( (vio = roar_get_connection_vio2(con)) == NULL )
+  return -1;
+
+ return roar_vsend_message(vio, mes, data);
 }
 
@@ -369 +393 @@
 
 int roar_recv_message (struct roar_connection * con, struct roar_message * mes, char ** data) {
- struct roar_vio_calls vio;
-
- if ( roar_get_connection_vio(con, &vio) == -1 )
-  return -1;
-
- return roar_vrecv_message(&vio, mes, data);
+ struct roar_vio_calls * vio;
+
+ if ( (vio = roar_get_connection_vio2(con)) == NULL )
+  return -1;
+
+ return roar_vrecv_message(vio, mes, data);
 }
 
@@ -464 +488 @@
 
 int roar_req (struct roar_connection * con, struct roar_message * mes, char ** data) {
- struct roar_vio_calls vio;
-
- if ( roar_get_connection_vio(con, &vio) == -1 )
-  return -1;
-
- return roar_vreq(&vio, mes, data);
+ struct roar_vio_calls * vio;
+
+ if ( (vio = roar_get_connection_vio2(con)) == NULL )
+  return -1;
+
+ return roar_vreq(vio, mes, data);
 }
 

roard/driver_portaudio.c

@@ -33 +33 @@
 #ifdef ROAR_HAVE_LIBPABLIO
  long flags = PABLIO_WRITE;
+#elif defined(ROAR_HAVE_LIBPORTAUDIO_V0_19)
+ PaError err;
+ PaStreamParameters params;
 #endif
 
@@ -102 +105 @@
 
  return 0;
+#elif defined(ROAR_HAVE_LIBPORTAUDIO_V0_19)
+ params.device                    = Pa_GetDefaultOutputDevice();
+ params.channelCount              = info->channels;
+ params.sampleFormat              = fmt;
+ params.suggestedLatency          = Pa_GetDeviceInfo(params.device)->defaultLowOutputLatency;
+ params.hostApiSpecificStreamInfo = NULL;
+
+ // TODO: FIXME: use libroar for this.
+ self->framesize = info->bits * info->channels / 8;
+
+ // Sets up blocking I/O stream.
+#if 0
+ err = Pa_OpenStream(&(self->stream),
+                     NULL,
+                     &params,
+                     info->rate,
+                     128 /*FIXME:frames*/,
+                     paClipOff,
+                     NULL,
+                     NULL
+                    );
+#endif
+
+ if ( err != paNoError ) {
+  ROAR_ERR("driver_portaudio_open(*): Could not open PortAudio device: \"%s\".", Pa_GetErrorText(err));
+  roar_mm_free(self);
+  return -1;
+ }
+
+ err = Pa_StartStream(self->stream);
+
+ if ( err != paNoError ) {
+  ROAR_ERR("driver_portaudio_open(*): Could not start stream: \"%s\".", Pa_GetErrorText(err));
+  roar_mm_free(self);
+  return -1;
+ }
+
+ return 0;
 #else
  return -1;
@@ -110 +151 @@
  struct driver_portaudio * self = vio->inst;
 
+ // TODO: cleanup common code.
+
 #ifdef ROAR_HAVE_LIBPABLIO
  CloseAudioStream(self->ostream);
@@ -116 +159 @@
 
  roar_mm_free(self);
+
+ return 0;
+#elif defined(ROAR_HAVE_LIBPORTAUDIO_V0_19)
+ if ( (self != NULL) && (self->stream != NULL) ) {
+  Pa_StopStream(self->stream);
+  Pa_CloseStream(self->stream);
+ }
+
+ roar_mm_free(self);
+
+ Pa_Terminate();
 
  return 0;
@@ -132 +186 @@
  ROAR_DBG("driver_portaudio_write(vio=%p, buf=%p, count=%llu) = ? // PABLIO mode", vio, buf, (long long unsigned int)count);
  return WriteAudioStream(self->ostream, buf, count) * self->ostream->bytesPerFrame;
+#elif defined(ROAR_HAVE_LIBPORTAUDIO_V0_19)
+ size_t write_frames = count / self->framesize;
+ PaError err;
+
+ ROAR_DBG("driver_portaudio_write(vio=%p, buf=%p, size=%llu) = ?", vio, buf, (long long unsigned int)size);
+
+ // I'm not 100% sure if you could write arbitrary number of frames to Pa_WriteStream(), but it seems to be backend dependent.
+ err = Pa_WriteStream(self->stream, buf, write_frames);
+
+ if ( err < 0 && err != paOutputUnderflowed )
+  return -1;
+
+ // PA always seems to write requested size, or it will error out.
+ return count;
 #else
  return -1;

roard/include/driver_portaudio.h

@@ -27 +27 @@
 #define _DRIVER_PORTAUDIO_H_
 
+//#undef ROAR_HAVE_LIBPABLIO
+//#define ROAR_HAVE_LIBPORTAUDIO_V0_19
+
 #ifdef ROAR_HAVE_LIBPORTAUDIO
-#if defined(ROAR_HAVE_LIBPABLIO)
+#if defined(ROAR_HAVE_LIBPABLIO) || defined(ROAR_HAVE_LIBPORTAUDIO_V0_19)
 #define _DRIVER_PORTAUDIO_CAN_OPERATE
 #endif
@@ -38 +41 @@
 #ifdef ROAR_HAVE_LIBPABLIO
  PABLIO_Stream * ostream;
+#elif defined(ROAR_HAVE_LIBPORTAUDIO_V0_19)
+ PaStream *stream;
+ int framesize;
 #endif
 };
+
+typedef struct {
+/*
+ params.device                    = Pa_GetDefaultOutputDevice();
+ params.channelCount              = info->channels;
+ params.sampleFormat              = fmt;
+ params.suggestedLatency          = Pa_GetDeviceInfo(params.device)->defaultLowOutputLatency;
+ params.hostApiSpecificStreamInfo = NULL;
+*/
+ void * device;
+ int channelCount;
+ PaSampleFormat sampleFormat;
+ int suggestedLatency;
+ void * hostApiSpecificStreamInfo;
+} PaStreamParameters;
+
+#define paOutputUnderflowed -1
+
+void *  Pa_GetDefaultOutputDevice(void);
+// Pa_WriteStream(device->stream, buf, write_frames);
+PaError  Pa_WriteStream(PaStream * stream, void *, size_t);
+PaError Pa_StartStream(PaStream * stream);
+PaError Pa_StopStream(PaStream * stream);
+PaError Pa_CloseStream(PaStream * stream);
 
 int driver_portaudio_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream);