Changeset 4119:e5ff9c330a41 in roaraudio

Timestamp:

08/08/10 15:38:02 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

coorected number of bits, corrected small memory overlapping bug in passmixer flag handling

File:

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

roard/streams.c

@@ -944 +944 @@
     if ( streams_get_flag(i, ROAR_FLAG_PASSMIXER) == 1 ) {
      if ( streams_get_subsys(i) == subsys ) {
-      memcpy(&(pmss->mixer), &(ss->mixer), sizeof(struct roar_mixer_settings));
+      if ( &(pmss->mixer) != &(ss->mixer) ) {
+       memcpy(&(pmss->mixer), &(ss->mixer), sizeof(struct roar_mixer_settings));
+      }
 
       // update hwmixers and the like but do not set mixer value recrusivly.
@@ -1158 +1160 @@
  if ( !streams_get_flag(id, ROAR_FLAG_HWMIXER) && !streams_get_flag(id, ROAR_FLAG_PASSMIXER) ) {
   ROAR_DBG("streams_fill_mixbuffer2(*): CALL roar_amp_pcm(*)...");
-  if ( roar_amp_pcm(outdata, info->bits, indata, 8*inlen / stream_info->bits, stream_info->channels, &(ss->mixer)) == -1 )
+  if ( roar_amp_pcm(outdata, stream_info->bits, indata, 8*inlen / stream_info->bits, stream_info->channels, &(ss->mixer)) == -1 )
    return -1;
  }