music-transcription 0.4.3 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a6d788f46caca37944982343c4fd7ec55200310
-  data.tar.gz: 96c0300d656be7096ff6fbd72190901eeb97e4e2
+  metadata.gz: e6f207886559e2a15ebe43acec8a9249947ccb08
+  data.tar.gz: 2ee121f009ce424d08f77d5ac506b198119f0fdb
 SHA512:
-  metadata.gz: 36af747fe2e4777228bb3ef078ab86aecb4425a95eb30f2d547a7772068db062db3708d17f0044537813ede0a3557c6765f0642e706c9058eab07308c6df1420
-  data.tar.gz: 0172b4db35f2abf6bb2a81afcffa4ee93f975e0551f0d03840c868eec74bdba6dd717b144ec4daafc81936b3e294e3a3601c0cac892e892577e73d16722d7fca
+  metadata.gz: a27f3c9b90864626b185fbece7ffe7db5fb57a734498e2289e1c5e90acba9208302ed9d357f5c0a35178962b0a12eb1b5bb095f04ae86c44aed936b8f0f4b162
+  data.tar.gz: f789efa1958c83eb509a43f12c1cd8d37f4cb31822c2953e7e5ed819321776ed014129c46dc271192c91b3b24751d8df9d190dc7430761d0d8463369de60fb2b

data/lib/music-transcription.rb

@@ -3,13 +3,14 @@ require 'music-transcription/version'
 
 # code for transcribing (representing) music
 require 'music-transcription/pitch'
-require 'music-transcription/pitch_constants'
+require 'music-transcription/pitches'
 require 'music-transcription/link'
 require 'music-transcription/accent'
+require 'music-transcription/change'
 require 'music-transcription/note'
-require 'music-transcription/transition'
-require 'music-transcription/value_change'
 require 'music-transcription/profile'
+require 'music-transcription/dynamic'
+require 'music-transcription/dynamics'
 require 'music-transcription/part'
 require 'music-transcription/program'
 require 'music-transcription/tempo'

data/lib/music-transcription/accent.rb

@@ -14,34 +14,21 @@ class Accent
     self.class.new
   end
   
-  class Stacatto < Accent
-    def to_s
-      return "."
-    end
-  end
-  
-  class Stacattissimo < Accent
-    def to_s
-      return "'"
-    end
-  end
-  
-  class Marcato < Accent
-    def to_s
-      return ">"
-    end
-  end
-
-  class Martellato < Accent
-    def to_s
-      return "^"
-    end
-  end
-
-  class Tenuto < Accent
-    def to_s
-      return "_"
+  { :Staccato => ".",
+    :Staccatissimo => "'",
+    :Marcato => ">",
+    :Martellato => "^",
+    :Tenuto => "_",
+    :Forte => "f",
+    :Fortissimo => "ff",
+    :Fortississimo => "fff"
+  }.each do |name,print_str|
+    klass = Class.new(Accent) do
+      def to_s
+        print_str
+      end
     end
+    Accent.const_set(name.to_sym, klass)
   end
 end
 

data/lib/music-transcription/change.rb

@@ -0,0 +1,29 @@
+module Music
+module Transcription
+
+class Change
+  attr_reader :value
+  
+  def initialize value
+    @value = value
+  end
+  
+  def ==(other)
+    self.class == other.class && self.value == other.value
+  end
+
+  class Immediate < Change
+    def initialize value
+      super(value)
+    end
+  end
+  
+  class Gradual < Change
+    def initialize value
+      super(value)
+    end
+  end
+end
+
+end
+end

data/lib/music-transcription/dynamic.rb

@@ -0,0 +1,36 @@
+module Music
+module Transcription
+
+# Defines a dynamic level
+#
+# @author James Tunnell
+#
+class Dynamic
+  def ==(other)
+    self.class == other.class
+  end
+  
+  def clone
+    self.class.new
+  end
+  
+  { :Piano => "p",
+    :Pianissimo => "pp",
+    :Pianississimo => "ppp",
+    :MezzoPiano => "mp",
+    :MezzoForte => "mf",
+    :Forte => "f",
+    :Fortissimo => "ff",
+    :Fortississimo => "fff"
+  }.each do |name,print_str|
+    klass = Class.new(Dynamic) do
+      def to_s
+        print_str
+      end
+    end
+    Dynamic.const_set(name.to_sym, klass)
+  end
+end
+
+end
+end

