minor cleanups

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index b6ec74a72942e5312ba48d484742e8b5fa1b5b68..cf1439e673f0325bbf9e43a246f39268ef65bb94 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -144,4 +144,13 @@ void add_translator (Translator *trans);
 Translator *get_translator (SCM s);
 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

diff --git a/lily/include/translator.icc b/lily/include/translator.icc
index 6eb9e10405352c0aed4e3e5c0b797b52d3abf7b2..708089b30afcd25809dc96e18cdce178a163bcb5 100644 (file)
--- a/lily/include/translator.icc
+++ b/lily/include/translator.icc
@@ -134,10 +134,4 @@ cl::_listen_scm_ ## m (SCM sev)                            \
   listen_ ## m (ev);                                   \
 }
 
-/*
-  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_ICC */

diff --git a/lily/translator.cc b/lily/translator.cc
index 7e1518bdc10cc267ad44c1a1a402f160dff59a56..b7a46d29b65b20c67aa724b351012b0c18817da3 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -318,10 +318,11 @@ internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const ch
                               new_ev->self_scm ())))
     {
       /* extract event class from function name */
-      const char *prefix = "listen_";
       string ev_class = function;
+
       /* This assertion fails if EVENT_ASSIGNMENT was called outside a
         translator listener. Don't do that. */
+      const char *prefix = "listen_";
       assert (0 == ev_class.find (prefix));
 
       /* "listen_foo_bar" -> "foo-bar" */
@@ -340,7 +341,7 @@ internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const ch
 }
 
 ADD_TRANSLATOR (Translator,
-               "Base class. Unused",
+               "Base class. Not instantiated.",
                "",
                "",
                "");