Changeset 4821:eb99f5b29f0d in roaraudio

Timestamp:

03/28/11 16:02:32 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

corrected error in case recsource stream has diffrent info struct than waveform mixer

File:

• roard/waveform.c (modified) (1 diff)

roard/waveform.c

@@ -109 +109 @@
 int waveform_update_inputs (void) {
  struct roar_buffer * buf;
- size_t len;
+ void * bufdata;
 
  // read recorded data...:
  if ( streams_recsource_id != -1 ) {
-  len = g_input_buffer_len;
-  if ( stream_shift_out_buffer(streams_recsource_id, g_input_buffer, &len) == -1 ) {
-   ROAR_DBG("waveform_update_mixer(void): streams_is_new(%i) = %i", streams_recsource_id, streams_is_new(streams_recsource_id));
-   if ( streams_is_new(streams_recsource_id) ) {
-    ROAR_DBG("waveform_update_mixer(void): can not read record buffer: stream %i is still marked new.", streams_recsource_id);
+  if ( streams_get_outputbuffer(streams_recsource_id, &bufdata, g_input_buffer_len) == -1 ) {
+   ROAR_WARN("waveform_update_mixer(void): can not request output buffer for record stream %i.", streams_recsource_id);
+  } else {
+   if ( streams_fill_mixbuffer2(streams_recsource_id, g_sa) == -1 ) {
+    ROAR_WARN("waveform_update_mixer(void): can not fill output buffer for record stream %i.", streams_recsource_id);
    } else {
-    ROAR_WARN("waveform_update_mixer(void): can not read record buffer.");
+    memcpy(g_input_buffer, bufdata, g_input_buffer_len);
    }
-   memset(g_input_buffer, 0, g_input_buffer_len);
-  } else {
-   if ( len < g_input_buffer_len )
-    memset(g_input_buffer+len, 0, g_input_buffer_len-len);
   }
  }