Changeset 3116:8ed19f241788 in roaraudio

Timestamp:

01/11/10 18:41:07 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

get tantalos basicly working

Location:

libroar

Files:

• vio_dstr.c (modified) (3 diffs)
• vio_tantalos.c (modified) (1 diff)

libroar/vio_dstr.c

@@ -126 +126 @@
  {ROAR_VIO_DSTR_OBJT_MAGIC,      "magic",
       {ROAR_VIO_DEF_TYPE_EOL}},
+ {ROAR_VIO_DSTR_OBJT_TANTALOS,   "tantalos",
+      {ROAR_VIO_DEF_TYPE_EOL}},
 
  {ROAR_VIO_DSTR_OBJT_INTERNAL, "INTERNAL",
@@ -400 +402 @@
    case ROAR_VIO_DSTR_OBJT_TLS:
    case ROAR_VIO_DSTR_OBJT_MAGIC:
+   case ROAR_VIO_DSTR_OBJT_TANTALOS:
      if ( tmp[0] )
       c->need_vio = 0;
@@ -691 +694 @@
       }
      break;
+    case ROAR_VIO_DSTR_OBJT_TANTALOS:
+      if ( roar_vio_open_tantalos(tc, prev, c->dst, c->def) == -1 ) {
+       _ret(-1);
+      }
+     break;
     case ROAR_VIO_DSTR_OBJT_SSL1:
     case ROAR_VIO_DSTR_OBJT_SSL2:

libroar/vio_tantalos.c

@@ -54 +54 @@
   strcat(url, key);
 
-  ROAR_DBG("roar_vio_open_tantalos(*): url='%s'");
+  ROAR_DBG("roar_vio_open_tantalos(*): url='%s'", url);
 
-  if ( roar_vio_open_dstr(calls, url, odef, 1) == 0 )
+  if ( roar_vio_open_dstr_vio(calls, url, odef, 1, NULL) == 0 )
    return 0;
+
+  memset(calls, 0, sizeof(*calls));
  }