X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator.hh;h=f5065f50b25e3f613bc61bcb107a149b3defd56b;hb=d31248d7770fb5770c2caacfb3547984bf8dcdc3;hp=575a3fc792051ba5af3367590e3bc3209484433a;hpb=e93d8c812c66f040fe997488b4c83e1b89e28e87;p=lilypond.git

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 575a3fc792..f5065f50b2 100644
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -3,24 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TRANSLATOR_HH
 #define TRANSLATOR_HH
 
 #include "global-ctor.hh"
-#include "std-string.hh"
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
-#include "input.hh"
+#include "input.hh"		// for error reporting
 #include "smobs.hh"
 #include "std-vector.hh"
 #include "protected-scm.hh"
 
 struct Acknowledge_information
 {
-  Protected_scm symbol_;
+  SCM symbol_;
   Engraver_void_function_engraver_grob_info function_;
 };
 
@@ -108,7 +107,6 @@ public:
   virtual Translator_group *get_daddy_translator ()const;
   virtual Moment now_mom () const;
 
-  virtual bool try_music (Music *req);
   virtual void initialize ();
   virtual void finalize ();
 
@@ -125,19 +123,34 @@ public:
   Global_context *get_global_context () const;
 
   TRANSLATOR_DECLARATIONS (Translator);
-  DECLARE_SMOBS (Translator, dummy);
+  DECLARE_SMOBS (Translator);
 
 protected:			// should be private.
   Context *daddy_context_;
   void protect_event (SCM ev);
   virtual void derived_mark () const;
   static void add_translator_listener (translator_listener_record **listener_list, translator_listener_record *r, Listener (*get_listener) (void *), const char *ev_class);
+  SCM static_translator_description (const char *grobs, 
+				     const char *desc,
+				     translator_listener_record *listener_list,
+				     const char *read, 
+				     const char *write) const;
 
   friend class Translator_group;
 };
 void add_translator (Translator *trans);
 
 Translator *get_translator (SCM s);
+Moment get_event_length (Stream_event *s, Moment now);
 Moment get_event_length (Stream_event *s);
 DECLARE_UNSMOB (Translator, translator);
+
+
+/*
+  This helper is only meaningful inside listen_* methods.
+*/
+extern bool internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const char *function);
+#define ASSIGN_EVENT_ONCE(o,n) internal_event_assignment (&o, n, __FUNCTION__)
+
+
 #endif // TRANSLATOR_HH