Changeset 4969:d0b8acb5121f in roaraudio

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.

Files:

• ChangeLog (modified) (1 diff)
• libroar.ckport (modified) (7 diffs)
• libroarsndio/libroarsndio.c (modified) (8 diffs)

ChangeLog

@@ -12 +12 @@
         * Added simple memmgr (memory Manager) code.
         * Updated libroarpulse, includes converting libroarpulse-simple to VS API.
+        * Added support for OpenBSD sndio's new TCP connection syntax.
 
 v. 0.4beta5 - Tue Apr 26 2011 08:42 CEST

libroar.ckport

@@ -7 +7 @@
 roar_cdrom_run_cdparanoia       unknown
 roar_vio_open_get_cookie        unknown
-_ROAR_MLOCK                     internal
-_roardl2ldl                     internal
+roar_reset                      wip     Do not use yet
 
 # VIO:
+roar_vio_clear_calls            ok
+
 roar_vio_close                  ok
 
@@ -154 +155 @@
 roar_vio_cmd_ctl                internal
 
-roar_vio_open_gzip              wip     Currently requires cmd vio
+roar_vio_open_gzip              legacy  Use roar_vio_open_zlib
+
 roar_vio_open_gpg               wip     Currently requires cmd vio
 roar_vio_open_pgp_decrypt       wip     Currently requires cmd vio
@@ -297 +299 @@
 roar_vio_open_misc              ok
 roar_vio_open_misc_by_name      ok
+
+# VIO zlib:
+roar_vio_open_zlib              ok
+
+roar_vio_zlib_close             internal
+roar_vio_zlib_ctl               internal
+roar_vio_zlib_lseek             internal
+roar_vio_zlib_nonblock          internal
+roar_vio_zlib_read              internal
+roar_vio_zlib_sync              internal
+roar_vio_zlib_write             internal
+
+_set_error                      internal
+_zalloc                         internal
+_zfree                          internal
 
 # Buffer:
@@ -364 +381 @@
 roar_client_set_proto           ok
 roar_client_pass                ok
+roar_client_exec                ok
 
 # Streams:
@@ -578 +596 @@
 
 # MemMgr:
-roar_mm_calloc                  wip
-roar_mm_malloc                  wip
-roar_mm_free                    wip
-roar_mm_realloc                 wip
-roar_mm_strdup                  wip
+roar_mm_calloc                  ok
+roar_mm_malloc                  ok
+roar_mm_free                    ok
+roar_mm_realloc                 ok
 roar_mm_memdup                  ok
+roar_mm_strdup                  ok
+roar_mm_strndup                 ok
+roar_mm_strlen                  ok
+roar_mm_strnlen                 ok
+
+roar_mm_mlock                   ok
+roar_mm_munlock                 ok
+
+_ROAR_MLOCK                     legacy  Use roar_mm_mlock
 
 # Meta Data:
@@ -631 +657 @@
 roar_dl_ra_init                 ok
 roar_dl_errstr                  ok
+
+_roardl2ldl                     internal
 
 # RoarSLP:
@@ -889 +917 @@
 # Timing stuff:
 roar_usleep                     ok
+roar_sleep                      ok
 
 !TARGET: libroardsp0

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);
 }