diff src/Instruments.cpp @ 267:a8c05709e486

Merge from branch "norm"

--- a/src/Instruments.cpp	Tue Jul 22 18:32:00 2014 +0100
+++ b/src/Instruments.cpp	Wed Jul 23 17:51:58 2014 +0100
@@ -122,11 +122,7 @@
     vector<InstrumentPack> ii;
 
     vector<Templates> allTemplates;
-    //!!! is piano-maps-SptkBGCl the same as one of piano1, piano2, piano3?
     allTemplates.push_back(templatesFor("piano1"));
-    allTemplates.push_back(templatesFor("piano2"));
-    allTemplates.push_back(templatesFor("piano3"));
-    allTemplates.push_back(templatesFor("pianorwc"));
 
     vector<Templates> pianoTemplates;
     pianoTemplates.push_back(templatesFor("piano1"));
@@ -137,9 +133,7 @@
 			 silvet_templates_highest_note,
 			 "Piano",
 			 pianoTemplates);
-//    piano.maxPolyphony = 8;
-//    piano.levelThreshold = 4;
-    piano.maxPolyphony = 5;
+    piano.maxPolyphony = 6;
     piano.levelThreshold = 6;
     piano.pitchSparsity = 1.0;
     piano.sourceSparsity = 1.0;
@@ -162,16 +156,17 @@
 			     t.highestNote,
 			     simpleInstruments[i],
 			     tt);
-//        instr.pitchSparsity = 1.5;
+
         instr.maxPolyphony = 5;
         instr.levelThreshold = 6;
+
 	if (isBowedString(i)) {
-//            instr.maxPolyphony = 2;
+            instr.maxPolyphony = 2;
 //            instr.levelThreshold = 3;
 	    stringTemplates.push_back(t);
 	}
 	if (isWind(i)) {
-//            instr.maxPolyphony = 1;
+            instr.maxPolyphony = 2;
 //            instr.levelThreshold = 5;
 	    windTemplates.push_back(t);
 	}