Changeset 2938:9c43303646df in roaraudio for roard/streams.c

Timestamp:

10/16/09 22:37:12 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

moved change of volume code out to libroardsp

File:

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

roard/streams.c

@@ -991 +991 @@
 
  if ( !streams_get_flag(id, ROAR_FLAG_HWMIXER) && !streams_get_flag(id, ROAR_FLAG_PASSMIXER) ) {
-  ROAR_DBG("streams_fill_mixbuffer2(*): CALL change_vol(*)...");
-  if ( change_vol(outdata, info->bits, outdata, 8*outlen / info->bits, info->channels, &(ss->mixer)) == -1 )
+  ROAR_DBG("streams_fill_mixbuffer2(*): CALL roar_amp_pcm(*)...");
+  if ( roar_amp_pcm(outdata, info->bits, outdata, 8*outlen / info->bits, info->channels, &(ss->mixer)) == -1 )
    return -1;
  }
@@ -1571 +1571 @@
 
  if ( !is_vol_eq ) {
-  if ( change_vol(obuf, g_sa->bits, ip, ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels, g_sa->channels, &(ss->mixer)) == -1 ) {
+  if ( roar_amp_pcm(obuf, g_sa->bits, ip, ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels, g_sa->channels, &(ss->mixer)) == -1 ) {
    _return(-1);
   }