/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2014 Erik Sandberg <mandolaerik@gmail.com>
+ Copyright (C) 2005--2015 Erik Sandberg <mandolaerik@gmail.com>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Input *
Stream_event::origin () const
{
- Input *i = Input::unsmob (get_property ("origin"));
+ Input *i = unsmob<Input> (get_property ("origin"));
return i ? i : &dummy_input_global;
}
Stream_event::internal_in_event_class (SCM class_name)
{
SCM cl = get_property ("class");
- return scm_c_memq (class_name, cl) != SCM_BOOL_F;
+ return scm_is_true (scm_c_memq (class_name, cl));
}
MAKE_SCHEME_CALLBACK (Stream_event, undump, 1);
SCM prop = scm_car (entry);
SCM val = scm_cdr (entry);
- if ((Pitch::unsmob (val)
- || (prop == ly_symbol2scm ("element") && Music::unsmob (val))
- || (prop == ly_symbol2scm ("elements") && scm_is_pair (val))
- || (prop == ly_symbol2scm ("pitch-alist") && scm_is_pair (val)))
+ if ((unsmob<Pitch> (val)
+ || (scm_is_eq (prop, ly_symbol2scm ("element")) && unsmob<Music> (val))
+ || (scm_is_eq (prop, ly_symbol2scm ("elements")) && scm_is_pair (val))
+ || (scm_is_eq (prop, ly_symbol2scm ("pitch-alist")) && scm_is_pair (val)))
&& scm_is_false (scm_assq (prop, mutable_property_alist_)))
mutable_property_alist_
- = scm_acons (prop, ly_music_deep_copy (val), mutable_property_alist_);
+ = scm_acons (prop, music_deep_copy (val), mutable_property_alist_);
}
}
SCM
Stream_event::dump (SCM self)
{
- Stream_event *ev = Stream_event::unsmob (self);
+ Stream_event *ev = unsmob<Stream_event> (self);
// Reversed alists look prettier.
return scm_cons (scm_reverse (ev->immutable_property_alist_),
scm_reverse (ev->mutable_property_alist_));