From 943b5b770955be937a89016680052be56d874c4a Mon Sep 17 00:00:00 2001
From: IBNobody <ibnobody@gmail.com>
Date: Sun, 17 Apr 2016 00:24:58 -0500
Subject: Adding folding to #if, etc

---
 quantum/musical_notes.h | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

(limited to 'quantum/musical_notes.h')

diff --git a/quantum/musical_notes.h b/quantum/musical_notes.h
index 837f6a069d..d2256a7736 100644
--- a/quantum/musical_notes.h
+++ b/quantum/musical_notes.h
@@ -4,20 +4,36 @@
 // Tempo Placeholder
 #define TEMPO 120
 
+#define SONG(notes...) { notes }
+
 
 // Note Types
-#define WHOLE_NOTE(note)     {(NOTE##note), 64}
-#define HALF_NOTE(note)      {(NOTE##note), 32}
-#define QUARTER_NOTE(note)   {(NOTE##note), 16}
-#define EIGHTH_NOTE(note)    {(NOTE##note), 8}
-#define SIXTEENTH_NOTE(note) {(NOTE##note), 4}
+#define MUSICAL_NOTE(note, duration)   {(NOTE##note), duration}
+#define WHOLE_NOTE(note)               MUSICAL_NOTE(note, 64)
+#define HALF_NOTE(note)                MUSICAL_NOTE(note, 32)
+#define QUARTER_NOTE(note)             MUSICAL_NOTE(note, 16)
+#define EIGHTH_NOTE(note)              MUSICAL_NOTE(note,  8)
+#define SIXTEENTH_NOTE(note)           MUSICAL_NOTE(note,  4)
+
+#define WHOLE_DOT_NOTE(note)           MUSICAL_NOTE(note, 64+32)
+#define HALF_DOT_NOTE(note)            MUSICAL_NOTE(note, 32+16)
+#define QUARTER_DOT_NOTE(note)         MUSICAL_NOTE(note, 16+8)
+#define EIGHTH_DOT_NOTE(note)          MUSICAL_NOTE(note,  8+4)
+#define SIXTEENTH_DOT_NOTE(note)       MUSICAL_NOTE(note,  4+2)
+
 
-// Note Types Short
-#define W_NOTE(n) WHOLE_NOTE(n)
-#define H_NOTE(n) HALF_NOTE(n)
-#define Q_NOTE(n) QUARTER_NOTE(n)
-#define E_NOTE(n) EIGTH_NOTE(n)
-#define S_NOTE(n) SIXTEENTH_NOTE(n)
+// Note Type Shortcuts
+#define M__NOTE(note, duration)        MUSICAL_NOTE(note, duration)
+#define W__NOTE(n)                     WHOLE_NOTE(n)
+#define H__NOTE(n)                     HALF_NOTE(n)
+#define Q__NOTE(n)                     QUARTER_NOTE(n)
+#define E__NOTE(n)                     EIGHTH_NOTE(n)
+#define S__NOTE(n)                     SIXTEENTH_NOTE(n)
+#define WD_NOTE(n)                     WHOLE_DOT_NOTE(n)
+#define HD_NOTE(n)                     HALF_DOT_NOTE(n)
+#define QD_NOTE(n)                     QUARTER_DOT_NOTE(n)
+#define ED_NOTE(n)                     EIGTH_DOT_NOTE(n)
+#define SD_NOTE(n)                     SIXTEENTH_DOT_NOTE(n)
 
 // Note Styles
 // Staccato makes sure there is a rest between each note. Think: TA TA TA
-- 
cgit v1.2.3