release: 1.1.6

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index 443088c9526c6b80224a6db4a15cfaaf37311630..316cbff1d95e7d8db5ff655c852fe62d38ed6617 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -3,18 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #include "music.hh"
 #include "music-list.hh"
 #include "debug.hh"
+#include "musical-pitch.hh"
 
-MInterval
-Music::time_int() const
+Moment
+Music::duration () const
 {
-  return MInterval (0,0);
+  return 0;
 }
 
 void
@@ -23,7 +24,7 @@ Music::print() const
 #ifndef NPRINT
   if (! check_debug)
     return ;
-  DOUT << name() << "{";
+  DOUT << classname(this) << "{";
   if  (translator_type_str_.length_i ())
     DOUT << translator_type_str_ << " = " << translator_id_str_;
   do_print();
@@ -32,32 +33,33 @@ Music::print() const
 }
 
 void
-Music::transpose (Melodic_req const*)
+Music::transpose (Musical_pitch )
 {
   
 }
 
-void
-Music::translate (Moment)
-{
-}
-
 void
 Music::do_print() const
 {
 }
 
 
-IMPLEMENT_IS_TYPE_B(Music);
+
 
 
 
   
 Music::Music()
 {
-  parent_music_l_ =0;
 }
 
-IMPLEMENT_IS_TYPE_B1(Change_reg,Music)
+Musical_pitch
+Music::to_relative_octave (Musical_pitch m)
+{
+  return m;
+}
 
-     
+void    
+Music::compress (Moment)
+{
+}