Mercurial > hg > svapp

diff audioio/AudioGenerator.h @ 307:6eb15c3aee0a tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More toward using clip mixer
author Chris Cannam
date Tue, 07 Jan 2014 13:10:35 +0000
parents 9716c75499ef
children 289d65722123
line wrap: on
line diff
--- a/audioio/AudioGenerator.h	Tue Jan 07 13:04:29 2014 +0000
+++ b/audioio/AudioGenerator.h	Tue Jan 07 13:10:35 2014 +0000
@@ -22,6 +22,7 @@
 class DenseTimeValueModel;
 class SparseOneDimensionalModel;
 class Playable;
+class ClipMixer;
 
 #include <QObject>
 #include <QMutex>
@@ -115,22 +116,20 @@
 	};
     };
 
-//!!!    typedef std::map<const Model *, RealTimePluginInstance *> PluginMap;
+
+    typedef std::map<const Model *, ClipMixer *> ClipMixerMap;
 
     typedef std::multiset<NoteOff, NoteOff::Comparator> NoteOffSet;
     typedef std::map<const Model *, NoteOffSet> NoteOffMap;
 
     QMutex m_mutex;
-//!!!    PluginMap m_synthMap;
+    ClipMixerMap m_clipMixerMap;
     NoteOffMap m_noteOffs;
     static QString m_sampleDir;
 
-/*!!!
-    virtual RealTimePluginInstance *loadPluginFor(const Model *model);
-    virtual RealTimePluginInstance *loadPlugin(QString id, QString program);
-*/
+    ClipMixer *makeClipMixerFor(const Model *model);
+
     static void initialiseSampleDir();
-//!!!    static void setSampleDir(RealTimePluginInstance *plugin);
 
     virtual size_t mixDenseTimeValueModel
     (DenseTimeValueModel *model, size_t startFrame, size_t frameCount,