link.rb in music-transcription-0.4.0

- old
+ new
@@ -6,110 +6,67 @@
 # @author James Tunnell
 #
 # @!attribute [rw] target_pitch
 #   @return [Pitch] The pitch of the note which is being connected to.
 #
-# @!attribute [rw] relationship
-#   @return [Symbol] The relationship between the current note and a consecutive
-#                    note. Valid values are RELATIONSHIP_NONE, RELATIONSHIP_TIE,
-#                    RELATIONSHIP_SLUR, RELATIONSHIP_LEGATO, RELATIONSHIP_GLISSANDO, 
-#                    and RELATIONSHIP_PORTAMENTO.
-#
 class Link
-  include Hashmake::HashMakeable
+  attr_accessor :target_pitch
   
-  # no relationship with the following note
-  RELATIONSHIP_NONE = :none
-  # tie to the following note
-  RELATIONSHIP_TIE = :tie
-  # play notes continuously and don't rearticulate
-  RELATIONSHIP_SLUR = :slur
-  # play notes continuously and do rearticulate
-  RELATIONSHIP_LEGATO = :legato
-  # play an uninterrupted slide through a series of consecutive tones to the next note.
-  RELATIONSHIP_GLISSANDO = :glissando
-  # play an uninterrupted glide to the next note.
-  RELATIONSHIP_PORTAMENTO = :portamento
-  
-  # a list of valid note relationships
-  RELATIONSHIPS = [
-    RELATIONSHIP_NONE,
-    RELATIONSHIP_TIE,
-    RELATIONSHIP_SLUR,
-    RELATIONSHIP_LEGATO,
-    RELATIONSHIP_GLISSANDO,
-    RELATIONSHIP_PORTAMENTO
-  ]
+  def initialize target_pitch
+    @target_pitch = target_pitch
+  end
 
-  # hashed-arg specs (for hash-makeable idiom)
-  ARG_SPECS = {
-    :target_pitch => arg_spec(:reqd => false, :type => Pitch, :default => ->(){ Pitch.new }),
-    :relationship => arg_spec(:reqd => false, :type => Symbol, :default => RELATIONSHIP_NONE, :validator => ->(a){ RELATIONSHIPS.include?(a)}),
-  }
-
-  attr_reader :target_pitch, :relationship
-  
-  # A new instance of Link.
-  # @param [Hash] args Hashed arguments. See ARG_SPECS for details about valid keys.
-  def initialize args={}
-    hash_make args
+  def ==(other)
+    self.class == other.class && self.target_pitch == other.target_pitch
   end
   
-  # Produce an identical Link object.
   def clone
-    Link.new(:target_pitch => @target_pitch.clone, :relationship => @relationship)
+    self.class.new @target_pitch.clone
   end
   
-  # Compare equality of two Link objects.
-  def ==(other)
-    return (@target_pitch == other.target_pitch) && (@relationship == other.relationship)
+  def to_s
+    return @target_pitch
   end
-
-  # Set the pitch of the note being connected to.
-  # @param [Pitch] target_pitch The pitch of the note being connected to.
-  # @raise [ArgumentError] if target_pitch is not a Pitch.
-  def target_pitch= target_pitch
-    ARG_SPECS[:target_pitch].validate_value target_pitch
-    @target_pitch = target_pitch
+  
+  class Slur < Link
+    def initialize target_pitch
+      super(target_pitch)
+    end
+    
+    def to_s
+      return "=" + super()
+    end
   end
-
-  # Set the note relationship.
-  # @param [Symbol] relationship The relationship of the note to the following 
-  #                  note (if applicable). Valid relationship are given by the 
-  #                  RELATIONSHIPS constant.
-  # @raise [ArgumentError] if relationship is not a valid relationship.
-  def relationship= relationship
-    ARG_SPECS[:relationship].validate_value relationship
-    @relationship = relationship
+  
+  class Legato < Link
+    def initialize target_pitch
+      super(target_pitch)
+    end  
+  
+    def to_s
+      return "-" + super()
+    end
   end
   
-end
-
-module_function
-
-# helper method to create a Link object with GLISSANDO relationship.
-def glissando pitch
-  Link.new(:target_pitch => pitch, :relationship => Link::RELATIONSHIP_GLISSANDO)
-end
-
-# helper method to create a Link object with LEGATO relationship.
-def legato pitch
-  Link.new(:target_pitch => pitch, :relationship => Link::RELATIONSHIP_LEGATO)
-end
-
-# helper method to create a Link object with PORTAMENTO relationship.
-def portamento pitch
-  Link.new(:target_pitch => pitch, :relationship => Link::RELATIONSHIP_PORTAMENTO)
-end
-
-# helper method to create a Link object with SLUR relationship.
-def slur pitch
-  Link.new(:target_pitch => pitch, :relationship => Link::RELATIONSHIP_SLUR)
-end
-
-# helper method to create a Link object with TIE relationship.
-def tie pitch
-  Link.new(:target_pitch => pitch, :relationship => Link::RELATIONSHIP_TIE)
+  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()
+    end
+  end
 end
 
 end
 end