Mercurial > hg > silvet

diff src/Instruments.h @ 342:ad45b18427e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch livemode
author Chris Cannam
date Mon, 06 Jul 2015 09:15:21 +0100
parents ebe5e0942bb8
children df9a8e16bae6
line wrap: on
line diff
--- a/src/Instruments.h	Tue Apr 28 11:09:31 2015 +0100
+++ b/src/Instruments.h	Mon Jul 06 09:15:21 2015 +0100
@@ -32,10 +32,10 @@
 class InstrumentPack
 {
 public:
-    static const int templateNoteCount;
-    static const int templateHeight;
-    static const int templateMaxShift;
-    static const int templateSize;
+    int templateNoteCount;
+    int templateHeight;
+    int templateMaxShift;
+    int templateSize;
 
     int lowestNote;
     int highestNote;
@@ -60,15 +60,9 @@
 
 private:
     InstrumentPack(int lowest, int highest, std::string n,
-		   std::vector<Templates> tt) :
-	lowestNote(lowest),
-	highestNote(highest),
-        maxPolyphony(5),
-        pitchSparsity(1.1),
-        sourceSparsity(1.2),
-        levelThreshold(5),
-	name(n),
-	templates(tt) { }
+		   std::vector<Templates> tt);
+    
+    friend class LiveAdapter;
 };
 
 #endif