Changeset 2151:1871577d2258 in roaraudio

Timestamp:

07/24/09 17:35:34 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added stream_outputbuffer_request() and stream_outputbuffer_destroy(): functions to manage a per stream output buffer

Location:

roard

Files:

• include/streams.h (modified) (2 diffs)
• streams.c (modified) (3 diffs)

roard/include/streams.h

@@ -78 +78 @@
  char * name;
  int ready;
+ struct roar_buffer * outputbuffer;
 } * g_streams[ROAR_STREAMS_MAX];
 
@@ -120 +121 @@
 int stream_unshift_buffer (int id, struct roar_buffer *  buf);
 
+int stream_outputbuffer_request(int id, struct roar_buffer ** buf, size_t len);
+int stream_outputbuffer_destroy(int id);
+
 int streams_check      (int id);
 int streams_send_mon   (int id);

roard/streams.c

@@ -95 +95 @@
    s->primary         =  0;
    s->ready           =  0;
+   s->outputbuffer    = NULL;
 
    s->mixer.scale     = 65535;
@@ -176 +177 @@
   client_stream_delete(s->client, id);
  }
+
+ stream_outputbuffer_destroy(id);
 
  if ( s->buffer != NULL )
@@ -1038 +1041 @@
 }
 
+int stream_outputbuffer_request(int id, struct roar_buffer ** buf, size_t len) {
+ register struct roar_stream_server *  ss;
+ size_t buflen;
+ int ret;
+
+ if ( (ss = g_streams[id]) == NULL )
+  return -1;
+
+ if ( buf != NULL ) /* just be be sure */
+  *buf = NULL;
+
+ if ( ss->outputbuffer != NULL ) {
+  if ( roar_buffer_get_len(ss->outputbuffer, &buflen) == 0 ) {
+   if ( buflen == len ) {
+    if ( buf != NULL )
+     *buf = ss->outputbuffer;
+    return 0;
+   } else if ( buflen > len ) {
+    if ( roar_buffer_set_len(ss->outputbuffer, len) == 0 ) {
+     if ( buf != NULL )
+      *buf = ss->outputbuffer;
+     return 0;
+    }
+   }
+  }
+
+  // if the buffer is not suitable:
+
+  ret = roar_buffer_free(ss->outputbuffer);
+  ss->outputbuffer = NULL;
+  if ( ret == -1 )
+   return ret;
+ }
+
+ if ( roar_buffer_new(&(ss->outputbuffer), len) == -1 )
+  return -1;
+
+ if ( buf != NULL )
+  *buf = ss->outputbuffer;
+
+ return 0;
+}
+
+int stream_outputbuffer_destroy(int id) {
+ int ret;
+ register struct roar_stream_server *  ss;
+
+ if ( (ss = g_streams[id]) == NULL )
+  return -1;
+
+ if ( ss->outputbuffer != NULL ) {
+  ret = roar_buffer_free(ss->outputbuffer);
+  ss->outputbuffer = NULL;
+  return ret;
+ }
+
+ return 0;
+}
+
 int streams_check  (int id) {
  int fh;