# HG changeset patch
# User Chris Cannam
# Date 1405441084 -3600
# Node ID 81288afddf434d46c499b4b5d2f96fe4ab5064d9
# Parent  a144217a9cfbc29bd94fbd72fccc9b3f0159b50e
Add piano and viola (for string quartet) to instruments, update RDF

diff -r a144217a9cfb -r 81288afddf43 silvet.n3
--- a/silvet.n3	Tue Jul 15 16:40:58 2014 +0100
+++ b/silvet.n3	Tue Jul 15 17:18:04 2014 +0100
@@ -80,7 +80,7 @@
     vamp:unit           "" ;
     vamp:quantize_step   1  ;
     vamp:default_value   0 ;
-    vamp:value_names     ( "Multiple or unknown instruments" "Piano" "Guitar" "Violin" "Cello" "Horn" "Flute" "Oboe" "Clarinet" "Tenor Sax" "Bassoon" "String ensemble" "Wind ensemble");
+    vamp:value_names     ( "Multiple or unknown instruments" "Piano" "Guitar" "Violin" "Viola" "Cello" "Horn" "Flute" "Oboe" "Clarinet" "Tenor Sax" "Bassoon" "String quartet" "Wind ensemble");
     .
 plugbase:silvet_param_finetune a  vamp:QuantizedParameter ;
     vamp:identifier     "finetune" ;
diff -r a144217a9cfb -r 81288afddf43 src/Instruments.cpp
--- a/src/Instruments.cpp	Tue Jul 15 16:40:58 2014 +0100
+++ b/src/Instruments.cpp	Tue Jul 15 17:18:04 2014 +0100
@@ -34,6 +34,7 @@
     // name and one for the template to look up
     "Guitar", "guitar",
     "Violin", "violin",
+    "Viola", "viola",
     "Cello", "cello",
     "Horn", "horn",
     "Flute", "flute",
@@ -44,10 +45,11 @@
 };
 
 static bool
-isString(int i)
+isBowedString(int i)
 {
     string tname(simpleInstruments[i+1]);
     return tname == "violin"
+	|| tname == "viola"
 	|| tname == "cello"
 	;
 }
@@ -124,11 +126,13 @@
     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",
@@ -161,7 +165,7 @@
 //        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);
@@ -188,7 +192,7 @@
 
     InstrumentPack strings(silvet_templates_lowest_note,  // cello
 			   silvet_templates_highest_note, // violin
-			   "String ensemble",
+			   "String quartet",
 			   stringTemplates);
     strings.maxPolyphony = 5;
     strings.levelThreshold = 3;