Changeset 5300:190af1adf91c in roaraudio

Timestamp:

11/25/11 10:05:31 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

first commit to move away from old roar_buffer_add() to roar_buffer_moveinto() (See: #126)

Files:

• libroar/buffer.c (modified) (1 diff)
• libroar/vio_buffer_store.c (modified) (1 diff)
• libroar/vio_pipe.c (modified) (1 diff)
• libroar/vio_zlib.c (modified) (2 diffs)
• libroardsp/transcode.c (modified) (2 diffs)
• libroarpulse/stream.c (modified) (2 diffs)
• roarclients/roarmonhttp.c (modified) (2 diffs)

libroar/buffer.c

@@ -582 +582 @@
   memcpy(nd, od, cur->user_len);
 
-  _LIBROAR_IGNORE_RET(roar_buffer_add(*copy, new));
+  _LIBROAR_IGNORE_RET(roar_buffer_moveinto(*copy, &new));
 
   cur = cur->next;

libroar/vio_buffer_store.c

@@ -123 +123 @@
   self->in = nbuf;
  } else {
-  if ( roar_buffer_add(self->in, nbuf) == -1 ) {
+  if ( roar_buffer_moveinto(self->in, &nbuf) == -1 ) {
    roar_buffer_free(nbuf);
    return -1;

libroar/vio_pipe.c

@@ -348 +348 @@
      self->b.b[idx] = next;
     } else {
-     if ( roar_buffer_add(self->b.b[idx], next) == -1 ) {
+     if ( roar_buffer_moveinto(self->b.b[idx], &next) == -1 ) {
       roar_buffer_free(next);
       return -1;

libroar/vio_zlib.c

@@ -299 +299 @@
    self->inbuf = leftbuf;
   } else {
-   if ( roar_buffer_add(self->inbuf, leftbuf) == -1 ) {
+   if ( roar_buffer_moveinto(self->inbuf, &leftbuf) == -1 ) {
     roar_buffer_free(leftbuf);
     roar_err_set((self->decompressor_error = ROAR_ERROR_LOSTSYNC));
@@ -402 +402 @@
      self->outbuf = leftbuf;
     } else {
-     if ( roar_buffer_add(self->outbuf, leftbuf) == -1 ) {
+     if ( roar_buffer_moveinto(self->outbuf, &leftbuf) == -1 ) {
       roar_buffer_free(leftbuf);
       roar_err_set((self->compressor_error = ROAR_ERROR_LOSTSYNC));

libroardsp/transcode.c

@@ -206 +206 @@
   }
 
-  if ( roar_buffer_new(&bufbuf, curlen) == -1 )
+  if ( roar_buffer_new_data(&bufbuf, curlen, &bufdata) == -1 )
    return -1;
-
-  if ( roar_buffer_get_data(bufbuf, &bufdata) == -1 ) {
-   roar_buffer_free(bufbuf);
-   return -1;
-  }
 
   if ( state->encode ) {
@@ -238 +233 @@
  } else {
   if ( state->encode ) {
-   if ( roar_buffer_new(&bufbuf, len) == -1 )
-    return -1;
-
-   if ( roar_buffer_get_data(bufbuf, &bufdata) == -1 ) {
+   if ( roar_buffer_new_data(&bufbuf, len, &bufdata) == -1 )
+    return -1;
+
+   memcpy(bufdata, buf, len);
+
+   if ( roar_buffer_moveinto(state->iobuffer, &bufbuf) == -1 ) {
     roar_buffer_free(bufbuf);
     return -1;
    }
 
-   memcpy(bufdata, buf, len);
-
-   if ( roar_buffer_add(state->iobuffer, bufbuf) == -1 ) {
-    roar_buffer_free(bufbuf);
-    return -1;
-   }
-
    if ( roar_buffer_ring_stats(state->iobuffer, &ringstats) == -1 )
     return -1;
 
-   if ( roar_buffer_new(&bufbuf, state->packet_len) == -1 )
-    return -1;
-
-   if ( roar_buffer_get_data(bufbuf, &bufdata) == -1 ) {
-    roar_buffer_free(bufbuf);
-    return -1;
-   }
+   if ( roar_buffer_new_data(&bufbuf, state->packet_len, &bufdata) == -1 )
+    return -1;
 
    while ( (ssize_t)ringstats.bytes > state->packet_len ) {

libroarpulse/stream.c

@@ -256 +256 @@
      s->iobuffer = buf;
     } else {
-     if ( roar_buffer_add(s->iobuffer, buf) == -1 ) {
+     if ( roar_buffer_moveinto(s->iobuffer, &buf) == -1 ) {
       roar_buffer_free(buf);
       return;
@@ -463 +463 @@
   p->iobuffer = buf;
  } else {
-  if ( roar_buffer_add(p->iobuffer, buf) == -1 )
+  if ( roar_buffer_moveinto(p->iobuffer, &buf) == -1 )
    return -1;
  }

roarclients/roarmonhttp.c

@@ -101 +101 @@
   } else {
    if ( vios[0].eventsa & ROAR_VIO_SELECT_READ ) { // we can read!
-    if ( roar_buffer_new(&cur, BUFSIZE) == -1 )
-     return -1;
-
-    if ( roar_buffer_get_data(cur, &data) == -1 )
+    if ( roar_buffer_new_data(&cur, BUFSIZE, &data) == -1 )
      return -1;
 
@@ -131 +128 @@
       ring = cur;
      } else {
-      if ( roar_buffer_add(ring, cur) == -1 ) {
+      if ( roar_buffer_moveinto(ring, &cur) == -1 ) {
        ROAR_ERR("stream(dest=%p, src=%p): Can not append buffer to ring: %s",
                 dest, src, roar_error2str(roar_error));