Changeset 4855:a55e1c122d46 in roaraudio

Timestamp:

04/11/11 11:40:13 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

first set of changes for PA v.19

Location:

roard

Files:

• driver_portaudio.c (modified) (8 diffs)
• include/driver_portaudio.h (modified) (2 diffs)

roard/driver_portaudio.c

@@ -3 +3 @@
 /*
  *      Copyright (C) Philipp 'ph3-der-loewe' Schafft - 2008-2011
+ *      Copyright (C) Hans-Kristian 'maister' Arntzen - 2010
  *
  *  This file is part of roard a part of RoarAudio,
@@ -33 +34 @@
 #ifdef ROAR_HAVE_LIBPABLIO
  long flags = PABLIO_WRITE;
-#elif defined(ROAR_HAVE_LIBPORTAUDIO_V0_19)
+#elif defined(ROAR_HAVE_PA19_VERSION_19)
  PaError err;
  PaStreamParameters params;
 #endif
+
+ if ( fh != -1 )
+  return -1;
 
  switch (info->bits) {
@@ -105 +109 @@
 
  return 0;
-#elif defined(ROAR_HAVE_LIBPORTAUDIO_V0_19)
+#elif defined(ROAR_HAVE_PA19_VERSION_19)
  params.device                    = Pa_GetDefaultOutputDevice();
  params.channelCount              = info->channels;
@@ -116 +120 @@
 
  // Sets up blocking I/O stream.
-#if 0
  err = Pa_OpenStream(&(self->stream),
                      NULL,
@@ -126 +129 @@
                      NULL
                     );
-#endif
 
  if ( err != paNoError ) {
@@ -161 +163 @@
 
  return 0;
-#elif defined(ROAR_HAVE_LIBPORTAUDIO_V0_19)
+#elif defined(ROAR_HAVE_PA19_VERSION_19)
  if ( (self != NULL) && (self->stream != NULL) ) {
   Pa_StopStream(self->stream);
@@ -179 +181 @@
 ssize_t driver_portaudio_write        (struct roar_vio_calls * vio, void *buf, size_t count) {
  struct driver_portaudio * self = vio->inst;
+#ifdef ROAR_HAVE_PA19_VERSION_19
+ size_t write_frames = count / self->framesize;
+ PaError err;
+#endif
 
  ROAR_DBG("driver_portaudio_write(vio=%p, buf=%p, count=%llu) = ?", vio, buf, (long long unsigned int)count);
@@ -186 +192 @@
  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;
+#elif defined(ROAR_HAVE_PA19_VERSION_19)
 
  ROAR_DBG("driver_portaudio_write(vio=%p, buf=%p, size=%llu) = ?", vio, buf, (long long unsigned int)size);

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) || defined(ROAR_HAVE_LIBPORTAUDIO_V0_19)
+#if defined(ROAR_HAVE_LIBPABLIO) || defined(ROAR_HAVE_PA19_VERSION_19)
 #define _DRIVER_PORTAUDIO_CAN_OPERATE
 #endif
@@ -41 +38 @@
 #ifdef ROAR_HAVE_LIBPABLIO
  PABLIO_Stream * ostream;
-#elif defined(ROAR_HAVE_LIBPORTAUDIO_V0_19)
+#elif defined(ROAR_HAVE_PA19_VERSION_19)
  PaStream *stream;
  int framesize;