From 09b5babe7097715f36183317ee8a058228866997 Mon Sep 17 00:00:00 2001
From: Matthias Neeracher <neeracher@apple.com>
Date: Tue, 6 Sep 2011 00:20:48 +0200
Subject: [PATCH] Mask for accidentals in whole test

---
 Sources/VLPitchGrid.cpp | 58 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/Sources/VLPitchGrid.cpp b/Sources/VLPitchGrid.cpp
index 1f3d9f1..9910d21 100644
--- a/Sources/VLPitchGrid.cpp
+++ b/Sources/VLPitchGrid.cpp
@@ -83,36 +83,34 @@ static inline int8_t StepToSemi(int step)
 uint16_t VLPitchAccidental(int8_t pitch, uint16_t visual, int key)
 {
     int         semi            = pitch % 12;
-    if (visual & VLNote::kAccidentalsMask) {
-        //
-        // The user expressed a preference, try to match it
-        //
-        switch (visual) {
-        case VLNote::kWantNatural:
-            if (IsBasicNote(semi))
-                return visual;
-            break;
-        case VLNote::kWant2Flat:
-            if (IsBasicNote(semi+2)) 
-                return visual;
-            else
-                return VLNote::kWantFlat;
-        case VLNote::kWantFlat:
-            if (IsBasicNote(semi+1)) 
-                return visual;
-            break;
-        case VLNote::kWant2Sharp:
-            if (IsBasicNote(semi-2)) 
-                return visual;
-            else
-                return VLNote::kWantSharp;
-        case VLNote::kWantSharp:
-            if (IsBasicNote(semi-1)) 
-                return visual;
-            break;
-        default:
-            break;
-        }
+    //
+    // The user expressed a preference, try to match it
+    //
+    switch (visual & VLNote::kAccidentalsMask) {
+    case VLNote::kWantNatural:
+        if (IsBasicNote(semi))
+            return visual;
+        break;
+    case VLNote::kWant2Flat:
+        if (IsBasicNote(semi+2)) 
+            return visual;
+        else
+            return VLNote::kWantFlat;
+    case VLNote::kWantFlat:
+        if (IsBasicNote(semi+1)) 
+            return visual;
+        break;
+    case VLNote::kWant2Sharp:
+        if (IsBasicNote(semi-2)) 
+            return visual;
+        else
+            return VLNote::kWantSharp;
+    case VLNote::kWantSharp:
+        if (IsBasicNote(semi-1)) 
+            return visual;
+        break;
+    default:
+        break;
     }
     //
     // No visuals, or no match