* lily/side-position-interface.cc: remove add_staff_support ()

[lilypond.git] / lily / voice-devnull-engraver.cc

diff --git a/lily/voice-devnull-engraver.cc b/lily/voice-devnull-engraver.cc
index 084d6584470b7519aef2c130007ca22145fc2680..81e99a03add0acb09d48140f9e2a56b87f214575 100644 (file)
--- a/lily/voice-devnull-engraver.cc
+++ b/lily/voice-devnull-engraver.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
 #include "item.hh"
-#include "request.hh"
+#include "event.hh"
 #include "translator-group.hh"
 
 class Voice_devnull_engraver : public Engraver
@@ -44,12 +44,6 @@ Voice_devnull_engraver::try_music (Music *m)
 {
   SCM s = get_property ("devNullVoice");
 
-#if 0
-  /* No need */
-  if (gh_equal_p (s, ly_symbol2scm ("never")))
-    return;
-#endif
-
   if (gh_equal_p (s, ly_symbol2scm ("always"))
       || (s == SCM_EOL
          && daddy_trans_->id_string_.left_string (3) == "two"
@@ -66,7 +60,7 @@ Voice_devnull_engraver::try_music (Music *m)
                return true;
            }
        }
-      /* Ugh.  Should eat other requests, script etc. too. */  
+      /* Ugh.  Should eat other events, script etc. too. */  
       else if (m->is_mus_type ("tie-event"))
        return true;
     }
@@ -92,30 +86,16 @@ void
 Voice_devnull_engraver::acknowledge_grob (Grob_info i)
 {
   SCM s = get_property ("devNullVoice");
-#if 0
-  /* No need, next if will never be true */
-  if (s == ly_symbol2scm ("never"))
-    return;
-#endif
 
-#if 0  /* We used to have have this until 1.5.68.  Not sure about
-         soloADue requirement */
   if (s == ly_symbol2scm ("always")
       || (s == SCM_EOL
-         && daddy_trans_->id_string_.left_string (3) == "two"
-         && (to_boolean (get_property ("unison"))
-             || to_boolean (get_property ("unisilence")))))
-#else
-    if (s == ly_symbol2scm ("always")
-       || (s == SCM_EOL
-           && to_boolean (get_property ("soloADue"))
-           && ((daddy_trans_->id_string_.left_string (3) == "two"
-                && (to_boolean (get_property ("unison"))
-                    || to_boolean (get_property ("unisilence"))))
+         && to_boolean (get_property ("soloADue"))
+         && ((daddy_trans_->id_string_.left_string (3) == "two"
+              && (to_boolean (get_property ("unison"))
+                  || to_boolean (get_property ("unisilence"))))
                
-               /* Maybe this should be optional? */
+             /* Maybe this should be optional? */
              || to_boolean (get_property ("othersolo")))))
-#endif
     
     for (char const **p = junk_interfaces; *p; p++)
       if (i.grob_->internal_has_interface (ly_symbol2scm (*p)))