Changeset 2370:20fe0615bbe9 in roaraudio

Timestamp:

08/15/09 03:58:43 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added MIDI support to sndio output driver

Location:

roard

Files:

• driver.c (modified) (1 diff)
• driver_sndio.c (modified) (10 diffs)
• include/driver_sndio.h (modified) (1 diff)

roard/driver.c

@@ -55 +55 @@
 #endif
 #ifdef ROAR_HAVE_LIBSNDIO
- {"sndio", "OpenBSD sndio", "/dev/audio, /tmp/aucat-<uid>/default", DRV_FLAG_NONE, ROAR_SUBSYS_WAVEFORM,
+ {"sndio", "OpenBSD sndio", "/dev/audio, /tmp/aucat-<uid>/default", DRV_FLAG_NONE, ROAR_SUBSYS_WAVEFORM|ROAR_SUBSYS_MIDI,
   NULL, NULL, driver_sndio_open},
 #endif

roard/driver_sndio.c

@@ -42 +42 @@
 }
 
-#define er() if ( self->handle ) sio_close(self->handle); if ( self->device ) free(self->device); free(self); return -1
+#define er() if ( self->shandle ) sio_close(self->shandle); \
+             if ( self->mhandle ) mio_close(self->mhandle); \
+             if ( self->device  ) free(self->device);       \
+             free(self);                                    \
+             return -1
+
 int driver_sndio_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) {
  struct driver_sndio * self = NULL;
@@ -55 +60 @@
 
  self->ssid = -1;
+
+ if ( sstream == NULL ) {
+  self->stream = NULL;
+  self->dir    = ROAR_DIR_OUTPUT;
+ } else {
+  self->stream = sstream;
+  self->dir    = ROAR_STREAM(sstream)->dir;
+
+  switch (self->dir) {
+   case ROAR_DIR_OUTPUT:
+   case ROAR_DIR_MONITOR:
+     self->dir = ROAR_DIR_OUTPUT;
+    break;
+   case ROAR_DIR_MIDI_OUT:
+     info->channels = 16;
+     info->codec    = ROAR_CODEC_MIDI;
+     info->bits     = 8;
+    break;
+   default:
+     er();
+  }
+ }
 
  if ( device != NULL )
@@ -66 +93 @@
  if ( driver_sndio_open_device(self) == -1 ) {
   ROAR_ERR("driver_sndio_open(*): Can not open audio device");
-  if ( self->handle )
-   sio_close(self->handle);
-
-  if ( self->device )
-   free(self->device);
-
-  free(self);
-
-  return -1;
-//  er();
+  er();
  }
 
  ROAR_DBG("driver_sndio_open(*): sndio devices opened :)");
-
- if ( sstream != NULL )
-  driver_sndio_ctl(inst, ROAR_VIO_CTL_SET_SSTREAM, sstream);
 
  return 0;
@@ -90 +105 @@
  struct driver_sndio * self = vio->inst;
 
- if ( self->handle != NULL )
-  sio_close(self->handle);
+ if ( self->shandle != NULL )
+  sio_close(self->shandle);
+
+ if ( self->mhandle != NULL )
+  mio_close(self->mhandle);
 
  if ( self->device != NULL )
@@ -103 +121 @@
 int     driver_sndio_open_device  (struct driver_sndio * self) {
 
- if ( (self->handle = sio_open(self->device, SIO_PLAY, 0)) == NULL ) {
-  ROAR_ERR("driver_sndio_open_device(*): Can not open sndio audio device");
-  return -1;
- }
-
- self->need_config = 1;
-
+ ROAR_DBG("driver_sndio_open_device(*) = ?");
+ switch (self->dir) {
+  case ROAR_DIR_OUTPUT:
+    if ( (self->shandle = sio_open(self->device, SIO_PLAY, 0)) == NULL ) {
+     ROAR_ERR("driver_sndio_open_device(*): Can not open sndio audio device");
+     return -1;
+    }
+   self->need_config = 1;
+   break;
+  case ROAR_DIR_MIDI_OUT:
+    if ( (self->mhandle = mio_open(self->device, MIO_OUT, 0)) == NULL ) {
+     ROAR_ERR("driver_sndio_open_device(*): Can not open sndio MIDI device");
+     return -1;
+    }
+   break;
+  default:
+    return -1;
+ }
+
+ ROAR_DBG("driver_sndio_open_device(*) = ?");
  return 0;
 }
@@ -144 +175 @@
  }
 
- if ( sio_setpar(self->handle, &par) == 0 ) {
+ if ( sio_setpar(self->shandle, &par) == 0 ) {
   ROAR_ERR("driver_sndio_config_device(*): Can not set stream parameters");
   return -1;
  }
 
- if ( sio_start(self->handle) == 0 ) {
+ if ( sio_start(self->shandle) == 0 ) {
   ROAR_ERR("driver_sndio_config_device(*): Can not start stream");
   return -1;
@@ -165 +196 @@
 ssize_t driver_sndio_write        (struct roar_vio_calls * vio, void *buf, size_t count) {
  struct driver_sndio * self = vio->inst;
+
+ ROAR_DBG("driver_sndio_write(*) = ?");
 
  if ( self->need_config ) {
@@ -172 +205 @@
  }
 
- return sio_write(self->handle, buf, count);
+ ROAR_DBG("driver_sndio_write(*) = ?");
+
+ switch (self->dir) {
+  case ROAR_DIR_OUTPUT:
+    return sio_write(self->shandle, buf, count);
+   break;
+  case ROAR_DIR_MIDI_OUT:
+    return mio_write(self->mhandle, buf, count);
+   break;
+ }
+
+ ROAR_WARN("driver_sndio_write(*): Driver changed direction to something not supported, this should not happen");
+
+ return -1;
 }
 
@@ -191 +237 @@
    break;
   case data(ROAR_VIO_CTL_SET_SSTREAM)
+    // FIXME: we should do some better error handling here:
+    if ( ROAR_STREAM(data)->dir != self->dir ) return -1;
     self->stream = data;
    break;
@@ -213 +261 @@
       return -1;
     }
-    return sio_setvol(self->handle, d) == 0 ? -1 : 0;
+    return sio_setvol(self->shandle, d) == 0 ? -1 : 0;
    break;
   default:

roard/include/driver_sndio.h

@@ -27 +27 @@
 
 struct driver_sndio {
+ int    dir;
  char * device;
- struct sio_hdl * handle;
+ struct sio_hdl * shandle;
+ struct mio_hdl * mhandle;
  struct roar_audio_info info;
  int need_reopen;