data/lib/music-transcription/dynamics.rb

@@ -0,0 +1,14 @@
+module Music
+module Transcription
+module Dynamics  
+  PPP = Dynamic::Pianississimo.new
+  PP = Dynamic::Pianissimo.new
+  P = Dynamic::Piano.new
+  MP = Dynamic::MezzoPiano.new
+  MF = Dynamic::MezzoForte.new
+  F = Dynamic::Forte.new
+  FF = Dynamic::Fortissimo.new
+  FFF = Dynamic::Fortississimo.new
+end
+end
+end

data/lib/music-transcription/link.rb

@@ -23,48 +23,21 @@ class Link
     self.class.new @target_pitch.clone
   end
   
-  def to_s
-    return @target_pitch
-  end
-  
-  class Slur < Link
-    def initialize target_pitch
-      super(target_pitch)
-    end
-    
-    def to_s
-      return "=" + super()
-    end
-  end
-  
-  class Legato < Link
-    def initialize target_pitch
-      super(target_pitch)
-    end  
-  
-    def to_s
-      return "-" + super()
-    end
-  end
-  
-  class Glissando < Link
-    def initialize target_pitch
-      super(target_pitch)
-    end
-    
-    def to_s
-      return "~" + super()
-    end
-  end
-  
-  class Portamento < Link
-    def initialize target_pitch
-      super(target_pitch)
-    end
-    
-    def to_s
-      return "/" + super()
+  { :Slur => "=",
+    :Legato => "-",
+    :Glissando => "~",
+    :Portamento => "/",
+  }.each do |name,print_str|
+    klass = Class.new(Link) do
+      def initialize target_pitch
+        super(target_pitch)
+      end
+      
+      def to_s
+        print_str + @target_pitch
+      end
     end
+    Link.const_set(name.to_sym, klass)
   end
 end
 

data/lib/music-transcription/note.rb

@@ -106,6 +106,60 @@ class Note
     
     return output
   end
+  
+  class Sixteenth < Note
+    def initialize pitches = [], links: {}, accent: nil
+      super(Rational(1,16),pitches, links: links, accent: accent)
+    end
+  end
+
+  class DottedSixteenth < Note
+    def initialize pitches = [], links: {}, accent: nil
+      super(Rational(3,32),pitches, links: links, accent: accent)
+    end
+  end
+  
+  class Eighth < Note
+    def initialize pitches = [], links: {}, accent: nil
+      super(Rational(1,8),pitches, links: links, accent: accent)
+    end
+  end
+
+  class DottedEighth < Note
+    def initialize pitches = [], links: {}, accent: nil
+      super(Rational(3,16),pitches, links: links, accent: accent)
+    end
+  end
+  
+  class Quarter < Note
+    def initialize pitches = [], links: {}, accent: nil
+      super(Rational(1,4),pitches, links: links, accent: accent)
+    end
+  end
+  
+  class DottedQuarter < Note
+    def initialize pitches = [], links: {}, accent: nil
+      super(Rational(3,8),pitches, links: links, accent: accent)
+    end
+  end
+
+  class Half < Note
+    def initialize pitches = [], links: {}, accent: nil
+      super(Rational(1,2),pitches, links: links, accent: accent)
+    end
+  end
+
+  class Half < Note
+    def initialize pitches = [], links: {}, accent: nil
+      super(Rational(3,4),pitches, links: links, accent: accent)
+    end
+  end
+  
+  class Whole < Note
+    def initialize pitches = [], links: {}, accent: nil
+      super(Rational(1,1),pitches, links: links, accent: accent)
+    end
+  end
 end
 
 end

data/lib/music-transcription/part.rb

@@ -10,15 +10,15 @@ module Transcription
 # @!attribute [r] notes
 #   @return [Array] The notes to be played.
 #
-# @!attribute [r] loudness_profile
-#   @return [Profile] The parts loudness_profile profile.
+# @!attribute [r] dynamic_profile
+#   @return [Profile] Dynamic values profile
 #
 class Part
