*** empty log message ***

[lilypond.git] / lily / grob-pitch-tuple.cc

diff --git a/lily/grob-pitch-tuple.cc b/lily/grob-pitch-tuple.cc
index 9ffca254b764eadca498337e67bbac5230b0e481..c112c5ebcbd15181a784f7b950e257b2a805c2a3 100644 (file)
--- a/lily/grob-pitch-tuple.cc
+++ b/lily/grob-pitch-tuple.cc
@@ -3,13 +3,13 @@ grob-pitch-tuple.cc --  implement Grob_pitch_tuple
 
 source file of the GNU LilyPond music typesetter
 
-(c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2001--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
+
 #include "grob-pitch-tuple.hh"
-#include "pitch.hh"
-#include "musical-request.hh"
 
+#include "event.hh"
 
 int compare (Grob_pitch_tuple const &a, Grob_pitch_tuple const &b)
 {
@@ -21,14 +21,14 @@ int compare (Grob_pitch_tuple const &a, Grob_pitch_tuple const &b)
 
 Grob_pitch_tuple::Grob_pitch_tuple ()
 {
-  head_l_ =0;
+  head_ = 0;
   end_ = 0;
 }
 
-Grob_pitch_tuple::Grob_pitch_tuple (Grob *h, Melodic_req*m, Moment mom)
+Grob_pitch_tuple::Grob_pitch_tuple (Grob *h, Music *m, Moment mom)
 {
-  head_l_ = h;
-  pitch_ = *unsmob_pitch (m->get_mus_property ("pitch"));
+  head_ = h;
+  pitch_ = *unsmob_pitch (m->get_property ("pitch"));
   end_ = mom;
 }
 
@@ -46,5 +46,5 @@ int
 Grob_pitch_tuple::time_compare (Grob_pitch_tuple const&h1,
                                   Grob_pitch_tuple const &h2)
 {
-  return Moment::compare(h1.end_,  h2.end_);
+  return Moment::compare (h1.end_,  h2.end_);
 }