Changeset 4956:dc85aeaedd54 in roaraudio for libroar/vio_dstr.c

Timestamp:

05/13/11 22:20:23 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Use zlib for gzip and zlib format (Closes: #29)

File:

• libroar/vio_dstr.c (modified) (3 diffs)

libroar/vio_dstr.c

@@ -154 +154 @@
       NULL, NULL,
       {ROAR_VIO_DEF_TYPE_EOL}},
+ {ROAR_VIO_DSTR_OBJT_ZLIB,       "zlib",
+      NULL, NULL,
+      {ROAR_VIO_DEF_TYPE_EOL}},
  {ROAR_VIO_DSTR_OBJT_BZIP2,      "bzip2",
       NULL, NULL,
@@ -537 +540 @@
    case ROAR_VIO_DSTR_OBJT_RTP2: // we currently only forward the defs
    case ROAR_VIO_DSTR_OBJT_GZIP:
+   case ROAR_VIO_DSTR_OBJT_ZLIB:
    case ROAR_VIO_DSTR_OBJT_BZIP2:
    case ROAR_VIO_DSTR_OBJT_PGP:
@@ -831 +835 @@
      break;
     case ROAR_VIO_DSTR_OBJT_GZIP:
-      if ( roar_vio_open_gzip(tc, prev, -1) == -1 ) {
+      //if ( roar_vio_open_gzip(tc, prev, -1) == -1 ) {
+      if ( roar_vio_open_zlib(tc, prev, -1, 1) == -1 ) {
+       _ret(-1);
+      }
+     break;
+    case ROAR_VIO_DSTR_OBJT_ZLIB:
+      //if ( roar_vio_open_gzip(tc, prev, -1) == -1 ) {
+      if ( roar_vio_open_zlib(tc, prev, -1, 0) == -1 ) {
        _ret(-1);
       }