-  attr_reader :loudness_profile, :notes
+  attr_reader :notes, :dynamic_profile
   
-  def initialize notes: [], loudness_profile: Profile.new(0.5)
+  def initialize notes: [], dynamic_profile: Profile.new(Dynamics::MF)
     @notes = notes
-    @loudness_profile = loudness_profile
+    @dynamic_profile = dynamic_profile
   end
   
   # Produce an exact copy of the current object
@@ -29,7 +29,7 @@ class Part
   # Compare the equality of another Part object.
   def ==(other)
     return (@notes == other.notes) &&
-    (@loudness_profile == other.loudness_profile)    
+    (@dynamic_profile == other.dynamic_profile)
   end
 
   # Duration of part notes.

data/lib/music-transcription/pitches.rb

@@ -0,0 +1,23 @@
+module Music
+module Transcription
+
+module Pitches
+  # Define pitch objects for octaves octave 0 through 9
+  {
+    :Bb => 10, :B => 11,
+    :Cb => 11, :C => 0,
+    :Db => 1, :D => 2,
+    :Eb => 3, :E => 4,
+    :Fb => 4, :F => 5,
+    :Gb => 6, :G => 7,
+    :Ab => 8, :A => 9,
+  }.each do |sym,pc|
+    (0..9).each do |octave|
+      obj = Pitch.new octave: octave, semitone: pc
+      Pitches.const_set(:"#{sym}#{octave}",obj)
+    end
+  end
+end
+
+end
+end

data/lib/music-transcription/profile.rb

@@ -8,9 +8,6 @@ module Transcription
 class Profile
   attr_accessor :start_value, :value_changes
 
-  # A new instance of Profile.
-  #
-  # @param [Hash] args Hashed args. Required key is :start_value. Optional key is :value_changes.
   def initialize start_value, value_changes = {}
     @start_value = start_value
     @value_changes = value_changes

data/lib/music-transcription/score.rb

@@ -6,17 +6,31 @@ module Transcription
 # @author James Tunnell
 #
 # @!attribute [rw] parts
-#   @return [Array] Score parts.
+#   @return [Hash] Score parts, mapped to part names
 # 
 # @!attribute [rw] program
-#   @return [Array] Score program.
+#   @return [Program] Score program (which segments are played when)
+#
+# @!attribute [rw] tempo_profile
+#   @return [Profile] Tempo values profile
 #
 class Score
-  attr_reader :parts, :program
+  attr_reader :parts, :program, :tempo_profile
   
-  def initialize parts: {}, program: Program.new
+  def initialize parts: {}, program: Program.new, tempo_profile: Profile.new(Tempo.new(120))
     @parts = parts
     @program = program
+    @tempo_profile = tempo_profile
+  end
+
+  def clone
+    Marshal.load(Marshal.dump(self))
+  end
+  
+  def ==(other)
+    return (@tempo_profile == other.tempo_profile) &&
+    (@program == other.program) &&
+    (@parts == other.parts)
   end
     
   # Find the start of a score. The start will be at then start of whichever part begins
@@ -46,40 +60,5 @@ class Score
   end
 end
 
-# Score where time is based on absolute time in seconds
-class TimeScore < Score
-  attr_reader :program, :parts
-
-  def clone
-    TimeScore.new @parts, @programs
-  end
-  
-  def ==(other)
-    return (@program == other.program) &&
-    (@parts == other.parts)
-  end
-end
-
-# Score where time is based on notes and tempo.
-class TempoScore < Score
-  attr_reader :tempo_profile, :program, :parts
-
-  def initialize tempo_profile, parts: {}, program: Program.new
-    @tempo_profile = tempo_profile
-    raise ValueNotPositiveError unless @tempo_profile.values_positive?
-    super(parts: parts, program: program)
-  end
-  
-  def clone
-    TempoScore.new @tempo_profile.clone, @parts.clone, @program.clone
-  end
-  
-  def ==(other)
-    return (@tempo_profile == other.tempo_profile) &&
-    (@program == other.program) &&
-    (@parts == other.parts)
-  end
-end
-
 end
 end

