patch::: 1.3.59.uu2.jcn1

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index 7de77d1fc9551ee6d5eed197aa5165054593cc4c..7b6cf607329ecbb3e19cde1901761949d314afcf 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -3,60 +3,58 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+ #include <typeinfo>
 
 #include "music.hh"
 #include "music-list.hh"
 #include "debug.hh"
+#include "musical-pitch.hh"
 
-MInterval
-Music::time_int() const
+Music::Music()
 {
-  return MInterval (0,0);
 }
 
-void
-Music::print() const
+void    
+Music::compress (Moment)
 {
-#ifndef NPRINT
-  if (! check_debug)
-       return ;
-  DOUT << name() << "{";
-  if  (type_str_!="" || id_str_!="")
-       DOUT << "`" <<type_str_ << " = " << id_str_<<"\'";
-  do_print();
-  DOUT << "}\n";
-#endif
 }
 
 void
-Music::transpose (Melodic_req const*)
+Music::do_print() const
 {
-  
 }
 
-void
-Music::translate (Moment)
+Moment
+Music::length_mom () const
 {
+  return 0;
 }
 
 void
-Music::do_print() const
+Music::print() const
 {
+#ifndef NPRINT
+  if (! flower_dstream)
+    return ;
+  DEBUG_OUT << classname(this) << "{";
+  
+  do_print();
+  DEBUG_OUT << "}\n";
+#endif
 }
 
-
-IMPLEMENT_IS_TYPE_B(Music);
-
+Musical_pitch
+Music::to_relative_octave (Musical_pitch m)
+{
+  return m;
+}
 
 
-  
-Music::Music()
+void
+Music::transpose (Musical_pitch )
 {
-  parent_music_l_ =0;
 }
 
-IMPLEMENT_IS_TYPE_B1(Change_reg,Music)
-