@@ -149,7 +149,7 @@ Controllers are instructions to the performer. They have a duration of zero. =end - def ctl(name, value, attrs = {}) - Controller.new(name, value, attrs) + def ctl(name, attrs = {}) + Controller.new(name, attrs) end end lib/music.rb @@ -325,8 +325,8 @@ module Music include Instant attr_reader :attributes - def initialize(name, data, attrs = {}) - @attributes = attrs.merge(:name => name, :data => Array(data)) + def initialize(name, as = {}) + @attributes = as.merge(:name => name) end def ==(other) @@ -339,8 +339,7 @@ module Music def update(key, val) a = attributes.merge(key => val) - n, v = attributes.values_at(:name, :value) - self.class.new(n, v, a) + self.class.new(name, a) end def eval(interpreter, context) lib/music/score.rb @@ -64,9 +64,9 @@ module Music track << case ctl.name.to_s when 'tempo' - SetTempo.new(offset, ctl.data[0]) + SetTempo.new(offset, bpm_to_qn_per_usec(ctl.tempo)) when /^cc(0?[1-9]|1[0-6])$/ - ControlChange.new(offset, channel, $1, ctl.data[0]) + ControlChange.new(offset, channel, $1, ctl.value) end end end lib/music/smf_writer.rb @@ -52,7 +52,7 @@ end describe Controller do before(:all) do - @object = Controller.new(60, 1) + @object = Controller.new(:cc1, :value => 64) end it_should_behave_like "all attributes implementations" end spec/attribute_spec.rb @@ -226,13 +226,13 @@ end describe Controller do before(:all) do - @object = Controller.new(:tempo, 120) + @object = Controller.new(:tempo, :tempo => 120) end it_should_behave_like "all scores" - + it "should carry associated data" do - @object.data.should == [120] + @object.tempo.should == 120 end end spec/score_spec.rb @@ -107,7 +107,7 @@ end describe Controller do before(:all) do @dur = 0 - @object = ctl(:tempo, 120) + @object = ctl(:tempo, :tempo => 120) end it_should_behave_like "all temporal objects" end spec/temporal_spec.rb ba072f8f849179ab970adf13d04495054a93d2f1 Jeremy Voorhis jvoorhis@jeremy-voorhiss-macbook-2.local http://github.com/jvoorhis/music.rb/commit/61bcf339c2896b13763e1d0b00f1d07f4a096042 61bcf339c2896b13763e1d0b00f1d07f4a096042 2008-11-18T08:27:07-08:00 2008-11-18T08:27:07-08:00 Changed attribute layout of Controller. Converting bpm to qn/usec for SetTempo. 3137becb3b31ab247fffa08ab0da300bf7e34298 Jeremy Voorhis jvoorhis@jeremy-voorhiss-macbook-2.local