data/lib/music-transcription/version.rb

@@ -2,6 +2,6 @@
 module Music
 module Transcription
   # music-transcription version
-  VERSION = "0.4.3"
+  VERSION = "0.5.2"
 end
 end

data/spec/note_spec.rb

@@ -12,8 +12,8 @@ describe Note do
     end
     
     it "should assign :accent parameter if given during construction" do
-      note = Note.new 2, accent: Accent::Stacatto.new
-      note.accent.class.should eq(Accent::Stacatto)
+      note = Note.new 2, accent: Accent::Staccato.new
+      note.accent.class.should eq(Accent::Staccato)
     end
     
     it 'should have no pitches if not given' do

data/spec/part_spec.rb

@@ -2,16 +2,18 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Part do
   context '.new' do
-    its(:notes) { should be_empty }
-    
-    it "should assign loudness_profile profile given during construction" do
-      loudness_profile = Profile.new(0.5, 1.0 => linear_change(1.0, 2.0))
-      part = Part.new loudness_profile: loudness_profile
-      part.loudness_profile.should eq(loudness_profile)
+    it 'should have no notes' do
+      Part.new.notes.should be_empty
+    end
+
+    it "should assign dynamic profile given during construction" do
+      profile = Profile.new(Dynamics::FFF, { 1.0 => Change::Immediate.new(Dynamics::PP) })
+      part = Part.new dynamic_profile: profile
+      part.dynamic_profile.should eq(profile)
     end  
     
     it "should assign notes given during construction" do
-      notes = [ Note.new(0.25, [C1,D1]) ]
+      notes = [ Note::Quarter.new([C1,D1]) ]
       part = Part.new notes: notes
       part.notes.should eq(notes)
     end

data/spec/profile_spec.rb

@@ -10,8 +10,8 @@ describe Profile do
     
     it "should assign settings given during construction" do
       p = Profile.new(0.2,
-        1.0 => ValueChange.new(0.5),
-        1.5 => ValueChange.new(1.0)
+        1.0 => Change::Immediate.new(0.5),
+        1.5 => Change::Immediate.new(1.0)
       )
       p.value_changes[1.0].value.should eq(0.5)
       p.value_changes[1.5].value.should eq(1.0)

data/spec/program_spec.rb

@@ -14,7 +14,7 @@ describe Program do
       program = Program.new segments
       
       [0.0, 4.0, 5.0, 9.999].each do |offset|
-        program.include?(offset).should be_true
+        program.include?(offset).should be true
       end
     end
 
@@ -23,7 +23,7 @@ describe Program do
       program = Program.new segments
       
       [-0.000001, 10.000001].each do |offset|
-        program.include?(offset).should be_false
+        program.include?(offset).should be false
       end
     end
   end

data/spec/score_spec.rb

@@ -1,50 +1,22 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe TimeScore do
+describe Score do
   before :each do
     @parts = { "piano (LH)" => Samples::SAMPLE_PART }
     @program = Program.new [0...0.75, 0...0.75]
   end
   
   describe '.new' do
-    context "no args given" do
-      let(:score) { TimeScore.new }
-      subject { score }
-      its(:program) { should eq(Program.new) }
-      its(:parts) { should be_empty }
-    end
-    
-    context 'args given' do
-      it "should assign parts given during construction" do
-        score = TimeScore.new :program => @program, :parts => @parts
-        score.parts.should eq(@parts)
-      end
-      
-      it "should assign program given during construction" do
-        score = TimeScore.new :program => @program
-        score.program.should eq(@program)
-      end      
-    end
-  end
-end
-
-describe TempoScore do
-  before :each do
-    @parts = { "piano (LH)" => Samples::SAMPLE_PART }
-    @program = Program.new [0...0.75, 0...0.75]
-    @tempo_profile = Profile.new(Tempo.new(120), 0.5 => linear_change(Tempo.new(60), 0.25))
-  end
-  
-  describe '.new' do
-    it "should assign tempo profile given during construction" do
-      score = TempoScore.new @tempo_profile
-      score.tempo_profile.should eq(@tempo_profile)
-    end
-    
     it "should assign part and program given during construction" do
