Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index 3bb01cac65f62131fcd9a4b5e7089701dc76dad6..391af52b4b70534ad8e49716e37d1fbf496edd4f 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -8,12 +8,10 @@
 
 #include "translator.hh"
 
+#include "warn.hh"
+#include "translator-group.hh"
 #include "context-def.hh"
-#include "dispatcher.hh"
 #include "global-context.hh"
-#include "international.hh"
-#include "translator-group.hh"
-#include "warn.hh"
 
 #include "translator.icc"
 #include "ly-smobs.icc"
@@ -76,12 +74,6 @@ Translator::get_daddy_translator () const
   return daddy_context_->implementation ();
 }
 
-void
-Translator::protect_event (SCM ev)
-{
-  get_daddy_translator ()->protect_event (ev);
-}
-
 SCM
 Translator::internal_get_property (SCM sym) const
 {
@@ -116,85 +108,6 @@ Translator::finalize ()
 {
 }
 
-void
-Translator::connect_to_context (Context *c)
-{
-  for (translator_listener_record *r = get_listener_list (); r; r=r->next_)
-    c->events_below ()->add_listener (r->get_listener_ (this), r->event_class_);
-}
-
-void
-Translator::disconnect_from_context (Context *c)
-{
-  for (translator_listener_record *r = get_listener_list (); r; r=r->next_)
-    c->events_below ()->remove_listener (r->get_listener_ (this), r->event_class_);
-}
-
-static SCM listened_event_class_table;
-void
-ensure_listened_hash ()
-{
-  if (!listened_event_class_table)
-    listened_event_class_table = scm_permanent_object (scm_c_make_hash_table (61));
-}
-
-
-LY_DEFINE (ly_get_listened_event_classes, "ly:get-listened-event-classes",
-          0, 0, 0, (),
-          "Returns a list of all event classes that some translator listens to.")
-{
-  ensure_listened_hash ();
-  return ly_hash_table_keys (listened_event_class_table);
-}
-
-LY_DEFINE (ly_is_listened_event_class, "ly:is-listened-event-class",
-          1, 0, 0, (SCM sym),
-          "Is @var{sym} a listened event class?")
-{
-  ensure_listened_hash ();
-  return scm_hashq_ref (listened_event_class_table, sym, SCM_BOOL_F);
-}
-
-void
-add_listened_event_class (SCM sym)
-{
-  ensure_listened_hash ();
-
-  scm_hashq_set_x (listened_event_class_table, sym, SCM_BOOL_T);
-}
-
-
-/*
-  internally called once, statically, for each translator
-  listener. Connects the name of an event class with a procedure that
-  fetches the corresponding listener.
-
-  The method should only be called from the macro
-  IMPLEMENT_TRANSLATOR_LISTENER.
- */
-void
-Translator::add_translator_listener (translator_listener_record **listener_list,
-                                    translator_listener_record *r,
-                                    Listener (*get_listener) (void *), 
-                                    const char *ev_class)
-{
-  /* ev_class is the C++ identifier name. Convert to scm symbol */
-  string name = string (ev_class);
-  name = replace_all (name, '_', '-');
-  name += "-event";
-  
-  /* It's OK to use scm_gc_protect_object for protection, because r is
-     statically allocated. */
-  // NO it's damn not !!!! --hwn
-  SCM class_sym = scm_str2symbol (name.c_str ());
-  
-  add_listened_event_class (class_sym);
-  r->event_class_ = class_sym;
-  r->get_listener_ = get_listener;
-  r->next_ = *listener_list;
-  *listener_list = r;
-}
-
 /*
   SMOBS
 */
@@ -212,7 +125,7 @@ Translator::get_global_context () const
   return daddy_context_->get_global_context ();
 }
 
-Context *
+Score_context *
 Translator::get_score_context () const
 {
   return daddy_context_->get_score_context ();
@@ -256,7 +169,7 @@ add_acknowledger (Engraver_void_function_engraver_grob_info ptr,
   interface_name = replace_all (interface_name, '_', '-');
   interface_name += "-interface";
 
-  inf.symbol_ = ly_symbol2scm (interface_name.c_str ());
+  inf.symbol_ = scm_gc_protect_object (ly_symbol2scm (interface_name.c_str ()));
   ack_array->push_back (inf);
 }
 
@@ -271,47 +184,6 @@ generic_get_acknowledger (SCM sym, vector<Acknowledge_information> const *ack_ar
   return 0;
 }
 
-Moment
-get_event_length (Stream_event *e)
-{
-  Moment *m = unsmob_moment (e->get_property ("length"));
-  if (m)
-    return *m;
-  else
-    return Moment (0);
-}
-
-/*
-  Helper, used through ASSIGN_EVENT_ONCE to throw warnings for
-  simultaneous events. The helper is only useful in listen_* methods
-  of translators.
-*/
-bool
-internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const char *function)
-{
-  if (*old_ev)
-    {
-      /* extract event class from function name */
-      const char *prefix = "listen_";
-      assert (!strncmp (function, "listen_", strlen (prefix)));
-      function += strlen (prefix);
-      char ev_class[strlen (function) + 1];
-      strcpy (ev_class, function);
-      for (char *c = ev_class; *c; c++)
-       if (*c == '_')
-         *c = '-';
-
-      new_ev->origin ()->warning (_f ("Two simultaneous %s events, junking this one", ev_class));
-      (*old_ev)->origin ()->warning (_f ("Previous %s event here", ev_class));
-      return false;
-    }
-  else
-    {
-      *old_ev = new_ev;
-      return true;
-    }
-}
-
 ADD_TRANSLATOR (Translator,
                "Base class. Unused",
                "",