#include "input.hh"
#include "international.hh"
#include "warn.hh"
+#include "lily-imports.hh"
-const char Dispatcher::type_p_name_[] = "ly:dispatcher?";
+const char * const Dispatcher::type_p_name_ = "ly:dispatcher?";
Dispatcher::~Dispatcher ()
{
}
SCM
-Dispatcher::mark_smob ()
+Dispatcher::mark_smob () const
{
scm_gc_mark (dispatchers_);
scm_gc_mark (listen_classes_);
}
int
-Dispatcher::print_smob (SCM p, scm_print_state *)
+Dispatcher::print_smob (SCM p, scm_print_state *) const
{
scm_puts ("#<Dispatcher ", p);
- scm_write (scm_call_1 (ly_lily_module_constant ("hash-table->alist"),
- listeners_), p);
+ scm_write (Lily::hash_table_to_alist (listeners_), p);
scm_puts (">", p);
return 1;
}
void
Dispatcher::dispatch (SCM sev)
{
- Stream_event *ev = Stream_event::unsmob (sev);
+ Stream_event *ev = unsmob<Stream_event> (sev);
SCM class_list = ev->get_property ("class");
if (!scm_is_pair (class_list))
{
for (SCM disp = dispatchers_; scm_is_pair (disp); disp = scm_cdr (disp))
{
int priority = scm_to_int (scm_cdar (disp));
- Dispatcher *d = Dispatcher::unsmob (scm_caar (disp));
+ Dispatcher *d = unsmob<Dispatcher> (scm_caar (disp));
d->internal_add_listener (GET_LISTENER (Dispatcher, dispatch).smobbed_copy (),
ev_class, priority);
}
listen_classes_ = scm_cons (ev_class, listen_classes_);
}
SCM entry = scm_cons (scm_from_int (priority), callback);
- list = scm_merge (list, scm_list_1 (entry), ly_lily_module_constant ("car<"));
+ list = scm_merge (list, scm_list_1 (entry), Lily::car_less);
scm_set_cdr_x (handle, list);
}
SCM dummy = scm_cons (SCM_EOL, list);
SCM e = dummy;
while (scm_is_pair (scm_cdr (e)))
- if (*Listener::unsmob (scm_cdadr (e)) == l && first)
+ if (*unsmob<Listener> (scm_cdadr (e)) == l && first)
{
scm_set_cdr_x (e, scm_cddr (e));
first = false;
/* Unregister with all dispatchers. */
for (SCM disp = dispatchers_; scm_is_pair (disp); disp = scm_cdr (disp))
{
- Dispatcher *d = Dispatcher::unsmob (scm_caar (disp));
+ Dispatcher *d = unsmob<Dispatcher> (scm_caar (disp));
d->remove_listener (GET_LISTENER (Dispatcher, dispatch), ev_class);
}
listen_classes_ = scm_delq_x (ev_class, listen_classes_);