-      score = TempoScore.new @tempo_profile, parts: @parts, program: @program
+      score = Score.new parts: @parts, program: @program
       score.parts.should eq(@parts)
       score.program.should eq(@program)
     end
+
+    it "should assign tempo profile given during construction" do
+      profile = Profile.new(Tempo.new(200), { 0.5 => Change::Gradual.new(120) })
+      score = Score.new tempo_profile: profile
+      score.tempo_profile.should eq(profile)
+    end    
   end
 end

data/spec/spec_helper.rb

@@ -2,10 +2,11 @@ require 'rspec'
 require 'music-transcription'
 
 include Music::Transcription
+include Music::Transcription::Pitches
 
 class Samples
   SAMPLE_PART = Part.new(
-    :notes => [ Note.new(0.25, [ C1, D1 ]) ],
-    :loudness_profile => Profile.new(0.5, 1.0 => linear_change(1.0, 2.0))
+    notes: [ Note::Quarter.new([ C1, D1 ]), Note::Quarter.new([ C2, D2 ]), Note::Whole.new([ C3, D3 ]) ],
+    dynamic_profile: Profile.new(Dynamics::P, {1.0 => Change::Immediate.new(Dynamics::MP)})
   )
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: music-transcription
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.2
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,18 +130,19 @@ files:
 - bin/transcribe
 - lib/music-transcription.rb
 - lib/music-transcription/accent.rb
+- lib/music-transcription/change.rb
+- lib/music-transcription/dynamic.rb
+- lib/music-transcription/dynamics.rb
 - lib/music-transcription/errors.rb
 - lib/music-transcription/link.rb
 - lib/music-transcription/note.rb
 - lib/music-transcription/part.rb
 - lib/music-transcription/pitch.rb
-- lib/music-transcription/pitch_constants.rb
+- lib/music-transcription/pitches.rb
 - lib/music-transcription/profile.rb
 - lib/music-transcription/program.rb
 - lib/music-transcription/score.rb
 - lib/music-transcription/tempo.rb
-- lib/music-transcription/transition.rb
-- lib/music-transcription/value_change.rb
 - lib/music-transcription/version.rb
 - music-transcription.gemspec
 - samples/arrangements/glissando_test.yml
@@ -171,8 +172,6 @@ files:
 - spec/program_spec.rb
 - spec/score_spec.rb
 - spec/spec_helper.rb
-- spec/transition_spec.rb
-- spec/value_change_spec.rb
 homepage: https://github.com/jamestunnell/music-transcription
 licenses:
 - MIT
@@ -208,6 +207,4 @@ test_files:
 - spec/program_spec.rb
 - spec/score_spec.rb
 - spec/spec_helper.rb
-- spec/transition_spec.rb
-- spec/value_change_spec.rb
 has_rdoc: 

data/lib/music-transcription/pitch_constants.rb

