music-performance 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0aee433423e514dcf3e7c43cf3e41bedb419773
-  data.tar.gz: 935623cdf53a375dbbe7931f4bbc06857144a3eb
+  metadata.gz: a4b9f81c3aba7e25db75da9d71fc2ba25a842599
+  data.tar.gz: 2c5887333f7d6fb3ede15a6813ee1f89847f9fbc
 SHA512:
-  metadata.gz: 377e4df3573ca96e8b9307f87d8a4dc1cb5aef5bc709c841137649e7c973764b050ac3c2b0777188898c3d663305ec45cf31685a6839a0190f10ead2e9e495b4
-  data.tar.gz: 136086c85244cbcc75168c7de393ceec0df3d1ec6266aff023b8b21876d37c9f07dbacd2cb0f0735319eb1a232139fcc5bbbe020c0156d53d44de9b409971cf0
+  metadata.gz: 73c9896e59861efa226a2769bd621e869bbf56ba9d3ce1c1301f621dd7d41b3c175d07571568fd55244c5bf943f3243d7c49c8d1c9a4ef785faf7561ea2c3c5f
+  data.tar.gz: 1b8d20d458e90a90ee7211f71963becd03ebc563a124be25822f27d92c4738fe3c5735c38d3320dbaddda9c3e6eb3fc3c2e9fee499436d73ec2920b0da7f5b50

data/bin/midify

@@ -6,11 +6,17 @@ doc = <<DOCOPT
 Loads a music-transcription score from YAML file, and converts to MIDI file.
 
 Usage:
-  #{exe_name} <input>
+  #{exe_name} <input> [PART PROGRAM] ...
   #{exe_name} <input> <output>
   #{exe_name} -h | --help
   #{exe_name} --version
 
+Arguments:
+  input A music-transcription score file in YAML format
+  output Midi filename
+  PART name of a part in the score
+  PROGRAM MIDI program (instrument) number for the given part
+  
 Options:
   -h --help     Show this screen.
   --version     Show version.
@@ -42,8 +48,12 @@ File.open(fin_name) do |fin|
   puts "complete"
   
   if score.valid?
+    part_names = args["PART"]
+    program_nums = args["PROGRAM"].map {|str| str.to_i }
+    instr_map = Hash[[part_names,program_nums].transpose]
+    
     print "Making MIDI sequence..."
-    seq = Performance::ScoreSequencer.new(score).make_midi_seq
+    seq = Performance::ScoreSequencer.new(score).make_midi_seq(instr_map)
     puts "complete"  
   
     fout_name = args["<output>"]

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

@@ -15,8 +15,8 @@ class PartSequencer
     @events = (note_events + dynamic_events).sort
   end
   
-  def make_midi_track midi_sequence, part_name, channel, ppqn
-    track = begin_track(midi_sequence, part_name, channel)
+  def make_midi_track midi_sequence, part_name, channel, ppqn, program
+    track = begin_track(midi_sequence, part_name, channel, program)
     
     prev_offset = 0
     @events.each do |offset, event|
@@ -103,19 +103,19 @@ class PartSequencer
     return dynamic_events
   end
 
-  def begin_track midi_sequence, part_name, channel
+  def begin_track midi_sequence, part_name, channel, program
     # Track to hold part notes
     track = MIDI::Track.new(midi_sequence)
     
     # Name the track and instrument
-    track.name = part_name.to_s
+    track.name = part_name
     track.instrument = MIDI::GM_PATCH_NAMES[0]
     
     # Add a volume controller event (optional).
     track.events << MIDI::Controller.new(channel, MIDI::CC_VOLUME, 127)
     
     # Change to particular instrument sound
-    track.events << MIDI::ProgramChange.new(channel, 1, 0)
+    track.events << MIDI::ProgramChange.new(channel, program)
     
     return track
   end

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

@@ -7,9 +7,14 @@ class ScoreSequencer
       score.start_meter.beat_duration)
     @start_usec_per_qnote = MidiUtil.usec_per_qnote(start_nps)
     @parts = ScoreCollator.new(score).collate_parts
+    
+    # part names should all be strings, because 1) a midi track name needs to
+    # be a string and 2) the instrument map used to map part names to MIDI
+    # program numbers will use part name strings as keys.
+    @parts = Hash[ @parts.map {|k,v| [k.to_s,v] } ]
   end
 
-  def make_midi_seq
+  def make_midi_seq instr_map = {}
     seq = MIDI::Sequence.new()
     
     # first track for the sequence holds time sig and tempo events
@@ -20,8 +25,13 @@ class ScoreSequencer
     
     channel = 0
     @parts.each do |part_name,part|
+      program = 1
+      if instr_map.has_key?(part_name)
+        program = instr_map[part_name]
+      end
+      
       pseq = PartSequencer.new(part)
-      seq.tracks << pseq.make_midi_track(seq, part_name, channel, seq.ppqn)
+      seq.tracks << pseq.make_midi_track(seq, part_name, channel, seq.ppqn, program)
       channel += 1
     end
     

data/lib/music-performance/version.rb

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

metadata

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