patch::: 1.3.127.jcn4

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

diff --git a/lily/thread-devnull-engraver.cc b/lily/thread-devnull-engraver.cc
index 6436f0c2efd5c39203f33153ea57e79eb2b5a0b0..4006c476a243d2f539bec3039a9abb135794fef5 100644 (file)
--- a/lily/thread-devnull-engraver.cc
+++ b/lily/thread-devnull-engraver.cc
@@ -17,15 +17,29 @@ public:
   VIRTUAL_COPY_CONS (Translator);
   
 protected:
-  virtual void acknowledge_element (Score_element_info);
+  virtual void acknowledge_grob (Grob_info);
 };
 
 ADD_THIS_TRANSLATOR (Thread_devnull_engraver);
 
 void
-Thread_devnull_engraver::acknowledge_element (Score_element_info i)
+Thread_devnull_engraver::acknowledge_grob (Grob_info i)
 {
-  if (daddy_trans_l_->id_str_ == "two"
+  /*
+    FIXME: coriolan-fix hack -- ff  geen inspiratie
+    
+    We should have at least three modes:
+    
+      1. Never -- do nothing
+      2. Allways -- junk everythingallways
+      3. Regular: junk according to two/unison/unisilence/soloADue
+
+    but how shall we do that?
+
+    Hmm, maybe just: threadDevNull = 'never|'allways|...
+   */
+  if (!to_boolean (get_property ("disableDevNullThread"))
+      && daddy_trans_l_->id_str_.left_str (3) == "two"
       && (to_boolean (get_property ("unison"))
          || to_boolean (get_property ("unisilence")))
       && to_boolean (get_property ("soloADue")))