@@ -1,204 +0,0 @@
-module Music
-module Transcription
-
-# Define twelve pitch constants for each octave from octave 0 through 8.
-
-# A pitch on octave 0
-A0  = Pitch.new octave: 0, semitone: 9
-# Bb pitch on octave 
-Bb0 = Pitch.new octave: 0, semitone: 10
-# B pitch on octave 0
-B0  = Pitch.new octave: 0, semitone: 11
-
-# C pitch on octave 1
-C1  = Pitch.new octave: 1, semitone: 0
-# Db pitch on octave 1
-Db1 = Pitch.new octave: 1, semitone: 1
-# E pitch on octave 1
-D1  = Pitch.new octave: 1, semitone: 2
-# Eb pitch on octave 1
-Eb1 = Pitch.new octave: 1, semitone: 3
-# E pitch on octave 1
-E1  = Pitch.new octave: 1, semitone: 4
-# F pitch on octave 1
-F1  = Pitch.new octave: 1, semitone: 5
-# Gb pitch on octave 1
-Gb1 = Pitch.new octave: 1, semitone: 6
-# G pitch on octave 1
-G1  = Pitch.new octave: 1, semitone: 7
-# Ab pitch on octave 1
-Ab1 = Pitch.new octave: 1, semitone: 8
-# A pitch on octave 1
-A1  = Pitch.new octave: 1, semitone: 9
-# Bb pitch on octave 
-Bb1 = Pitch.new octave: 1, semitone: 10
-# B pitch on octave 1
-B1  = Pitch.new octave: 1, semitone: 11
-
-# C pitch on octave 2
-C2  = Pitch.new octave: 2, semitone: 0
-# Db pitch on octave 2
-Db2 = Pitch.new octave: 2, semitone: 1
-# E pitch on octave 2
-D2  = Pitch.new octave: 2, semitone: 2
-# Eb pitch on octave 2
-Eb2 = Pitch.new octave: 2, semitone: 3
-# E pitch on octave 2
-E2  = Pitch.new octave: 2, semitone: 4
-# F pitch on octave 2
-F2  = Pitch.new octave: 2, semitone: 5
-# Gb pitch on octave 2
-Gb2 = Pitch.new octave: 2, semitone: 6
-# G pitch on octave 2
-G2  = Pitch.new octave: 2, semitone: 7
-# Ab pitch on octave 2
-Ab2 = Pitch.new octave: 2, semitone: 8
-# A pitch on octave 2
-A2  = Pitch.new octave: 2, semitone: 9
-# Bb pitch on octave 
-Bb2 = Pitch.new octave: 2, semitone: 10
-# B pitch on octave 2
-B2  = Pitch.new octave: 2, semitone: 11
-
-# C pitch on octave 3
-C3  = Pitch.new octave: 3, semitone: 0
-# Db pitch on octave 3
-Db3 = Pitch.new octave: 3, semitone: 1
-# E pitch on octave 3
-D3  = Pitch.new octave: 3, semitone: 2
-# Eb pitch on octave 3
-Eb3 = Pitch.new octave: 3, semitone: 3
-# E pitch on octave 3
-E3  = Pitch.new octave: 3, semitone: 4
-# F pitch on octave 3
-F3  = Pitch.new octave: 3, semitone: 5
-# Gb pitch on octave 3
-Gb3 = Pitch.new octave: 3, semitone: 6
-# G pitch on octave 3
-G3  = Pitch.new octave: 3, semitone: 7
-# Ab pitch on octave 3
-Ab3 = Pitch.new octave: 3, semitone: 8
-# A pitch on octave 3
-A3  = Pitch.new octave: 3, semitone: 9
-# Bb pitch on octave 
-Bb3 = Pitch.new octave: 3, semitone: 10
-# B pitch on octave 3
-B3  = Pitch.new octave: 3, semitone: 11
-
-# C pitch on octave 4
-C4  = Pitch.new octave: 4, semitone: 0
-# Db pitch on octave 4
-Db4 = Pitch.new octave: 4, semitone: 1
-# E pitch on octave 4
-D4  = Pitch.new octave: 4, semitone: 2
-# Eb pitch on octave 4
-Eb4 = Pitch.new octave: 4, semitone: 3
-# E pitch on octave 4
-E4  = Pitch.new octave: 4, semitone: 4
-# F pitch on octave 4
-F4  = Pitch.new octave: 4, semitone: 5
-# Gb pitch on octave 4
-Gb4 = Pitch.new octave: 4, semitone: 6
-# G pitch on octave 4
-G4  = Pitch.new octave: 4, semitone: 7
-# Ab pitch on octave 4
-Ab4 = Pitch.new octave: 4, semitone: 8
-# A pitch on octave 4
-A4  = Pitch.new octave: 4, semitone: 9
-# Bb pitch on octave 
-Bb4 = Pitch.new octave: 4, semitone: 10
-# B pitch on octave 4
-B4  = Pitch.new octave: 4, semitone: 11
-
-# C pitch on octave 5
-C5  = Pitch.new octave: 5, semitone: 0
-# Db pitch on octave 5
-Db5 = Pitch.new octave: 5, semitone: 1
-# E pitch on octave 5
-D5  = Pitch.new octave: 5, semitone: 2
-# Eb pitch on octave 5
-Eb5 = Pitch.new octave: 5, semitone: 3
-# E pitch on octave 5
-E5  = Pitch.new octave: 5, semitone: 4
-# F pitch on octave 5
-F5  = Pitch.new octave: 5, semitone: 5
-# Gb pitch on octave 5
-Gb5 = Pitch.new octave: 5, semitone: 6
-# G pitch on octave 5
-G5  = Pitch.new octave: 5, semitone: 7
-# Ab pitch on octave 5
-Ab5 = Pitch.new octave: 5, semitone: 8
-# A pitch on octave 5
-A5  = Pitch.new octave: 5, semitone: 9
-# Bb pitch on octave 
-Bb5 = Pitch.new octave: 5, semitone: 10
-# B pitch on octave 5
-B5  = Pitch.new octave: 5, semitone: 11
-
-# C pitch on octave 6
-C6  = Pitch.new octave: 6, semitone: 0
-# Db pitch on octave 6
-Db6 = Pitch.new octave: 6, semitone: 1
-# E pitch on octave 6
-D6  = Pitch.new octave: 6, semitone: 2
-# Eb pitch on octave 6
-Eb6 = Pitch.new octave: 6, semitone: 3
-# E pitch on octave 6
-E6  = Pitch.new octave: 6, semitone: 4
-# F pitch on octave 6
-F6  = Pitch.new octave: 6, semitone: 5
-# Gb pitch on octave 6
-Gb6 = Pitch.new octave: 6, semitone: 6
-# G pitch on octave 6
-G6  = Pitch.new octave: 6, semitone: 7
-# Ab pitch on octave 6
-Ab6 = Pitch.new octave: 6, semitone: 8
-# A pitch on octave 6
-A6  = Pitch.new octave: 6, semitone: 9
-# Bb pitch on octave 
-Bb6 = Pitch.new octave: 6, semitone: 10
-# B pitch on octave 6
-B6  = Pitch.new octave: 6, semitone: 11
-
-# C pitch on octave 7
-C7  = Pitch.new octave: 7, semitone: 0
-# Db pitch on octave 7
-Db7 = Pitch.new octave: 7, semitone: 1
-# E pitch on octave 7
-D7  = Pitch.new octave: 7, semitone: 2
-# Eb pitch on octave 7
-Eb7 = Pitch.new octave: 7, semitone: 3
-# E pitch on octave 7
-E7  = Pitch.new octave: 7, semitone: 4
-# F pitch on octave 7
-F7  = Pitch.new octave: 7, semitone: 5
-# Gb pitch on octave 7
-Gb7 = Pitch.new octave: 7, semitone: 6
-# G pitch on octave 7
-G7  = Pitch.new octave: 7, semitone: 7
-# Ab pitch on octave 7
-Ab7 = Pitch.new octave: 7, semitone: 8
-# A pitch on octave 7
-A7  = Pitch.new octave: 7, semitone: 9
-# Bb pitch on octave 
-Bb7 = Pitch.new octave: 7, semitone: 10
-# B pitch on octave 7
-B7  = Pitch.new octave: 7, semitone: 11
-
-# C pitch on octave 8
-C8  = Pitch.new octave: 8, semitone: 0
-
-# Contain pitch objects from A0 to C8
-PITCHES = [
-                                          A0, Bb0, B0,
-  C1, Db1, D1, Eb1, E1, F1, Gb1, G1, Ab1, A1, Bb1, B1,
-  C2, Db2, D2, Eb2, E2, F2, Gb2, G2, Ab2, A2, Bb2, B2,
-  C3, Db3, D3, Eb3, E3, F3, Gb3, G3, Ab3, A3, Bb3, B3,
-  C4, Db4, D4, Eb4, E4, F4, Gb4, G4, Ab4, A4, Bb4, B4,
-  C5, Db5, D5, Eb5, E5, F5, Gb5, G5, Ab5, A5, Bb5, B5,
-  C6, Db6, D6, Eb6, E6, F6, Gb6, G6, Ab6, A6, Bb6, B6,
-  C7, Db7, D7, Eb7, E7, F7, Gb7, G7, Ab7, A7, Bb7, B7,
-  C8
-]
-end
-end

