/[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 2837 by persson, Sun Aug 23 06:14:00 2015 UTC revision 3017 by schoenebeck, Wed Oct 19 12:28:40 2016 UTC
# Line 341  namespace LinuxSampler { namespace gig { Line 341  namespace LinuxSampler { namespace gig {
341                  break;                  break;
342              case ::gig::lfo3_ctrl_aftertouch:              case ::gig::lfo3_ctrl_aftertouch:
343                  lfo3_internal_depth  = 0;                  lfo3_internal_depth  = 0;
344                  pLFO3->ExtController = 128;                  pLFO3->ExtController = CTRL_TABLE_IDX_AFTERTOUCH;
345                  bLFO3Enabled         = true;                  bLFO3Enabled         = true;
346                  break;                  break;
347              case ::gig::lfo3_ctrl_internal_modwheel:              case ::gig::lfo3_ctrl_internal_modwheel:
# Line 351  namespace LinuxSampler { namespace gig { Line 351  namespace LinuxSampler { namespace gig {
351                  break;                  break;
352              case ::gig::lfo3_ctrl_internal_aftertouch:              case ::gig::lfo3_ctrl_internal_aftertouch:
353                  lfo3_internal_depth  = pRegion->LFO3InternalDepth;                  lfo3_internal_depth  = pRegion->LFO3InternalDepth;
354                  pLFO3->ExtController = 128;                  pLFO3->ExtController = CTRL_TABLE_IDX_AFTERTOUCH;
355                  bLFO3Enabled         = (lfo3_internal_depth > 0 || pRegion->LFO3ControlDepth > 0);                  bLFO3Enabled         = (lfo3_internal_depth > 0 || pRegion->LFO3ControlDepth > 0);
356                  break;                  break;
357              default:              default:
# Line 373  namespace LinuxSampler { namespace gig { Line 373  namespace LinuxSampler { namespace gig {
373      float Voice::CalculateCutoffBase(uint8_t MIDIKeyVelocity) {      float Voice::CalculateCutoffBase(uint8_t MIDIKeyVelocity) {
374          float cutoff = pRegion->GetVelocityCutoff(MIDIKeyVelocity);          float cutoff = pRegion->GetVelocityCutoff(MIDIKeyVelocity);
375          if (pRegion->VCFKeyboardTracking) {          if (pRegion->VCFKeyboardTracking) {
376              cutoff *= RTMath::CentsToFreqRatioUnlimited((MIDIKey - pRegion->VCFKeyboardTrackingBreakpoint) * 100);              cutoff *= RTMath::CentsToFreqRatioUnlimited((MIDIKey() - pRegion->VCFKeyboardTrackingBreakpoint) * 100);
377          }          }
378          return cutoff;          return cutoff;
379      }      }
# Line 426  namespace LinuxSampler { namespace gig { Line 426  namespace LinuxSampler { namespace gig {
426                  ctrl = 83;                  ctrl = 83;
427                  break;                  break;
428              case ::gig::vcf_cutoff_ctrl_aftertouch:              case ::gig::vcf_cutoff_ctrl_aftertouch:
429                  ctrl = 128;                  ctrl = CTRL_TABLE_IDX_AFTERTOUCH;
430                  break;                  break;
431              case ::gig::vcf_cutoff_ctrl_none:              case ::gig::vcf_cutoff_ctrl_none:
432              default:              default:
# Line 498  namespace LinuxSampler { namespace gig { Line 498  namespace LinuxSampler { namespace gig {
498          // note should be stopped at all, because it doesn't sound naturally          // note should be stopped at all, because it doesn't sound naturally
499          // with a drumkit.          // with a drumkit.
500          // -- Christian, 2013-01-08          // -- Christian, 2013-01-08
501          if (itEvent->Param.Note.Key != MIDIKey /*||          if (itEvent->Param.Note.Key != HostKey() /*||
502              !GetGigEngineChannel()->SustainPedal*/) {              !GetGigEngineChannel()->SustainPedal*/) {
503              dmsg(4,("Voice %p - kill", (void*)this));              dmsg(4,("Voice %p - kill", (void*)this));
504    
Legend:
Removed from v.2837  
changed lines
  Added in v.3017
  ViewVC Help
Powered by ViewVC