Merge branch 'master' of https://github.com/thestk/stk with local.

src/BandedWG.cpp

@@ -30,7 +30,7 @@
 /***************************************************/
 
 #include "BandedWG.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {

src/BlowBotl.cpp

@@ -17,7 +17,7 @@
 /***************************************************/
 
 #include "BlowBotl.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 

src/BlowHole.cpp

@@ -34,7 +34,7 @@
 /***************************************************/
 
 #include "BlowHole.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {

src/Bowed.cpp

@@ -25,7 +25,7 @@
 /***************************************************/
 
 #include "Bowed.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 

src/Brass.cpp

@@ -21,7 +21,7 @@
 /***************************************************/
 
 #include "Brass.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {

src/Clarinet.cpp

@@ -23,7 +23,7 @@
 /***************************************************/
 
 #include "Clarinet.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 

src/FM.cpp

@@ -24,7 +24,7 @@
 /***************************************************/
 
 #include "FM.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 

src/FMVoices.cpp

@@ -31,7 +31,7 @@
 /***************************************************/
 
 #include "FMVoices.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include "Phonemes.h"
 
 namespace stk {

src/Flute.cpp

@@ -23,7 +23,7 @@
 /***************************************************/
 
 #include "Flute.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 

src/Guitar.cpp

@@ -31,7 +31,7 @@
 #include "Guitar.h"
 #include "FileWvIn.h"
 #include "Noise.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {

src/Mandolin.cpp

@@ -27,7 +27,7 @@
 /***************************************************/
 
 #include "Mandolin.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 

src/Mesh2D.cpp

@@ -25,7 +25,7 @@
 /***************************************************/
 
 #include "Mesh2D.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 

src/Messager.cpp

@@ -35,7 +35,7 @@
 #include "Messager.h"
 #include <iostream>
 #include <algorithm>
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 

src/ModalBar.cpp

@@ -29,7 +29,7 @@
 /***************************************************/
 
 #include "ModalBar.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {

src/Moog.cpp

@@ -19,7 +19,7 @@
 /***************************************************/
 
 #include "Moog.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 

src/Resonate.cpp

@@ -18,7 +18,7 @@
 /***************************************************/
 
 #include "Resonate.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 

src/Saxofony.cpp

@@ -36,7 +36,7 @@
 /***************************************************/
 
 #include "Saxofony.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 

src/Shakers.cpp

@@ -49,7 +49,7 @@
 /***************************************************/
 
 #include "Shakers.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 

src/Simple.cpp

@@ -18,7 +18,7 @@
 /***************************************************/
 
 #include "Simple.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 

src/Skini.cpp

@@ -24,7 +24,7 @@
 /***************************************************/
 
 #include "Skini.h"
-#include "SKINI.tbl"
+#include "SKINItbl.h"
 #include <cstdlib>
 #include <sstream>
 

src/StifKarp.cpp

@@ -22,7 +22,7 @@
 /***************************************************/
 
 #include "StifKarp.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {

src/Twang.cpp

@@ -66,6 +66,7 @@ void Twang :: setFrequency( StkFloat frequency )
   }
 #endif
 
+  frequency_ = frequency;
   // Delay = length - filter delay.
   StkFloat delay = ( Stk::sampleRate() / frequency ) - loopFilter_.phaseDelay( frequency );
   delayLine_.setDelay( delay );

src/VoicForm.cpp

@@ -27,7 +27,7 @@
 
 #include "VoicForm.h"
 #include "Phonemes.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cstring>
 #include <cmath>
 

src/Whistle.cpp

@@ -17,7 +17,7 @@
 /***************************************************/
 
 #include "Whistle.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {