X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator.hh;h=67b1e51bb1c23cf9744f9958c788ca1304cbabe6;hb=5ea982187f9aebfe588225813be14c48020452f3;hp=f39b122d8b83c91f9eb48d04517ec84a0a0b08f1;hpb=b6a8afbd0a9a0b36b07c114503d81a7c420e09e7;p=lilypond.git

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index f39b122d8b..67b1e51bb1 100644
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -3,19 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 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
 {
@@ -107,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 ();
 
@@ -124,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