music-performance 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d523ae35fe6714368362b37241e3ffd10c0e2982
-  data.tar.gz: 3604e251beb16c2095e9c9d8e90b889b0bb385a7
+  metadata.gz: f0aee433423e514dcf3e7c43cf3e41bedb419773
+  data.tar.gz: 935623cdf53a375dbbe7931f4bbc06857144a3eb
 SHA512:
-  metadata.gz: bc6d3bf49947281586e433f301048c6a64eff08611aa8a8565c40a4a60f52f1357b8436feb56d5d92cc1a400bdf63e3d99c161ccf24960e81c75ffc9cc18cc33
-  data.tar.gz: f4104ce48fbc02e4790df8511d6afadf668466578ffa5ee0e2ee43b0014c840ae988f3eb1bbb36a1d9cae169ce43289cd62c5caa5eaaf055659a2c02a05ab674
+  metadata.gz: 377e4df3573ca96e8b9307f87d8a4dc1cb5aef5bc709c841137649e7c973764b050ac3c2b0777188898c3d663305ec45cf31685a6839a0190f10ead2e9e495b4
+  data.tar.gz: 136086c85244cbcc75168c7de393ceec0df3d1ec6266aff023b8b21876d37c9f07dbacd2cb0f0735319eb1a232139fcc5bbbe020c0156d53d44de9b409971cf0

data/lib/music-performance/arrangement/midi/midi_events.rb

@@ -1,9 +1,36 @@
 module Music
 module Performance
 
-NoteOnEvent = Struct.new(:notenum, :accented)
-NoteOffEvent = Struct.new(:notenum)
-VolumeExpressionEvent = Struct.new(:volume)
+class MidiEvent
+  def <=> other
+    ORDERING[self] <=> ORDERING[other]
+  end
+  
+  class NoteOn < MidiEvent
+    attr_reader :notenum, :accented
+    def initialize notenum, accented
+      @notenum, @accented = notenum, accented
+    end
+  end
+  
+  class NoteOff < MidiEvent
+    attr_reader :notenum
+    def initialize notenum
+      @notenum = notenum
+    end
+  end
+  
+  class Expression < MidiEvent
+    attr_reader :volume
+    def initialize volume
+      @volume = volume
+    end
+  end
+  
+  ORDERING = {
+    NoteOff => 0, Expression => 1, NoteOn => 2
+  }
+end
 
 end
 end

data/lib/music-performance/arrangement/midi/part_sequencer.rb

@@ -3,6 +3,8 @@ module Performance
 
 class PartSequencer
   def initialize part, dynamics_sample_rate: 50, cents_per_step: 10
+    replace_portamento_with_glissando(part.notes)
+    
     extractor = NoteSequenceExtractor.new(part.notes, cents_per_step)
     note_sequences = extractor.extract_sequences
     note_events = gather_note_events(note_sequences)
@@ -10,7 +12,7 @@ class PartSequencer
     dynamic_events = gather_dynamic_events(part.start_dynamic,
       part.dynamic_changes, dynamics_sample_rate)
     
-    @events = (note_events + dynamic_events).sort_by {|x| x[0] }
+    @events = (note_events + dynamic_events).sort
   end
   
   def make_midi_track midi_sequence, part_name, channel, ppqn
@@ -25,12 +27,12 @@ class PartSequencer
       end
       
       track.events << case event
-      when NoteOnEvent
+      when MidiEvent::NoteOn
         vel = MidiUtil.note_velocity(event.accented)
         MIDI::NoteOn.new(channel, event.notenum, vel, delta)
-      when NoteOffEvent
+      when MidiEvent::NoteOff
         MIDI::NoteOff.new(channel, event.notenum, 127, delta)
-      when VolumeExpressionEvent
+      when MidiEvent::Expression
         MIDI::Controller.new(channel, MIDI::CC_EXPRESSION_CONTROLLER, event.volume, delta)
       end
       
@@ -41,13 +43,15 @@ class PartSequencer
   
   private
   
-  #def add_event events_hash, offset, event
-  #  if events_hash.has_key? offset
-  #    events_hash[offset].push event
-  #  else
-  #    events_hash[offset] = [ event ]
-  #  end
-  #end
+  def replace_portamento_with_glissando notes
+    notes.each do |note|
+      note.links.each do |pitch,link|
+        if link.is_a? Music::Transcription::Link::Portamento
+          note.links[pitch] = Music::Transcription::Link::Glissando.new(link.target_pitch)
+        end
+      end
+    end
+  end
   
   def gather_note_events note_sequences
     note_events = []
@@ -65,8 +69,8 @@ class PartSequencer
         on_at = offset
         off_at = (i < (pitches.size - 1)) ? pitches[i+1][0] : note_seq.stop
         
-        note_events.push [on_at, NoteOnEvent.new(note_num, accented)]
-        note_events.push [off_at, NoteOffEvent.new(note_num)]
+        note_events.push [on_at, MidiEvent::NoteOn.new(note_num, accented)]
+        note_events.push [off_at, MidiEvent::NoteOff.new(note_num)]
       end
     end
     return note_events
@@ -91,7 +95,7 @@ class PartSequencer
       unless sample == prev
         offset = Rational(i,sample_rate)
         volume = MidiUtil.dynamic_to_volume(sample)
-        dynamic_events.push [offset, VolumeExpressionEvent.new(volume)]
+        dynamic_events.push [offset, MidiEvent::Expression.new(volume)]
       end
       prev = sample
     end

data/lib/music-performance/conversion/score_collator.rb

@@ -102,8 +102,6 @@ class ScoreCollator
           cur_notes[-1].duration -= overshoot
           cur_offset = seg.last
         end
-        
-        cur_notes[-1].links.clear
       end
       
       post_remainder = seg.last - cur_offset

data/lib/music-performance/version.rb

@@ -2,6 +2,6 @@
 module Music
 module Performance
   # music-performance version
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end
 end

data/spec/conversion/score_collator_spec.rb

@@ -82,6 +82,24 @@ describe ScoreCollator do
         end
       end
     end
+    
+    it 'should preserve links' do
+      notes = Parsing::notes("1Db4~Bb4")
+      score = Score.new(
+        FOUR_FOUR,120,
+        parts: { "lead" => Part.new(Dynamics::MP, notes: notes) },
+        program: Program.new([0..1,0..1]),
+      )
+      collator = ScoreCollator.new(score)
+      parts = collator.collate_parts
+      
+      notes = parts["lead"].notes
+      notes.size.should eq 2
+      notes.each do |note|
+        note.links.should have_key(Db4)
+        note.links[Db4].should be_a Link::Glissando
+      end
+    end
   end
   
   describe '#collate_tempo_changes' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: music-performance
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler