From ce1d0e0aad2b25b699291da1c3006dbb7370f88a Mon Sep 17 00:00:00 2001 From: ADragonInAPieCostume Date: Mon, 8 May 2017 19:07:31 -0300 Subject: [PATCH 1/4] added an octave manager for more complex(?) RTTTL --- main.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/main.js b/main.js index 4547892..0c2c31d 100644 --- a/main.js +++ b/main.js @@ -42,7 +42,14 @@ function parseSong(songString, settings) { var songNote = songData[i].replace(".", ""); var match = pattern.exec(songNote); var dot = 0; - + + //octave manager + if(isNaN(oct) == false){ + octave = octave*1 + (oct*1-octave*1); + }else{ + var octave = settings.getOctave(); + } + if(songData[i].indexOf('.') !== -1) { dot = 1; } From 73c820559f282bffe6f9d3cf8c216aca2c497518 Mon Sep 17 00:00:00 2001 From: ADragonInAPieCostume Date: Mon, 8 May 2017 23:57:36 -0300 Subject: [PATCH 2/4] added oct variable, improved silly method --- main.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main.js b/main.js index 0c2c31d..6b31a1c 100644 --- a/main.js +++ b/main.js @@ -43,10 +43,12 @@ function parseSong(songString, settings) { var match = pattern.exec(songNote); var dot = 0; + var oct = songData[i].slice(-1); + //octave manager if(isNaN(oct) == false){ - octave = octave*1 + (oct*1-octave*1); - }else{ + octave = oct*1; + }else{ var octave = settings.getOctave(); } From 76c9d9a9620758b2d51beda3660ad4e3c959d698 Mon Sep 17 00:00:00 2001 From: ADragonInAPieCostume Date: Mon, 8 May 2017 23:59:56 -0300 Subject: [PATCH 3/4] updated oct variable, got rid of a bit of unnecessary code --- main.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/main.js b/main.js index 6b31a1c..ad48999 100644 --- a/main.js +++ b/main.js @@ -48,8 +48,6 @@ function parseSong(songString, settings) { //octave manager if(isNaN(oct) == false){ octave = oct*1; - }else{ - var octave = settings.getOctave(); } if(songData[i].indexOf('.') !== -1) { From b59e70e059c9b4ab2055a234eae1836a002eb8a0 Mon Sep 17 00:00:00 2001 From: ADragonInAPieCostume Date: Tue, 9 May 2017 00:01:15 -0300 Subject: [PATCH 4/4] Update main.js --- main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.js b/main.js index ad48999..a1969dc 100644 --- a/main.js +++ b/main.js @@ -48,6 +48,8 @@ function parseSong(songString, settings) { //octave manager if(isNaN(oct) == false){ octave = oct*1; + }else{ + octave = settings.getOctave(); } if(songData[i].indexOf('.') !== -1) {