From af8ce3fccfeb3724a9c08bde5fd456322e6bd847 Mon Sep 17 00:00:00 2001
From: Peli de Halleux <jhalleux@microsoft.com>
Date: Wed, 30 Nov 2016 16:06:17 -0800
Subject: [PATCH] allow for double, breve note durations

---
 libs/core/_locales/core-strings.json |  2 ++
 libs/core/music.ts                   | 20 ++++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/libs/core/_locales/core-strings.json b/libs/core/_locales/core-strings.json
index 392312bd..a475b30e 100644
--- a/libs/core/_locales/core-strings.json
+++ b/libs/core/_locales/core-strings.json
@@ -9,6 +9,8 @@
   "AcceleratorRange.TwoG|block": "2g",
   "BaudRate.BaudRate115200|block": "115200",
   "BaudRate.BaudRate9600|block": "9600",
+  "BeatFraction.Breves|block": "4",
+  "BeatFraction.Double|block": "2",
   "BeatFraction.Eighth|block": "1/8",
   "BeatFraction.Half|block": "1/2",
   "BeatFraction.Quarter|block": "1/4",
diff --git a/libs/core/music.ts b/libs/core/music.ts
index 86267c8c..964a62ea 100644
--- a/libs/core/music.ts
+++ b/libs/core/music.ts
@@ -119,7 +119,11 @@ enum BeatFraction {
     //% block="1/8"
     Eighth = 8,
     //% block="1/16"
-    Sixteenth = 16
+    Sixteenth = 16,
+    //% block="2"
+    Double = 32,
+    //% block="4",
+    Breve = 64
 }
 
 /**
@@ -188,11 +192,15 @@ namespace music {
         init();
         if (fraction == null) fraction = BeatFraction.Whole;
         let beat = 60000 / beatsPerMinute;
-        if (fraction == BeatFraction.Whole) return beat;
-        else if (fraction == BeatFraction.Half) return beat / 2;
-        else if (fraction == BeatFraction.Quarter) return beat / 4
-        else if (fraction == BeatFraction.Eighth) return beat / 8;
-        else return beat / 16;
+        switch (fraction) {
+            case BeatFraction.Half: return beat / 2;
+            case BeatFraction.Quarter: return beat / 4;
+            case BeatFraction.Eighth: return beat / 8;
+            case BeatFraction.Sixteenth: return beat / 16;
+            case BeatFraction.Double: return beat * 2;
+            case BeatFraction.Breve: return beat * 4;
+            default: return beat;
+        }
     }
 
     /**