/[svn]/linuxsampler/trunk/src/engines/gig/Voice.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/engines/gig/Voice.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 715 by persson, Sat Jul 16 19:37:52 2005 UTC revision 716 by iliev, Sun Jul 24 06:57:30 2005 UTC
# Line 576  namespace LinuxSampler { namespace gig { Line 576  namespace LinuxSampler { namespace gig {
576    
577          // Reset the synthesis parameter matrix          // Reset the synthesis parameter matrix
578    
579            #if CONFIG_PROCESS_MUTED_CHANNELS
580            pEngine->ResetSynthesisParameters(Event::destination_vca, this->Volume * this->CrossfadeVolume * (pEngineChannel->GetMute() ? 0 : pEngineChannel->GlobalVolume));
581            #else
582          pEngine->ResetSynthesisParameters(Event::destination_vca, this->Volume * this->CrossfadeVolume * pEngineChannel->GlobalVolume);          pEngine->ResetSynthesisParameters(Event::destination_vca, this->Volume * this->CrossfadeVolume * pEngineChannel->GlobalVolume);
583            #endif
584          pEngine->ResetSynthesisParameters(Event::destination_vco, this->PitchBase);          pEngine->ResetSynthesisParameters(Event::destination_vco, this->PitchBase);
585          pEngine->ResetSynthesisParameters(Event::destination_vcfc, VCFCutoffCtrl.fvalue);          pEngine->ResetSynthesisParameters(Event::destination_vcfc, VCFCutoffCtrl.fvalue);
586          pEngine->ResetSynthesisParameters(Event::destination_vcfr, VCFResonanceCtrl.fvalue);          pEngine->ResetSynthesisParameters(Event::destination_vcfr, VCFResonanceCtrl.fvalue);
# Line 806  namespace LinuxSampler { namespace gig { Line 810  namespace LinuxSampler { namespace gig {
810    
811                  crossfadevolume = CrossfadeAttenuation(itVCAEvent->Param.CC.Value);                  crossfadevolume = CrossfadeAttenuation(itVCAEvent->Param.CC.Value);
812    
813                    #if CONFIG_PROCESS_MUTED_CHANNELS
814                    float effective_volume = crossfadevolume * this->Volume * (pEngineChannel->GetMute() ? 0 : pEngineChannel->GlobalVolume);
815                    #else
816                  float effective_volume = crossfadevolume * this->Volume * pEngineChannel->GlobalVolume;                  float effective_volume = crossfadevolume * this->Volume * pEngineChannel->GlobalVolume;
817                    #endif
818    
819                  // apply volume value to the volume parameter sequence                  // apply volume value to the volume parameter sequence
820                  for (uint i = itVCAEvent->FragmentPos(); i < end; i++) {                  for (uint i = itVCAEvent->FragmentPos(); i < end; i++) {
Legend:
Removed from v.715  
changed lines
  Added in v.716
  ViewVC Help
Powered by ViewVC