data/lib/music-transcription/transition.rb

@@ -1,55 +0,0 @@
-module Music
-module Transcription
-
-# Describes how to transition from one value to another.
-class Transition
-  attr_reader :duration
-  
-  def initialize duration
-    @duration = duration
-  end
-  
-  def ==(other)
-    @duration == other.duration
-  end
-
-  class Immediate < Transition
-    def initialize
-      super(0)
-    end
-    
-    def clone
-      Immediate.new
-    end
-  end
-  
-  class Linear < Transition
-    def initialize duration
-      super(duration)
-    end
-    
-    def clone
-      Linear.new @duration
-    end
-  end
-  
-  class Sigmoid < Transition
-    attr_reader :abruptness
-    def initialize duration, abruptness = 0.5
-      @abruptness = abruptness
-      super(duration)
-    end
-    
-    def clone
-      Sigmoid.new @duration, @abruptness
-    end
-    
-    def == other
-      @abruptness == other.abruptness &&
-      @duration == other.duration
-    end
-  end
-end
-
-end
-end

data/lib/music-transcription/value_change.rb

@@ -1,59 +0,0 @@
-module Music
-module Transcription
-
-# A value change event, with a value and transition.
-#
-# @author James Tunnell
-#
-# @!attribute [rw] duration
-#   @return [Numeric] The duration of the event. Must be in the range MIN_OFFSET..MAX_OFFSET
-#
-# @!attribute [rw] value
-#   @return [Numeric] The value of the event.
-#
-class ValueChange
-  attr_accessor :value, :transition
-
-  # New instance of ValueChange.
-  # @param [Hash] args Hashed arguments for initialization.
-  def initialize value, transition = Transition::Immediate.new
-    @value = value
-    @transition = transition
-  end
-  
-  # Compare the equality of another ValueChange object.
-  def == other
-    return (@value == other.value) &&
-    (@transition == other.transition)
-  end
-  
-  # Produce an identical ValueChange object
-  def clone
-    return ValueChange.new(@value, @transition.clone)
-  end
-end
-
-module_function
-
-# Creates a ValueChange object using an immediate transition.
-# @param [Object] value
-def immediate_change(value)
-  return ValueChange.new(value, Transition::Immediate.new)
-end
-
-# Creates a ValueChange object using a linear transition.
-# @param [Object] value
-# @param [Transition] transition_duration Length of the transition
-def linear_change(value, transition_duration = 0.0)
-  return ValueChange.new(value, Transition::Linear.new(transition_duration))
-end
-
-# Creates a ValueChange object using a sigmoid transition.
-# @param [Object] value
-# @param [Transition] transition_duration Length of the transition
-def sigmoid_change(value, transition_duration = 0.0, abruptness = 0.5)
-  return ValueChange.new(value, Transition::Sigmoid.new(transition_duration, abruptness))
-end
-
-end
-end

