kuromusic 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6bfa0bd38071a7eff140febd8dd6ecd0b306d36
-  data.tar.gz: a56453eb5f4890ded06656a5951d0efc8f053ce4
+  metadata.gz: 88c575d4c2225a5beb8d75be9e12d85a8fb0d319
+  data.tar.gz: 73347be8d64387812c8f06b4371e76c81154d5e8
 SHA512:
-  metadata.gz: 66ba15156b082ecf6a7e34e06d7086764d61efe202eea111a6e0b7781790cbbeec82aba8678db014268933da90acc40508af64579bab8899cb55e6c686903b71
-  data.tar.gz: 99f38c4b27bfd4054f2ea1ced1feb5b4ec7f2c9fb3c5d393f786bda7bd6a3f9e008b775ad45e1e43d32a7f3994d618b88578c85274a5a73643130cf95c98c100
+  metadata.gz: 663b0c54a70421da648756bd07eb421db0bdf1cca094e61e4e08b9b07b57c0ba65cf22fd63e81764160b16aa5c22ecbe1b5768983ed19802e7ba8ec68496943e
+  data.tar.gz: aec00d04e584d9d925b405cdf470587a3df815cc6de092458177ec7de80995c55a620f7f883275eb83cd723f83907d8e48b711e802151c215d4e0cabf96fd4e4

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+*.mid

data/README.md

@@ -3,7 +3,7 @@
 KuroMusic is midi controll library writed by ruby.
 
 ##version
-0.0.1
+0.0.2
 
 ## Installation
 
@@ -28,15 +28,58 @@ you should require KuroMusic in your source code to use those method.
 require "KuroMusic"
 ```
 
-###generate melody automaticaly
+###generating melody on yourself
+```ruby:
+DELTA_TIME = 480
+midi = Midi.new(DELTA_TIME, 1)
+chords1 = [
+  Chord.new([Note.new("A", 4, 100, 480),Note.new("C", 4, 100, 480),Note.new("E", 4, 100, 480)]),
+  Chord.new([Note.new("B", 4, 100, 480),Note.new("D", 4, 100, 480),Note.new("F", 4, 100, 480)]),
+  Chord.new([Note.new("C", 4, 100, 480),Note.new("E", 4, 100, 480),Note.new("G", 4, 100, 480)]),
+  Chord.new([Note.new("D", 4, 100, 480),Note.new("F", 4, 100, 480),Note.new("A", 4, 100, 480)]),
+]
+chords2 = [
+  Chord.new([Note.new("E", 4, 100, 480),Note.new("G", 4, 100, 480),Note.new("B", 4, 100, 480)]),
+  Chord.new([Note.new("F", 4, 100, 480),Note.new("A", 4, 100, 480),Note.new("C", 4, 100, 480)]),
+  Chord.new([Note.new("G", 4, 100, 480),Note.new("B", 4, 100, 480),Note.new("D", 4, 100, 480)]),
+]
+midi.tracks[0] = Track.new(
+  [
+    Measure.new(chords1),
+    Measure.new(chords2)
+  ]
+)
+```
+
+###generating melody automaticaly
 ```ruby:
 DELTA_TIME = 480
 midi = Midi.new(DELTA_TIME, 2)
-melo = MelodyGenerater.new(DELTA_TIME, Scale::MAJOR).extend(MelodyGenerater::Rand)
+melo = MelodyGenerater.new(DELTA_TIME, Scale::MAJOR).extend(MelodyGenerater::Schenker)
 midi.tracks[0] = melo.cantus(10)
 midi.tracks[1] = melo.base(10)
 ```
 
+###changing tempo
+```ruby:
+can = melo.cantus(10)
+can[0].set_meta(Event::Meta::set_tempo(171))
+```
+
+###connecting tracks
+```ruby:
+a_can = melo.cantus(10)
+b_can = melo.cantus(10)
+midi.tracks[0] = a_can + b_can
+```
+
+###connecting tracks
+```ruby:
+a_can = melo.cantus(10)
+b_can = melo.cantus(10)
+midi.tracks[0] = a_can + b_can
+```
+
 ###write midi file
 ```ruby:
 Midi::IO.write("hoge3.mid", midi)

