Changeset 4969:d0b8acb5121f in roaraudio for libroarsndio

Timestamp:

05/16/11 12:11:55 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support for OpenBSD sndio's new TCP connection syntax.

File:

• libroarsndio/libroarsndio.c (modified) (8 diffs)

libroarsndio/libroarsndio.c

@@ -71 +71 @@
  }
 
- if ( (optsoffset = strstr(unitoffset, ".")) != NULL ) {
+ if ( (optsoffset = strstr(unitoffset, "/")) != NULL ) {
+  *optsoffset = 0;
+  return unitoffset;
+ } else if ( (optsoffset = strstr(unitoffset, ".")) != NULL ) {
   // TODO: add some code to strip the options of the end
   return name;
@@ -103 +106 @@
  struct sio_hdl * hdl = NULL;
  int is_midi = 0;
+ char * tmp;
 
  if ( (hdl = roar_mm_malloc(sizeof(struct sio_hdl))) == NULL )
@@ -108 +112 @@
 
  memset(hdl, 0, sizeof(struct sio_hdl));
+ hdl->device = NULL;
 
  switch (mode) {
@@ -113 +118 @@
     hdl->dir = ROAR_DIR_PLAY;
    break;
+  case SIO_REC:
+    hdl->dir = ROAR_DIR_PLAY;
+   break;
   case MIO_OUT:
     is_midi = 1;
@@ -123 +131 @@
 
   // unsupported:
-  case SIO_REC:
   case SIO_PLAY|SIO_REC:
   case MIO_OUT|MIO_IN:
@@ -141 +148 @@
  }
 
- name = sndio_to_roar_names((char*) name);
-
- if ( roar_simple_connect(&(hdl->con), (char*) name, "libroarsndio") == -1 ) {
+ if ( name != NULL ) {
+  tmp = roar_mm_strdup(name);
+  name = sndio_to_roar_names(tmp);
+
+  if ( name != NULL )
+   hdl->device = roar_mm_strdup(name);
+
+  roar_mm_free(tmp);
+ }
+
+ if ( roar_simple_connect(&(hdl->con), hdl->device, "libroarsndio") == -1 ) {
+  roar_mm_free(hdl->device);
   roar_mm_free(hdl);
   return NULL;
@@ -151 +167 @@
 
  hdl->stream_opened = 0;
-
- if ( name != NULL )
-  hdl->device = strdup(name);
 
  if ( is_midi ) {
@@ -179 +192 @@
  roar_disconnect(&(hdl->con));
 
+ if ( hdl->device != NULL )
+  roar_mm_free(hdl->device);
  roar_mm_free(hdl);
 }