Permalink
Browse files

final commit before the deadline

  • Loading branch information...
1 parent d420223 commit 05a5f78091b5dd4676c07e16edf6a7e2e4781c3f @substack committed May 8, 2011
Showing with 5 additions and 2 deletions.
  1. +1 −0 songs/take on me.json
  2. +1 −1 static/css/style.css
  3. +3 −1 static/js/main.js
View
1 songs/take on me.json
@@ -0,0 +1 @@
+[{"note":"F#4","durations":[{"beats":"0.14","text":"hack"}]},{"note":"F#4","durations":[{"beats":"0.12","text":"ed"}]},{"note":"D4","durations":[{"beats":"0.15","text":"dee"}]},{"note":"B3","durations":[{"beats":"0.14","text":"hack"}]},{"note":"B3","durations":[{"beats":"0.16","text":"hack"}]},{"note":"E4","durations":[{"beats":"0.15","text":"king"}]},{"note":"E4","durations":[{"beats":"0.2","text":"on"}]},{"note":"G#4","durations":[{"beats":"0.1","text":"some"}]},{"note":"G#4","durations":[{"beats":0.15,"text":"muse"}]},{"note":"A3","durations":[{"beats":"0.06","text":"ick"}]},{"note":"B3","durations":[{"beats":"0.1","text":"cal"}]},{"note":"A3","durations":[{"beats":0.15,"text":"node"}]},{"note":"A3","durations":[{"beats":"0.13","text":"jay"}]},{"note":"F#4","durations":[{"beats":"0.1","text":"ess"}]},{"note":"F#4","durations":[{"beats":"0.1","text":"dee"}]},{"note":"D4","durations":[{"beats":"0.1","text":"node"}]},{"note":"E4","durations":[{"beats":"0.16","text":"beep"}]},{"note":"E4","durations":[{"beats":"0.2","text":"bop"}]},{"note":"F#4","durations":[{"beats":"0.14","text":"and"}]},{"note":"G#3","durations":[{"beats":"0.12","text":"sing"}]},{"note":"A3","durations":[{"beats":"0.1","text":"ing"}]},{"note":"A3","durations":[{"beats":"0.1","text":"out"}]},{"note":"B3","durations":[{"beats":0.15,"text":"the"}]},{"note":"A3","durations":[{"beats":0.15,"text":"words"}]},{"note":"A3","durations":[{"beats":0.15,"text":"as"}]},{"note":"F#4","durations":[{"beats":0.15,"text":"they"}]},{"note":"F#4","durations":[{"beats":0.15,"text":"all"}]},{"note":"D4","durations":[{"beats":0.15,"text":"come"}]},{"note":"F#4","durations":[{"beats":0.15,"text":"feed"}]},{"note":"E4","durations":[{"beats":0.15,"text":"out"}]},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3},{"rest":0.3}]
View
2 static/css/style.css
@@ -61,7 +61,7 @@ table#notes tr th {
#treble {
background-image: url(/images/treble.png);
background-repeat: no-repeat;
- width: 3750px;
+ width: 5000px;
height: 248px;
margin-left: 125px;
padding-top: 29px;
View
4 static/js/main.js
@@ -170,7 +170,9 @@ $(window).ready(function () {
$('.playing').removeClass('playing');
note.tr.addClass('playing');
- setTimeout(this, 2000 * (note.active ? note.beats : 1));
+
+ var wait = note.active ? note.beats : (note.rest || 1);
+ setTimeout(this, 2000 * wait);
});
},
load : function (data) {

0 comments on commit 05a5f78

Please sign in to comment.