Merge pull request #15 from jackhumbert/master

Merge from qmk

1 files changed, 10 insertions, 5 deletions

diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index ead5fbf3e..2a315fd16 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -77,6 +77,7 @@ static bool audio_initialized = false;
 audio_config_t audio_config;
 
 uint16_t envelope_index = 0;
+bool glissando = true;
 
 void audio_init()
 {
@@ -205,13 +206,17 @@ ISR(TIMER3_COMPA_vect)
                                         freq = frequencies[voice_place];
                                 #endif
                         } else {
-                                if (frequency != 0 && frequency < frequencies[voices - 1] && frequency < frequencies[voices - 1] * pow(2, -440/frequencies[voices - 1]/12/2)) {
-                                        frequency = frequency * pow(2, 440/frequency/12/2);
-                                } else if (frequency != 0 && frequency > frequencies[voices - 1] && frequency > frequencies[voices - 1] * pow(2, 440/frequencies[voices - 1]/12/2)) {
-                                        frequency = frequency * pow(2, -440/frequency/12/2);
+                                if (glissando) {
+                                        if (frequency != 0 && frequency < frequencies[voices - 1] && frequency < frequencies[voices - 1] * pow(2, -440/frequencies[voices - 1]/12/2)) {
+                                                frequency = frequency * pow(2, 440/frequency/12/2);
+                                        } else if (frequency != 0 && frequency > frequencies[voices - 1] && frequency > frequencies[voices - 1] * pow(2, 440/frequencies[voices - 1]/12/2)) {
+                                                frequency = frequency * pow(2, -440/frequency/12/2);
+                                        } else {
+                                                frequency = frequencies[voices - 1];
+                                        }
                                 } else {
                                         frequency = frequencies[voices - 1];
-                                }
+                                }                               
 
                                 #ifdef VIBRATO_ENABLE
                                         if (vibrato_strength > 0) {