Changeset 5348:83fcc9598253 in roaraudio for libroarpulse

Timestamp:

12/11/11 12:38:30 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Converted roar_buffer API to fully use refcounter (Closes: #126)

File:

• libroarpulse/stream.c (modified) (3 diffs)

libroarpulse/stream.c

@@ -235 +235 @@
    break;
   case PA_STREAM_RECORD:
-    if ( roar_buffer_new(&buf, s->fragments.size) == -1 )
+    if ( roar_buffer_new_data(&buf, s->fragments.size, &data) == -1 )
      return;
-
-    if ( roar_buffer_get_data(buf, &data) == -1 ) {
-     roar_buffer_free(buf);
-     return;
-    }
 
     if ( (ret = roar_vio_read(&(s->vio), data, s->fragments.size)) < 1 ) {
@@ -442 +437 @@
  // seems we have a valid write from here.
 
- if ( roar_buffer_new(&buf, length) == -1 ) {
-  if ( free_cb != NULL )
-   free_cb((void*)data);
-
-  return -1;
- }
-
- if ( roar_buffer_get_data(buf, &bufdata) == -1 ) {
+ if ( roar_buffer_new_data(&buf, length, &bufdata) == -1 ) {
   if ( free_cb != NULL )
    free_cb((void*)data);
@@ -463 +451 @@
   p->iobuffer = buf;
  } else {
-  if ( roar_buffer_moveinto(p->iobuffer, &buf) == -1 )
+  if ( roar_buffer_moveinto(p->iobuffer, &buf) == -1 ) {
+   roar_buffer_free(buf);
    return -1;
+  }
  }