comparison src/Instruments.cpp @ 231:d9b688700819 norm eval-norm-todate

Merge from default branch

 const char *simpleInstruments[] = {
     // Each instrument has two consecutive slots, one for the pack
     // name and one for the template to look up
     "Guitar", "guitar",
     "Violin", "violin",
+    "Viola", "viola",
     "Cello", "cello",
     "Horn", "horn",
     "Flute", "flute",
     "Oboe", "oboe",
     "Clarinet", "clarinet",
     "Tenor Sax", "tenorsax",
     "Bassoon", "bassoon",
 };
 
 static bool
-isString(int i)
+isBowedString(int i)
 {
     string tname(simpleInstruments[i+1]);
     return tname == "violin"
+	|| tname == "viola"
 	|| tname == "cello"
 	;
 }
 
 static bool

     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"));
     pianoTemplates.push_back(templatesFor("piano2"));
     pianoTemplates.push_back(templatesFor("piano3"));
+    pianoTemplates.push_back(templatesFor("pianorwc"));
     InstrumentPack piano(silvet_templates_lowest_note,
 			 silvet_templates_highest_note,
 			 "Piano",
 			 pianoTemplates);
 //    piano.maxPolyphony = 8;

 			     simpleInstruments[i],
 			     tt);
 //        instr.pitchSparsity = 1.5;
         instr.maxPolyphony = 5;
         instr.levelThreshold = 6;
-	if (isString(i)) {
+	if (isBowedString(i)) {
 //            instr.maxPolyphony = 2;
 //            instr.levelThreshold = 3;
 	    stringTemplates.push_back(t);
 	}
 	if (isWind(i)) {

 	ii.insert(ii.begin(), all);
     }
 
     InstrumentPack strings(silvet_templates_lowest_note,  // cello
 			   silvet_templates_highest_note, // violin
-			   "String ensemble",
+			   "String quartet",
 			   stringTemplates);
     strings.maxPolyphony = 5;
     strings.levelThreshold = 3;
     if (isOK(strings)) {
 	ii.push_back(strings);