Changeset 5301:f3e9cd30574d in roaraudio for roard/streams.c

Timestamp:

11/25/11 18:20:03 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

move away from roar_buffer_add() (See: #126)

File:

• roard/streams.c (modified) (7 diffs)

roard/streams.c

@@ -1945 +1945 @@
 
 
-int stream_add_buffer  (int id, struct roar_buffer * buf) {
+int stream_add_buffer  (int id, struct roar_buffer ** buf) {
  ROAR_DBG("stream_add_buffer(id=%i, buf=%p) = ?", id, buf);
 
@@ -1951 +1951 @@
 
  if ( g_streams[id]->buffer == NULL ) {
-  g_streams[id]->buffer = buf;
+  g_streams[id]->buffer = *buf;
+  *buf = NULL;
   ROAR_DBG("stream_add_buffer(id=%i, buf=%p) = 0", id, buf);
   return 0;
@@ -1957 +1958 @@
 
  ROAR_DBG("stream_add_buffer(id=%i, buf=%p) = ?", id, buf);
- return roar_buffer_add(g_streams[id]->buffer, buf);
+ return roar_buffer_moveinto(g_streams[id]->buffer, buf);
 }
 
@@ -2041 +2042 @@
 }
 
-int stream_prethru_add(int id, struct roar_buffer * buf) {
+int stream_prethru_add(int id, struct roar_buffer ** buf) {
  register struct roar_stream_server *  ss;
 
@@ -2050 +2051 @@
 
  if ( ss->prethru == NULL ) {
-  ss->prethru = buf;
+  ss->prethru = *buf;
+  *buf = NULL;
   return 0;
  }
 
- if ( roar_buffer_add(ss->prethru, buf) == -1 ) {
+ if ( roar_buffer_moveinto(ss->prethru, buf) == -1 ) {
   return -1;
  }
@@ -2066 +2068 @@
  _CHECK_SID(id);
 
- if ( roar_buffer_new(&buffer, len) == -1 )
-  return -1;
-
- if ( roar_buffer_get_data(buffer, buf) == -1 ) {
-  roar_buffer_free(buffer);
-  return -1;
- }
-
- if ( stream_prethru_add(id, buffer) == -1 ) {
+ if ( roar_buffer_new_data(&buffer, len, buf) == -1 )
+  return -1;
+
+ if ( stream_prethru_add(id, &buffer) == -1 ) {
   roar_buffer_free(buffer);
   return -1;
@@ -2263 +2260 @@
 
   if ( roar_buffer_set_len(b, req) != -1 ) {
-   if ( stream_add_buffer(id, b) != -1 )
+   if ( stream_add_buffer(id, &b) != -1 )
     return 0;