Changeset 4119:e5ff9c330a41 in roaraudio
- Timestamp:
- 08/08/10 15:38:02 (14 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/streams.c
r4118 r4119 944 944 if ( streams_get_flag(i, ROAR_FLAG_PASSMIXER) == 1 ) { 945 945 if ( streams_get_subsys(i) == subsys ) { 946 memcpy(&(pmss->mixer), &(ss->mixer), sizeof(struct roar_mixer_settings)); 946 if ( &(pmss->mixer) != &(ss->mixer) ) { 947 memcpy(&(pmss->mixer), &(ss->mixer), sizeof(struct roar_mixer_settings)); 948 } 947 949 948 950 // 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) ) { 1159 1161 ROAR_DBG("streams_fill_mixbuffer2(*): CALL roar_amp_pcm(*)..."); 1160 if ( roar_amp_pcm(outdata, info->bits, indata, 8*inlen / stream_info->bits, stream_info->channels, &(ss->mixer)) == -1 )1162 if ( roar_amp_pcm(outdata, stream_info->bits, indata, 8*inlen / stream_info->bits, stream_info->channels, &(ss->mixer)) == -1 ) 1161 1163 return -1; 1162 1164 }
Note: See TracChangeset
for help on using the changeset viewer.