comparison audioio/AudioGenerator.h @ 351:36efd75d7b7b tonioni

Merge from default branch
author Chris Cannam
date Wed, 14 May 2014 09:58:27 +0100
parents 8d7f39df44ed
children 0876ea394902
comparison
equal deleted inserted replaced
344:63dec7dc11cc 351:36efd75d7b7b
133 static QString m_sampleDir; 133 static QString m_sampleDir;
134 134
135 ContinuousSynthMap m_continuousSynthMap; 135 ContinuousSynthMap m_continuousSynthMap;
136 136
137 bool usesClipMixer(const Model *); 137 bool usesClipMixer(const Model *);
138 bool wantsQuieterClips(const Model *);
138 bool usesContinuousSynth(const Model *); 139 bool usesContinuousSynth(const Model *);
139 140
140 ClipMixer *makeClipMixerFor(const Model *model); 141 ClipMixer *makeClipMixerFor(const Model *model);
141 ContinuousSynth *makeSynthFor(const Model *model); 142 ContinuousSynth *makeSynthFor(const Model *model);
142 143