Fix for Seq#final_onset.

jvoorhis · Nov 3, 2008 · 7691150 · 7691150
1 parent cddae2f
commit 7691150
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/music/score.rb b/lib/music/score.rb
@@ -79,7 +79,7 @@ class Seq < Base
       def initialize(left, right)
         @left, @right = left, right
         @duration = @left.duration + @right.duration
-        @final_onset = @left.duration
+        @final_onset = @left.duration + @right.final_onset
       end
 
       def ==(other)

diff --git a/spec/env_spec.rb b/spec/env_spec.rb
@@ -18,9 +18,9 @@ def cresc(factor, score)
   it "can be nested" do
     score = cresc(1.5,
               sn([c4, e4, g4], 1, :velocity => 40) &
-              cresc(1.5,
+              cresc(2,
                 sn([c4, e4, g4], 1, :velocity => 40)))
     timeline = score.to_timeline
-    timeline.map(&:velocity).should == [40, 47, 53, 60, 83, 110]
+    timeline.map(&:velocity).should == [40, 44, 48, 52, 84, 120]
   end
 end