Changeset 2508:49c691225a30 in roaraudio

Timestamp:

09/01/09 13:31:31 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

enable roar driver to use light and MIDI subsystem

Location:

roard

Files:

• driver.c (modified) (1 diff)
• driver_roar.c (modified) (2 diffs)

roard/driver.c

@@ -32 +32 @@
    NULL, driver_esd_close, driver_esd_open_vio},
 #endif
- { "roar", "RoarAudio driver", "localhost, remote.host.dom", DRV_FLAG_NONE, ROAR_SUBSYS_WAVEFORM,
+ { "roar", "RoarAudio driver", "localhost, remote.host.dom", DRV_FLAG_NONE,
+   ROAR_SUBSYS_WAVEFORM|ROAR_SUBSYS_MIDI|ROAR_SUBSYS_LIGHT,
    NULL, driver_roar_close, driver_roar_open_vio},
 #ifdef ROAR_HAVE_IO_POSIX

roard/driver_roar.c

@@ -26 +26 @@
 
 int driver_roar_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) {
+ int dir = ROAR_DIR_PLAY;
 
  if ( fh != -1 ) { // this is a connection to a roard, no roar_simple_*() interface avalible for this case
@@ -31 +32 @@
  }
 
- if ( (fh = roar_simple_play(info->rate, info->channels, info->bits, info->codec, device, "roard")) == -1 ) {
+ if ( sstream != NULL ) {
+  switch (ROAR_STREAM(sstream)->dir) {
+   case ROAR_DIR_OUTPUT:    dir = ROAR_DIR_PLAY;     break;
+   case ROAR_DIR_MIDI_OUT:  dir = ROAR_DIR_MIDI_IN;  break;
+   case ROAR_DIR_LIGHT_OUT: dir = ROAR_DIR_LIGHT_IN; break;
+// TODO: we need to know a real pos id for raw streams...
+//   case ROAR_DIR_RAW_OUT:   dir = ROAR_DIR_RAW_IN;   break;
+   default:
+     return -1;
+  }
+ }
+
+ if ( (fh = roar_simple_stream(info->rate, info->channels, info->bits, info->codec, device, dir, "roard")) == -1 ) {
   return -1;
  }