/[svn]/linuxsampler/trunk/src/engines/sf2/SF2SignalUnitRack.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/engines/sf2/SF2SignalUnitRack.cpp

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

revision 2217 by iliev, Tue Jul 26 15:51:30 2011 UTC revision 2218 by iliev, Thu Jul 28 08:05:57 2011 UTC
# Line 131  namespace LinuxSampler { namespace sf2 { Line 131  namespace LinuxSampler { namespace sf2 {
131          if (active()) {          if (active()) {
132              increment(1);              increment(1);
133              if (!toStageEndLeft()) update(EG::event_stage_end, pVoice->GetSampleRate() / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);              if (!toStageEndLeft()) update(EG::event_stage_end, pVoice->GetSampleRate() / CONFIG_DEFAULT_SUBFRAGMENT_SIZE);
134           }          }
135      }      }
136    
137    
# Line 188  namespace LinuxSampler { namespace sf2 { Line 188  namespace LinuxSampler { namespace sf2 {
188      }      }
189    
190    
191      EndpointUnit::EndpointUnit(SF2SignalUnitRack* rack): EndpointSignalUnit(rack), pVoice(rack->pVoice) {      EndpointUnit::EndpointUnit(SF2SignalUnitRack* rack): EndpointSignalUnit(rack) {
192                    
193      }      }
194    
# Line 210  namespace LinuxSampler { namespace sf2 { Line 210  namespace LinuxSampler { namespace sf2 {
210      }      }
211            
212      bool EndpointUnit::Active() {      bool EndpointUnit::Active() {
         if (Params.size() < 1) return false;  
213          return prmVolEg->pUnit->Active(); // volEGUnit          return prmVolEg->pUnit->Active(); // volEGUnit
214      }      }
215            
# Line 245  namespace LinuxSampler { namespace sf2 { Line 244  namespace LinuxSampler { namespace sf2 {
244      }      }
245            
246      SF2SignalUnitRack::SF2SignalUnitRack(Voice* voice)      SF2SignalUnitRack::SF2SignalUnitRack(Voice* voice)
247          : pVoice(voice), suVolEG(this), suModEG(this), suModLfo(this), suVibLfo(this), suEndpoint(this) {          : SignalUnitRack(MaxUnitCount), pVoice(voice), suVolEG(this), suModEG(this), suModLfo(this), suVibLfo(this), suEndpoint(this) {
248    
249          suVolEG.pVoice = suModEG.pVoice = suModLfo.pVoice = suVibLfo.pVoice = suEndpoint.pVoice = voice;          suVolEG.pVoice = suModEG.pVoice = suModLfo.pVoice = suVibLfo.pVoice = suEndpoint.pVoice = voice;
250          Units.add(&suVolEG);          Units.add(&suVolEG);
# Line 281  namespace LinuxSampler { namespace sf2 { Line 280  namespace LinuxSampler { namespace sf2 {
280          return static_cast<EndpointSignalUnit*> (&suEndpoint);          return static_cast<EndpointSignalUnit*> (&suEndpoint);
281      }      }
282            
283        void SF2SignalUnitRack::EnterFadeOutStage() {
284            suVolEG.enterFadeOutStage();
285        }
286        
287  }} // namespace LinuxSampler::sf2  }} // namespace LinuxSampler::sf2
Legend:
Removed from v.2217  
changed lines
  Added in v.2218
  ViewVC Help
Powered by ViewVC