patch::: 1.3.59.uu2.jcn1

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index 316cbff1d95e7d8db5ff655c852fe62d38ed6617..7b6cf607329ecbb3e19cde1901761949d314afcf 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -3,54 +3,47 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.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"
 
-Moment
-Music::duration () const
+Music::Music()
 {
-  return 0;
 }
 
-void
-Music::print() const
+void    
+Music::compress (Moment)
 {
-#ifndef NPRINT
-  if (! check_debug)
-    return ;
-  DOUT << classname(this) << "{";
-  if  (translator_type_str_.length_i ())
-    DOUT << translator_type_str_ << " = " << translator_id_str_;
-  do_print();
-  DOUT << "}\n";
-#endif
 }
 
 void
-Music::transpose (Musical_pitch )
+Music::do_print() const
 {
-  
 }
 
-void
-Music::do_print() const
+Moment
+Music::length_mom () const
 {
+  return 0;
 }
 
-
-
-
-
-
-  
-Music::Music()
+void
+Music::print() const
 {
+#ifndef NPRINT
+  if (! flower_dstream)
+    return ;
+  DEBUG_OUT << classname(this) << "{";
+  
+  do_print();
+  DEBUG_OUT << "}\n";
+#endif
 }
 
 Musical_pitch
@@ -59,7 +52,9 @@ Music::to_relative_octave (Musical_pitch m)
   return m;
 }
 
-void    
-Music::compress (Moment)
+
+void
+Music::transpose (Musical_pitch )
 {
 }
+