data/lib/kuromusic/Generator/Random.rb

@@ -4,40 +4,32 @@ class MelodyGenerater
       def fiber(octave, notes, num)
         Fiber.new do |dur, velocity|
           while true do
-            ons = (0..(num-1)).to_a.map{|item|
+            dur, velocity = Fiber.yield (0..(num-1)).to_a.map{|item|
               note = notes.sample
-              [Event::Note::rest(0), Event::Note::on(note, octave, velocity)]
+              Note.new(note, octave, velocity, dur)
             }
-            offs = ons.each_with_index.map{|item, i|
-              if i == 0
-                [Event::Note::rest(dur), Event::Note::off(item[1].args[:note], octave)]
-              else
-                [Event::Note::rest(0), Event::Note::off(item[1].args[:note], octave)]
-              end
-            }
-            dur, velocity = Fiber.yield [ons, offs].flatten
           end
         end
       end
 
       def common(length, octave, _note_times, notes)
-        events = []
         f = fiber(octave, notes, 2)
-        length.times {|i|
+        (1..length).map {|i|
+          chords = []
           note_times = _note_times[0..(_note_times.length - 1)]
           dur = note_times.sample
-          events.concat f.resume(dur, 100)
+          chords.push Chord.new(f.resume(dur, 100))
           _sub = @measure - dur
           note_times.reverse.each_with_index {|t, i|
             times = note_times[0..(note_times.length - 1 - i)]
             while _sub >= t do
               dur = times.sample
-              events.concat f.resume(dur, 100)
+              chords.push Chord.new(f.resume(dur, 100))
               _sub = _sub - dur
             end
           }
+          Measure.new(chords)
         }
-        events
       end
 
     public

data/lib/kuromusic/Generator/Schenker.rb

@@ -8,45 +8,37 @@ class MelodyGenerater
         Fiber.new do |dur, velocity|
           while true do
             notes.each{|n|
-              ons = (0..(num-1)).to_a.map{|item|
+              dur, velocity = Fiber.yield (0..(num-1)).to_a.map{|item|
                 _n = n + (2 * item)
                 octave = octave + _n / 12
                 number = _n % 12
                 note = Scale::number_to_code(number)
-                [Event::Note::rest(0), Event::Note::on(note, octave, velocity)]
+                Note.new(note, octave, velocity, dur)
               }
-              offs = ons.each_with_index.map{|item, i|
-                if i == 0
-                  [Event::Note::rest(dur), Event::Note::off(item[1].args[:note], octave)]
-                else
-                  [Event::Note::rest(0), Event::Note::off(item[1].args[:note], octave)]
-                end
-              }
-              dur, velocity = Fiber.yield [ons, offs].flatten
             }
           end
         end
       end
 
       def common(length, octave, _note_times, notes)
-        events = []
         f = fiber(octave, notes, 2)
-        length.times {|i|
+        (1..length).map {|i|
+          chords = []
           note_times = _note_times[0..(_note_times.length - 1)]
           dur = note_times.sample
-          events.concat f.resume(dur, 100)
+          chords.push Chord.new(f.resume(dur, 100))
           _sub = @measure - dur
           note_times.reverse.each_with_index {|t, i|
             times = note_times[0..(note_times.length - 1 - i)]
             while _sub >= t do
               note = @scale.sample
               dur = times.sample
-              events.concat [Event::Note::rest(0), Event::Note::on(note, octave, 100), Event::Note::rest(dur), Event::Note::off(note, octave)]
+              chords.push Chord.new([Note.new(note, octave, 100, dur)])
               _sub = _sub - dur
             end
           }
+          Measure.new(chords)
         }
-        events
       end
 
     public

data/lib/kuromusic/IO/MIDI/Chord.rb

@@ -0,0 +1,28 @@
+require_relative "Event"
+
+class Midi
+  private
+    module Chord
+      public
+        def to_bin()
+          predur = 0
+          ons = []
+          offs = []
+          maxdur = 0
+          @notes.sort {|a, b|
+            a.dur <=> b.dur
+          }.each {|n|
+            ons += [::Event::Note::rest(0), n.get_on_event]
+            maxdur = n.dur if maxdur < n.dur
+          }.each {|n|
+            currentdur = n.dur - predur
+            offs += [::Event::Note::rest(currentdur), n.get_off_event]
+            predur = n.dur
+          }
+          (ons + offs).map {|e|
+            e.extend(Midi::Event)
+            e.to_bin
+          }.flatten!
+        end
+    end
+end

data/lib/kuromusic/IO/MIDI/{MidiEvent.rb → Event.rb}

@@ -1,6 +1,6 @@
 class Midi
   private
-  module MidiEvent
+  module Event
     private
       def var_len n
         n < 0x80 ? [n] : [(n>>7|0x80), n % 0x80]
@@ -8,13 +8,13 @@ class Midi
 
       def note_to_bin()
         case @args[:method]
-        when Event::EventType::Note::REST
+        when ::Event::EventType::Note::REST
           dur = var_len(@args[:dur])
           return dur
-        when Event::EventType::Note::OFF
+        when ::Event::EventType::Note::OFF
           note_num = NOTE[@args[:note]] + @args[:octave] * OCTAVE_UNIT
           return [0x80, note_num, 0]
-        when Event::EventType::Note::ON
+        when ::Event::EventType::Note::ON
           note_num = NOTE[@args[:note]] + @args[:octave] * OCTAVE_UNIT
           return [0x90, note_num, @args[:velocity]]
         end
@@ -22,7 +22,7 @@ class Midi
 
       def meta_to_bin()
         case @args[:method]
-        when Event::EventType::Meta::SET_TEMPO
+        when ::Event::EventType::Meta::SET_TEMPO
           tempo = 60000000 / @args[:tempo]
           return [0, 0xff, 0x51, 0x03, tempo >> 16, tempo >> 8, tempo % 256]
         end
@@ -33,9 +33,10 @@ class Midi
       OCTAVE_UNIT = 12
 
       def to_bin()
-        if @args[:type] == Event::EventType::NOTE
+        #p self.args
+        if @args[:type] == ::Event::EventType::NOTE
           return note_to_bin
-        elsif @args[:type] == Event::EventType::META
+        elsif @args[:type] == ::Event::EventType::META
           return meta_to_bin
         end
       end

data/lib/kuromusic/IO/MIDI/Measure.rb

@@ -0,0 +1,17 @@
+require_relative "Chord"
+require_relative "Event"
+
+class Midi
+  private
+    module Measure
+      def to_bin()
+        @metas.map {|m|
+          m.extend(Midi::Event)
+          m.to_bin
+        }.flatten.concat @chords.map {|c|
+          c.extend(Midi::Chord)
+          c.to_bin
+        }.flatten!
+      end
+    end
+end

data/lib/kuromusic/IO/MIDI/{MidiTrack.rb → Track.rb}

@@ -1,11 +1,13 @@
+require_relative "Measure"
+
 class Midi
   private
-    module MidiTrack
+    module Track
       def to_bin()
         track = []
-        @events.each {|e|
-          e.extend(MidiEvent)
-          track.concat e.to_bin
+        @measures.each {|m|
+          m.extend(Midi::Measure)
+          track.concat m.to_bin
         }
         tl = track.concat([0, 0xff, 0x02, 0]).size
         result = [0x4d, 0x54, 0x72, 0x6b, tl >> 24, tl >> 16, tl >> 8, tl % 256].concat track

data/lib/kuromusic/IO/MIDI.rb

@@ -1,5 +1,4 @@
-require_relative "MIDI/MidiEvent"
-require_relative "MIDI/MidiTrack"
+require_relative "MIDI/Track"
 
 class Midi
   module IO
@@ -14,11 +13,11 @@ class Midi
         dtime = midi.dtime
         file.write [0x4d, 0x54, 0x68, 0x64, 0, 0, 0, 6, 0, 1, track_num >> 8, track_num % 256, dtime >> 8, dtime % 256].pack('C*')
         midi.tracks.each {|track|
-          track.extend(MidiTrack)
+          track.extend(Midi::Track)
           m = track.to_bin
           track.each {|e|
             #[e.args[:type], e.args[:method], e.args[:note], e.args[:octave], e.args[:dur], e.args[:velocity]]
-            p e.args
+            #p e.args
           }
           #p m
           file.write m.pack('C*')

data/lib/kuromusic/MIDI.rb

@@ -10,7 +10,7 @@ class Midi
   end
 
   def initialize(dtime, track_num)
-    @tracks = Array.new(track_num, Track.new([]))
+    @tracks = Array.new(track_num, ::Track.new([]))
     @dtime = dtime
   end
 end

data/lib/kuromusic/MelodyGenerater.rb

@@ -1,4 +1,3 @@
-require_relative "Event"
 require_relative "Track"
 
 require_relative "Generator/Random"

data/lib/kuromusic/{Event.rb → Track/Measure/Chord/Note/Event.rb}

@@ -8,4 +8,9 @@ class Event
     def initialize(args)
       @args = args
     end
+
+  public
+    def inspect()
+      "< " + @args.to_s + " >"
+    end
 end

data/lib/kuromusic/Track/Measure/Chord/Note.rb

@@ -0,0 +1,24 @@
+require_relative "Note/Event"
+
+class Note < Object
+  attr_reader :note, :octave, :velocity, :dur
+  public
+    def initialize(note, octave, velocity, dur)
+      @note = note
+      @octave = octave
+      @dur = dur
+      @velocity = velocity
+    end
+
+    def get_on_event()
+      Event::Note::on(@note, @octave, @velocity)
+    end
+
+    def get_off_event()
+      Event::Note::off(@note, @octave)
+    end
+
+    def inspect()
+      "<:note=>" + @note + ", :octave=>" + @octave.to_s + ", :velocity:=>" + @velocity.to_s + ", :duration=>" + @dur.to_s + ">"
+    end
+end

data/lib/kuromusic/Track/Measure/Chord.rb

@@ -0,0 +1,11 @@
+require_relative "Chord/Note"
+
+class Chord < Object
+  def initialize(notes = [])
+    @notes = notes
+  end
+
+  def inspect()
+    @notes.map{|n| n.inspect}.join(",\n    ")
+  end
+end

data/lib/kuromusic/Track/Measure.rb

@@ -0,0 +1,26 @@
+require_relative "Measure/Chord"
+
+class Measure < Object
+  def initialize(chords = [], metas = [])
+    @chords = chords
+    @metas = metas
+  end
+
+  def set_meta(meta_event)
+    if meta_event.class.to_s != "Event"
+      self.error_puts("ArgumentTypeError", "undefined method `+'")
+    elsif meta_event.args[:type] != Event::EventType::META
+      self.error_puts("EventTypeError", "undefined method `+'")
+    end
+    @metas.push(meta_event)
+    self
+  end
+
+  def inspect()
+    "
+  " + @metas.map{|m| m.inspect}.join("\n  ),\n  (\n    ") + "
+  (
+    " + @chords.map{|m| m.inspect}.join("\n  ),\n  (\n    ") + "
+  )"
+  end
+end

data/lib/kuromusic/Track.rb

@@ -1,17 +1,18 @@
 require_relative "Object"
+require_relative "Track/Measure"
 
 class Track < Object
-  def initialize(events = [])
-    @events = events
+  def initialize(measures = [])
+    @measures = measures
   end
 
   def [](index)
-    @events[index]
+    @measures[index]
   end
 
   def []=(index, obj)
-    if obj.class.to_s == "Event"
-      @events[index] = obj
+    if obj.class.to_s == "Measure"
+      @measures[index] = obj
     else
       self.error_puts("ArgumentTypeError", "undefined method `+'")
     end
@@ -19,16 +20,16 @@ class Track < Object
 
   def insert(index, *objs)
     objs.each {|e|
-      if e.class.to_s != "Event"
+      if e.class.to_s != "Measure"
         self.error_puts("ArgumentTypeError", "undefined method `+'")
       end
     }
-    @events.insert(index, *objs)
+    @measures.insert(index, *objs)
   end
 
   def push(obj)
-    if obj.class.to_s == "Event"
-      @events.push(obj)
+    if obj.class.to_s == "Measure"
+      @measures.push(obj)
     else
       self.error_puts("ArgumentTypeError", "undefined method `+'")
     end
@@ -36,8 +37,8 @@ class Track < Object
   end
 
   def unshift(obj)
-    if obj.class.to_s == "Event"
-      @events.unshift(obj)
+    if obj.class.to_s == "Measure"
+      @measures.unshift(obj)
     else
       self.error_puts("ArgumentTypeError", "undefined method `+'")
     end
@@ -45,26 +46,26 @@ class Track < Object
   end
 
   def each()
-    @events.each {|e|
+    @measures.each {|e|
       yield(e)
     }
   end
 
   def each_with_index()
-    @events.each {|e|
+    @measures.each {|e|
       yield(e)
     }
   end
 
   def map()
-    result = @events.map {|e|
+    result = @measures.map {|e|
       yield(e)
     }
     Track.new(result)
   end
 
   def map!()
-    @events.map! {|e|
+    @measures.map! {|e|
       yield(e)
     }
   end
@@ -72,7 +73,7 @@ class Track < Object
   def +(other)
     tmp = []
     if other.class.to_s == "Track"
-      tmp.push(@events)
+      tmp.push(@measures)
       other.each{|e|
         tmp.push(e)
       }
@@ -82,4 +83,10 @@ class Track < Object
     end
     Track.new(tmp)
   end
+
+  def inspect()
+    "[
+  " + @measures.map{|m| m.inspect}.join("\n  ----------------------------------------------------------\n  ") + "
+]"
+  end
 end

data/lib/kuromusic/version.rb

@@ -1,3 +1,3 @@
 module Kuromusic
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/kuromusic.rb

@@ -1,4 +1,5 @@
-require "kuromusic/version"
+require_relative "kuromusic/version"
 require_relative "kuromusic/MIDI"
 require_relative "kuromusic/Scale"
+require_relative "kuromusic/Track"
 require_relative "kuromusic/MelodyGenerater"

data/lib/sample/main.rb

@@ -2,15 +2,17 @@ require_relative "../KuroMusic"
 
 DELTA_TIME = 480
 midi = Midi.new(DELTA_TIME, 2)
-melo = MelodyGenerater.new(DELTA_TIME, Scale::MAJOR, []).extend(MelodyGenerater::Schenker)
+melo = MelodyGenerater.new(DELTA_TIME, Scale::MAJOR).extend(MelodyGenerater::Schenker)
 
-a_can = melo.cantus(5).unshift(Event::Meta::set_tempo(171))
-b_can = melo.cantus(5)#.unshift(Event::Meta::set_tempo(140))
-s_can = melo.cantus(10)#.unshift(Event::Meta::set_tempo(190))
+a_can = melo.cantus(5)
+a_can[0].set_meta(Event::Meta::set_tempo(171))
+b_can = melo.cantus(5)
+s_can = melo.cantus(10)
 
-a_bas = melo.base(5).unshift(Event::Meta::set_tempo(171))
-b_bas = melo.base(5)#.unshift(Event::Meta::set_tempo(140))
-s_bas = melo.base(10)#.unshift(Event::Meta::set_tempo(190))
+a_bas = melo.base(5)
+a_bas[0].set_meta(Event::Meta::set_tempo(171))
+b_bas = melo.base(5)
+s_bas = melo.base(10)
 
 midi.tracks[0] = a_can + b_can + s_can + a_can + b_can + s_can + a_can
 midi.tracks[1] = a_bas + b_bas + s_bas + a_bas + b_bas + s_bas + a_bas

data/lib/sample/main2.rb

@@ -0,0 +1,25 @@
+require_relative "../KuroMusic"
+
+DELTA_TIME = 480
+midi = Midi.new(DELTA_TIME, 1)
+chords1 = [
+  Chord.new([Note.new("A", 4, 100, 480),Note.new("C", 4, 100, 480),Note.new("E", 4, 100, 480)]),
+  Chord.new([Note.new("B", 4, 100, 480),Note.new("D", 4, 100, 480),Note.new("F", 4, 100, 480)]),
+  Chord.new([Note.new("C", 4, 100, 480),Note.new("E", 4, 100, 480),Note.new("G", 4, 100, 480)]),
+  Chord.new([Note.new("D", 4, 100, 480),Note.new("F", 4, 100, 480),Note.new("A", 4, 100, 480)]),
+]
+chords2 = [
+  Chord.new([Note.new("E", 4, 100, 480),Note.new("G", 4, 100, 480),Note.new("B", 4, 100, 480)]),
+  Chord.new([Note.new("F", 4, 100, 480),Note.new("A", 4, 100, 480),Note.new("C", 4, 100, 480)]),
+  Chord.new([Note.new("G", 4, 100, 480),Note.new("B", 4, 100, 480),Note.new("D", 4, 100, 480)]),
+]
+midi.tracks[0] = Track.new(
+  [
+    Measure.new(chords1),
+    Measure.new(chords2)
+  ]
+)
+
+p midi.tracks[0]
+
+Midi::IO.write("../../hoge3.mid", midi)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuromusic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - "黒澤 預生"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,23 +53,29 @@ files:
 - kuromusic.gemspec
 - lib/kuromusic.rb
 - lib/kuromusic/ChordProgressionGenerator.rb
-- lib/kuromusic/Event.rb
-- lib/kuromusic/Event/EventType.rb
-- lib/kuromusic/Event/MetaEvent.rb
-- lib/kuromusic/Event/NoteEvent.rb
 - lib/kuromusic/Generator/Random.rb
 - lib/kuromusic/Generator/Schenker.rb
 - lib/kuromusic/IO/MIDI.rb
-- lib/kuromusic/IO/MIDI/MidiEvent.rb
-- lib/kuromusic/IO/MIDI/MidiTrack.rb
+- lib/kuromusic/IO/MIDI/Chord.rb
+- lib/kuromusic/IO/MIDI/Event.rb
+- lib/kuromusic/IO/MIDI/Measure.rb
+- lib/kuromusic/IO/MIDI/Track.rb
 - lib/kuromusic/Key.rb
 - lib/kuromusic/MIDI.rb
 - lib/kuromusic/MelodyGenerater.rb
 - lib/kuromusic/Object.rb
 - lib/kuromusic/Scale.rb
 - lib/kuromusic/Track.rb
+- lib/kuromusic/Track/Measure.rb
+- lib/kuromusic/Track/Measure/Chord.rb
+- lib/kuromusic/Track/Measure/Chord/Note.rb
+- lib/kuromusic/Track/Measure/Chord/Note/Event.rb
+- lib/kuromusic/Track/Measure/Chord/Note/Event/EventType.rb
+- lib/kuromusic/Track/Measure/Chord/Note/Event/MetaEvent.rb
+- lib/kuromusic/Track/Measure/Chord/Note/Event/NoteEvent.rb
 - lib/kuromusic/version.rb
 - lib/sample/main.rb
+- lib/sample/main2.rb
 homepage: ''
 licenses:
 - MIT