move defaultPitch

jscrane · jscrane · commit e6510e22a00f · 2018-01-23T07:54:46.000Z
diff --git a/TTS.cpp b/TTS.cpp
@@ -23,8 +23,6 @@ static char phonemes[128];
 static char modifier[128];	// must be same size as 'phonemes'
 static char g_text[128];
 
-static byte defaultPitch = 7;
-
 // Lookup user specified pitch changes
 static const byte PROGMEM PitchesP[] = { 1, 2, 4, 6, 8, 10, 13, 16 };
 
@@ -557,16 +555,7 @@ static void play(byte duration, byte soundNumber)
 TTS::TTS(int pin)
 {
     ::pin = pin;
-}
-
-void TTS::setPitch(byte pitch)
-{
-    defaultPitch = pitch;
-}
-
-byte TTS::getPitch(void)
-{
-    return defaultPitch;
+    defaultPitch = 7;
 }
 
 /*
diff --git a/TTS.h b/TTS.h
@@ -51,12 +51,15 @@ class TTS {
     /**
      * sets the pitch; higher values: lower pitch
      */
-    void setPitch(byte pitch);
+    void setPitch(byte pitch) { defaultPitch = pitch; }
 
     /**
      * gets the pitch
      */
-    byte getPitch(void);
+    byte getPitch(void) { return defaultPitch; }
+
+  private:
+    byte defaultPitch;
 };
 
 #endif
