From: fred <fred>
Date: Wed, 27 Mar 2002 00:48:53 +0000 (+0000)
Subject: lilypond-1.3.129
X-Git-Tag: release/1.5.59~939
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f680cd9e877577a355a1fbfe6790c4afcf36ac4e;p=lilypond.git

lilypond-1.3.129
---

diff --git a/lily/thread-devnull-engraver.cc b/lily/thread-devnull-engraver.cc
index 4006c476a2..83c1f2a36f 100644
--- a/lily/thread-devnull-engraver.cc
+++ b/lily/thread-devnull-engraver.cc
@@ -25,23 +25,18 @@ ADD_THIS_TRANSLATOR (Thread_devnull_engraver);
 void
 Thread_devnull_engraver::acknowledge_grob (Grob_info i)
 {
-  /*
-    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
+  SCM s = get_property ("devNullThread");
+#if 0
+  /* No need */
+  if (gh_equal_p (s, ly_symbol2scm ("never")))
+    return;
+#endif
 
-    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")))
+  if (gh_equal_p (s, ly_symbol2scm ("allways"))
+      || (s == SCM_EOL
+	  && daddy_trans_l_->id_str_.left_str (3) == "two"
+	  && (to_boolean (get_property ("unison"))
+	      || to_boolean (get_property ("unisilence")))
+	  && to_boolean (get_property ("soloADue"))))
     i.elem_l_->suicide ();
 }