release: 1.3.8

[lilypond.git] / lily / command-request.cc

diff --git a/lily/command-request.cc b/lily/command-request.cc
index e682c8a4f603d8e3e7d3a6314dee26cd2b7c9a45..c9f75ead8515b42c0279c7bed4d474a995e408fe 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -10,27 +10,6 @@
 #include "debug.hh"
 #include "musical-request.hh"
 
-void
-Cadenza_req::do_print () const
-{
-#ifndef NPRINT
-  DOUT << (int)on_b_;
-#endif
-}
-
-bool
-Cadenza_req::do_equal_b (Request const *r) const
-{
-  Cadenza_req const*cad =  dynamic_cast <Cadenza_req const *> (r);
-  return cad && cad->on_b_ == on_b_;
-}
-
-Cadenza_req::Cadenza_req (bool b)
-{
-  on_b_ =b;
-}
-
-
 
 bool
 Bar_req::do_equal_b (Request const *r) const
@@ -43,7 +22,7 @@ void
 Bar_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << type_str_;
+  DEBUG_OUT << type_str_;
 #endif
 }
 
@@ -52,18 +31,7 @@ Bar_req::Bar_req (String s)
   type_str_ = s;
 }
 
-Partial_measure_req::Partial_measure_req (Moment m)
-{
-  length_mom_ =m;
-}
 
-bool
-Partial_measure_req::do_equal_b (Request const* r) const
-{
-  Partial_measure_req  const*p = dynamic_cast <Partial_measure_req  const*> (r);
-
-  return p&& p->length_mom_ == length_mom_;
-}
 
 bool
 Barcheck_req::do_equal_b (Request const *r) const
@@ -76,7 +44,7 @@ void
 Clef_change_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << clef_str_ ;
+  DEBUG_OUT << clef_str_ ;
 #endif
 }
 
@@ -85,17 +53,12 @@ Clef_change_req::Clef_change_req (String s)
   clef_str_ = s;
 }
 
-void
-Partial_measure_req::do_print () const
-{
-  DOUT << length_mom_;
-}
 
 void
 Time_signature_change_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << beats_i_ << "/" << one_beat_i_;
+  DEBUG_OUT << beats_i_ << "/" << one_beat_i_;
 #endif
 }
 
@@ -125,7 +88,7 @@ Tempo_req::Tempo_req ()
 void
 Tempo_req::do_print () const
 {
-  DOUT << dur_.str () << " = " << metronome_i_;
+  DEBUG_OUT << dur_.str () << " = " << metronome_i_;
 }
 
 
@@ -157,7 +120,6 @@ Key_change_req::Key_change_req ()
 
 Break_req::Break_req ()
 {
-  penalty_i_ = 0;
 }
 
 Mark_req::Mark_req (String s)
@@ -168,7 +130,7 @@ Mark_req::Mark_req (String s)
 void
 Mark_req::do_print () const
 {
-  DOUT << str_;
+  DEBUG_OUT << str_;
 }
 void
 Key_change_req::transpose (Musical_pitch p)