Changeset 2147:085a272b4e2b in roaraudio

Timestamp:

07/24/09 15:49:35 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

seperated things a bit

File:

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

roard/streams.c

@@ -1160 +1160 @@
  int     olen;
  int     need_to_free = 0;
+ int     is_the_same  = 1;
  ssize_t ret;
 
@@ -1203 +1204 @@
 
  if ( s->info.channels != g_sa->channels || s->info.bits  != g_sa->bits ||
-      s->info.rate     != g_sa->rate     || s->info.codec != g_sa->codec  ) {
+      s->info.rate     != g_sa->rate     || s->info.codec != g_sa->codec  )
+  is_the_same = 0;
+
+ if ( !is_the_same ) {
   olen = ROAR_OUTPUT_CALC_OUTBUFSIZE(&(s->info)); // we hope g_output_buffer_len
                                                   // is ROAR_OUTPUT_CALC_OUTBUFSIZE(g_sa) here
@@ -1216 +1220 @@
 
   ROAR_DBG("streams_send_mon(id=%i): obuf=%p, olen=%i", id, obuf, olen);
-
-  if ( roar_conv(obuf, g_output_buffer, ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels, g_sa, &(s->info)) == -1 ) {
-   _return(-1);
-  }
  } else {
   obuf = g_output_buffer;
   olen = g_output_buffer_len;
+ }
+
+ if ( !is_the_same ) {
+  if ( roar_conv(obuf, g_output_buffer, ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels, g_sa, &(s->info)) == -1 ) {
+   _return(-1);
+  }
  }