data/spec/transition_spec.rb

@@ -1,31 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Transition do
-  describe Transition::Immediate do
-    describe '.new' do
-      it "should assign duration of 0" do
-        t = Transition::Immediate.new()
-        t.duration.should eq(0)
-      end
-    end
-  end
-  
-  describe Transition::Linear do
-    describe '.new' do
-      it "should assign duration given" do
-        t = Transition::Linear.new(1.5)
-        t.duration.should eq(1.5)
-      end
-    end
-  end
-  
-  describe Transition::Immediate do
-    describe '.new' do
-      it "should assign duration and abruptness given" do
-        t = Transition::Sigmoid.new(1.2, 0.4)
-        t.duration.should eq(1.2)
-        t.abruptness.should eq(0.4)
-      end
-    end
-  end
-end

data/spec/value_change_spec.rb

@@ -1,19 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe ValueChange do
-  
-  context '.new' do
-    it "should assign offset, value, and duration given during construction" do
-      event = ValueChange.new(0)
-      event.value.should eq(0)
-      event.transition.class.should eq(Transition::Immediate)
-      event.transition.duration.should eq(0)
-      
-      event = ValueChange.new(2, Transition::Linear.new(3))
-      event.value.should eq(2)
-      event.transition.class.should eq(Transition::Linear)
-      event.transition.duration.should eq(3)
-    end
-  end
-
-end