completed eyes&ears library data entry

jwmatthys · Aug 3, 2015 · b5aaacc · b5aaacc
1 parent fbc42f1
commit b5aaacc
Show file tree

Hide file tree

Showing 23 changed files with 270 additions and 231 deletions.
diff --git a/Latido.pde b/Latido.pde
@@ -125,7 +125,7 @@ void setup()
   music.setText(library.getText());
   tempo.set(map(library.getTempo(), TEMPO_LOW, TEMPO_HIGH, 0, 1));
   tempoLabel.set(library.getTempo()+" bpm");
-  metro = new MetroButton( SIDEBAR_WIDTH+(width-SIDEBAR_WIDTH)/2-250, height-150, 500, 100, 2);
+  metro = new MetroButton( SIDEBAR_WIDTH+(width-SIDEBAR_WIDTH)/2-250, height-110, 500, 100, 2);
   scorecard = new Scorecard (SIDEBAR_WIDTH + 2*PADDING, TOPBAR_HEIGHT+PADDING, width-SIDEBAR_WIDTH-4*PADDING, height-TOPBAR_HEIGHT-4*PADDING);
 
   userProgress = new UserProgress(System.getProperty("user.name"), libName);

diff --git a/data/eyes_and_ears/image/minor1.gif b/data/eyes_and_ears/image/minor1.gif
diff --git a/data/eyes_and_ears/image/minor2.gif b/data/eyes_and_ears/image/minor2.gif
diff --git a/data/eyes_and_ears/image/minor3.gif b/data/eyes_and_ears/image/minor3.gif
diff --git a/data/eyes_and_ears/image/minor4.gif b/data/eyes_and_ears/image/minor4.gif
diff --git a/data/eyes_and_ears/image/minor5.gif b/data/eyes_and_ears/image/minor5.gif
diff --git a/data/eyes_and_ears/image/minor6.gif b/data/eyes_and_ears/image/minor6.gif
diff --git a/data/eyes_and_ears/latido.xml b/data/eyes_and_ears/latido.xml
diff --git a/data/eyes_and_ears/midi/minor1.midi b/data/eyes_and_ears/midi/minor1.midi
diff --git a/data/eyes_and_ears/midi/minor2.midi b/data/eyes_and_ears/midi/minor2.midi
diff --git a/data/eyes_and_ears/midi/minor3.midi b/data/eyes_and_ears/midi/minor3.midi
diff --git a/data/eyes_and_ears/midi/minor4.midi b/data/eyes_and_ears/midi/minor4.midi
diff --git a/data/eyes_and_ears/midi/minor5.midi b/data/eyes_and_ears/midi/minor5.midi
diff --git a/data/eyes_and_ears/midi/minor6.midi b/data/eyes_and_ears/midi/minor6.midi
diff --git a/data/eyes_and_ears/text/175.txt b/data/eyes_and_ears/text/175.txt
@@ -1,3 +1,7 @@
 Eyes & Ears Anthology
 
 Exercise 175
+
+All four of the common minor
+mode patterns occur in this
+example. Can you find them?
diff --git a/data/eyes_and_ears/text/minor1.txt b/data/eyes_and_ears/text/minor1.txt
@@ -0,0 +1,6 @@
+You're doing great! Now let's
+try some melodies in minor mode.
+
+The Tonicizer in minor mode is
+almost the same, but with a
+lowered 3rd scale degree (mi->me).
diff --git a/data/eyes_and_ears/text/minor2.txt b/data/eyes_and_ears/text/minor2.txt
@@ -0,0 +1,3 @@
+There are four common patterns
+in minor mode. The first is the
+lower neighbor of the tonic.
diff --git a/data/eyes_and_ears/text/minor3.txt b/data/eyes_and_ears/text/minor3.txt
@@ -0,0 +1,6 @@
+The second common pattern in
+minor is the upper neighbor of
+the dominant.
+
+Remember, this is just a half
+step!
diff --git a/data/eyes_and_ears/text/minor4.txt b/data/eyes_and_ears/text/minor4.txt
@@ -0,0 +1,7 @@
+The third important pattern is
+the ascending tetrachord*. This
+sounds exactly the same as in
+major mode!
+
+* Tetrachord is the name for a
+collection of four notes.
diff --git a/data/eyes_and_ears/text/minor5.txt b/data/eyes_and_ears/text/minor5.txt
@@ -0,0 +1,7 @@
+The fourth important pattern is
+the descending tetrachord. This
+is usually the trickiest one.
+
+(This pattern occurs in the bass
+line of "Hit the Road, Jack" by
+Ray Charles!)
diff --git a/data/eyes_and_ears/text/minor6.txt b/data/eyes_and_ears/text/minor6.txt
@@ -0,0 +1,4 @@
+Now let's try putting them all
+together. This next example has
+all four of the common patterns
+we just practiced.
diff --git a/data/pd/latido_externals/latido_midiplayer.pd b/data/pd/latido_externals/latido_midiplayer.pd
@@ -1,4 +1,4 @@
-#N canvas 113 205 1110 669 10;
+#N canvas 110 210 1110 669 10;
 #X declare -path .;
 #X obj 311 294 midifile;
 #X msg 736 218 verbose 0;
@@ -199,8 +199,6 @@
 #X obj 406 213 *;
 #X obj 632 257 j-gate2;
 #X obj 398 281 t f f f;
-#X obj 627 155 print dm;
-#X obj 649 134 random 10;
 #X connect 0 0 64 0;
 #X connect 0 1 73 0;
 #X connect 0 2 65 0;
@@ -246,7 +244,6 @@
 #X connect 35 0 3 0;
 #X connect 35 1 15 0;
 #X connect 39 0 0 0;
-#X connect 39 0 76 0;
 #X connect 40 0 29 0;
 #X connect 40 0 45 1;
 #X connect 44 0 47 0;
@@ -287,4 +284,3 @@
 #X connect 74 0 64 1;
 #X connect 74 1 65 1;
 #X connect 74 2 73 1;
-#X connect 76 0 75 0;
diff --git a/showmusic.pde b/showmusic.pde
@@ -38,6 +38,8 @@ public class ShowMusic
     } else
     {
       float rescale = (width-SIDEBAR_WIDTH-(2*PADDING))*1.0/music.width;
+      float rescale2 = (height-TOPBAR_HEIGHT-(2*PADDING))*1.0/music.height;
+      rescale = min(rescale,rescale2);
       image (music, SIDEBAR_WIDTH+PADDING, TOPBAR_HEIGHT+PADDING, music.width*rescale, music.height*rescale);
     }
   }