Changeset 2469:e9f81bfa4020 in roaraudio

Timestamp:

08/22/09 02:34:25 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

alloc buffers, and free them again

Location:

roard

Files:

• include/ssynth.h (modified) (1 diff)
• ssynth.c (modified) (1 diff)

roard/include/ssynth.h

@@ -53 +53 @@
   int stage;
   char vv_down, vv_up;
-  struct roar_note_octave note;
-  struct roar_synth_state synth;
-  struct roar_fader_state fader;
-  struct roar_buffer      buf;
+  struct roar_note_octave   note;
+  struct roar_synth_state   synth;
+  struct roar_fader_state   fader;
+  struct roar_buffer      * buf;
  } notes[SSYNTH_NOTES_MAX];
 } g_ssynth;

roard/ssynth.c

@@ -84 +84 @@
 
 int ssynth_free (void) {
+ int i;
+
  if ( !ssynth_conf.enable )
   return 0;
 
+ for (i = 0; i < SSYNTH_NOTES_MAX; i++) {
+  if ( g_ssynth.notes[i].buf != NULL ) {
+   roar_buffer_free(g_ssynth.notes[i].buf);
+   g_ssynth.notes[i].buf = NULL;
+  }
+ }
+
  return streams_delete(g_ssynth.stream);
 }
 
 int ssynth_update (void) {
+ struct roar_stream_server * ss;
+ struct roar_stream        *  s;
+ struct roar_buffer        * buf;
+ size_t buflen;
+ size_t needlen;
+ int i;
+
+ if ( !ssynth_conf.enable )
+  return 0;
+
+ if ( streams_get(g_ssynth.stream, &ss) == -1 ) {
+  return -1;
+ }
+
+ s = ROAR_STREAM(ss);
+
+ needlen = ROAR_OUTPUT_CALC_OUTBUFSIZE(&(s->info));
+
+ for (i = 0; i < SSYNTH_NOTES_MAX; i++) {
+  if ( g_ssynth.notes[i].stage != SSYNTH_STAGE_UNUSED ) {
+   if ( g_ssynth.notes[i].buf == NULL ) {
+    if ( roar_buffer_new(&buf, needlen) == -1 )
+     continue;
+
+    g_ssynth.notes[i].buf = buf;
+   } else {
+    buf = g_ssynth.notes[i].buf;
+
+    if ( roar_buffer_get_len(buf, &buflen) == -1 )
+     continue;
+
+    if ( buflen < needlen ) {
+     if ( roar_buffer_set_len(buf, needlen) == -1 )
+      continue;
+    }
+   }
+  }
+ }
+
  return -1;
 }