rhythmruby 0.1.2 → 0.1.3

data/README.md

@@ -92,3 +92,8 @@ Acknowledgment
 --------------
 thanks Jim Menard for **midilib**, a pure ruby MIDI library.
 https://github.com/jimm/midilib
+
+Versions
+--------
+0.1.2 :           added LogicalRhythms class                                                                                   
+0.1.0/0.1.1 :     initial release                                                                                           

data/examples/Meshuggah_example.rb

@@ -84,8 +84,9 @@ rhythms.each_key do
   
   # write the midi info/sequence to the midiTrack
   midiWriter.writeSeqToTrack(midiSequence, midiTrack)
-
 end
 
+# merge the midi tracks to a single track (for single file import into DAW)
+midiWriter.mergeTracks
 # write the midiSong to a file
 midiWriter.writeToFile(fileName)

data/examples/drum_kit_example.rb

@@ -76,5 +76,8 @@ rhythms.each_key do
 
 end
 
+# merge tracks for single file load in DAW
+midiWriter.mergeTracks
+
 # write the midiSong to a file
 midiWriter.writeToFile(fileName)

data/lib/rhythmruby/LogicalRhythms.rb

@@ -18,7 +18,7 @@ class LogicalRhythms
     return slaveRhythm
   end  
 
-  # logical XOR of two rhythms, true except both true
+  # logical XOR of two rhythms, true except both true or both false
   # @param [String] masterRhythm rhythm to intersect with
   # @param [String] slaveRhythm rhythm to intersect
   # @return [String] intersected slaveRhythm

data/lib/rhythmruby/MidiWriter.rb

@@ -47,8 +47,11 @@ class MidiWriter
   # @param [Float] noteLength length of the midiEvent, in multiples of the quarternote
   # @param [MIDI::Track] midiTrack where the event is written to
   def writeNote(midiNote, noteLength, midiTrack)
-      midiTrack.events << MIDI::NoteOnEvent.new(0, midiNote, 127, 0) 
-      midiTrack.events << MIDI::NoteOffEvent.new(0, midiNote, 127, \
+      # if the velocity is 0, the note is not played.
+      # use this for an initial silent note.
+      velocity = (midiNote == 0) ? 0 : 127
+      midiTrack.events << MIDI::NoteOnEvent.new(0, midiNote, velocity, 0) 
+      midiTrack.events << MIDI::NoteOffEvent.new(0, midiNote, velocity, \
       @song.length_to_delta(noteLength))
   end
 
@@ -57,4 +60,16 @@ class MidiWriter
   def writeToFile(fileName)
     open(fileName, 'w') {|f| @song.write(f) }
   end
-end
+
+
+  # merge all tracks in the midi song, this will create a one polyphonic track
+  # some editors see different tracks as different instruments (logic)
+  # if so, after merging: all notes/tracks will belong to one instrument  
+  def mergeTracks
+    masterTrack = MIDI::Track.new(@song) # create master final track
+    @song.tracks.each do |track|            # for each track in the current song
+      masterTrack.merge(track.events)       # merge it with the master track
+    end
+    @song.tracks = [masterTrack]            # replace all tracks with the one master
+  end
+end

data/lib/rhythmruby/RhythmParser.rb

@@ -1,7 +1,7 @@
 
 # Parser (use as class) of the rhythm strings, consisting event and silence symbols
 class RhythmParser
-  @@silenceNote = 1 # pitch of a note played at during initial silence in a sequence
+  @@silenceNote = 0 # pitch of a note played during initial silence in a sequence
   @@silenceMark = '-' # symbol identified as a silence
   @@eventMark = '#' # symbol identified as an event
   @@eventNote = 50 # (unused default) midi note of an event

data/lib/rhythmruby/version.rb

@@ -1,3 +1,3 @@
 module Rhythmruby
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhythmruby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midilib
@@ -70,9 +70,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: represent rhythms as symbolic Strings and write them to MIDI
 test_files: []
-has_rdoc: