Changeset 4288:8346a61bd6a5 in roaraudio

Timestamp:

08/29/10 01:20:06 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make LTM work on outputs and mixer streams, too.

Location:

roard

Files:

• streams.c (modified) (1 diff)
• waveform.c (modified) (1 diff)

roard/streams.c

@@ -1951 +1951 @@
  }
 
+ streams_ltm_calc(id, &(s->info), ip, (ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels*g_sa->bits)/8);
+
  if ( !is_the_same ) {
   if ( roar_conv(obuf, ip, ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels, g_sa, &(s->info)) == -1 ) {

roard/waveform.c

@@ -67 +67 @@
  }
 
- if ( !need_vol_change(ROAR_STREAM(g_waveform_mixer.ss)->info.channels, &(g_waveform_mixer.ss->mixer)) )
-  return 0;
+ if ( need_vol_change(ROAR_STREAM(g_waveform_mixer.ss)->info.channels, &(g_waveform_mixer.ss->mixer)) ) {
+  roar_amp_pcm(g_output_buffer, g_sa->bits, g_output_buffer,
+               ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels, g_sa->channels,
+               &(g_waveform_mixer.ss->mixer));
+ }
 
- roar_amp_pcm(g_output_buffer, g_sa->bits, g_output_buffer,
-              ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels, g_sa->channels,
-              &(g_waveform_mixer.ss->mixer));
+ streams_ltm_calc(g_waveform_mixer.stream, &(ROAR_STREAM(g_waveform_mixer.ss)->info), g_output_buffer, (g_sa->bits*ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels)/8);
 
  return 0;