/[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 3316 by schoenebeck, Thu Jul 20 12:05:53 2017 UTC revision 3328 by schoenebeck, Sun Jul 23 18:27:29 2017 UTC
# Line 5  Line 5 
5   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
6   *   Copyright (C) 2005 - 2008 Christian Schoenebeck                       *   *   Copyright (C) 2005 - 2008 Christian Schoenebeck                       *
7   *   Copyright (C) 2009 Christian Schoenebeck and Grigor Iliev             *   *   Copyright (C) 2009 Christian Schoenebeck and Grigor Iliev             *
8   *   Copyright (C) 2010 - 2016 Christian Schoenebeck and Andreas Persson   *   *   Copyright (C) 2010 - 2017 Christian Schoenebeck and Andreas Persson   *
9   *                                                                         *   *                                                                         *
10   *   This program is free software; you can redistribute it and/or modify  *   *   This program is free software; you can redistribute it and/or modify  *
11   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 466  namespace LinuxSampler { namespace gig { Line 466  namespace LinuxSampler { namespace gig {
466      }      }
467    
468      void Voice::TriggerEG1(const EGInfo& egInfo, double velrelease, double velocityAttenuation, uint sampleRate, uint8_t velocity) {      void Voice::TriggerEG1(const EGInfo& egInfo, double velrelease, double velocityAttenuation, uint sampleRate, uint8_t velocity) {
469            EG1.setStateOptions(
470                pRegion->EG1Options.AttackCancel,
471                pRegion->EG1Options.AttackHoldCancel,
472                pRegion->EG1Options.Decay1Cancel,
473                pRegion->EG1Options.Decay2Cancel,
474                pRegion->EG1Options.ReleaseCancel
475            );
476          EG1.trigger(pRegion->EG1PreAttack,          EG1.trigger(pRegion->EG1PreAttack,
477                      RTMath::Max(pRegion->EG1Attack, 0.0316) * egInfo.Attack,                      RTMath::Max(pRegion->EG1Attack, 0.0316) * egInfo.Attack,
478                      pRegion->EG1Hold,                      pRegion->EG1Hold,
# Line 479  namespace LinuxSampler { namespace gig { Line 486  namespace LinuxSampler { namespace gig {
486      }      }
487    
488      void Voice::TriggerEG2(const EGInfo& egInfo, double velrelease, double velocityAttenuation, uint sampleRate, uint8_t velocity) {      void Voice::TriggerEG2(const EGInfo& egInfo, double velrelease, double velocityAttenuation, uint sampleRate, uint8_t velocity) {
489            EG2.setStateOptions(
490                pRegion->EG2Options.AttackCancel,
491                pRegion->EG2Options.AttackHoldCancel,
492                pRegion->EG2Options.Decay1Cancel,
493                pRegion->EG2Options.Decay2Cancel,
494                pRegion->EG2Options.ReleaseCancel
495            );
496          EG2.trigger(uint(RgnInfo.EG2PreAttack),          EG2.trigger(uint(RgnInfo.EG2PreAttack),
497                      RgnInfo.EG2Attack * egInfo.Attack,                      RgnInfo.EG2Attack * egInfo.Attack,
498                      false,                      false,
Legend:
Removed from v.3316  
changed lines
  Added in v.3328
  ViewVC Help
Powered by ViewVC