/*
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
#include "stream-event.hh"
-#include "ly-smobs.icc"
#include "context.hh"
#include "input.hh"
#include "music.hh"
Input *
Stream_event::origin () const
{
- Input *i = unsmob_input (get_property ("origin"));
+ Input *i = Input::unsmob (get_property ("origin"));
return i ? i : &dummy_input_global;
}
void
Stream_event::set_spot (Input *i)
{
- set_property ("origin", make_input (*i));
+ set_property ("origin", i->smobbed_copy ());
}
bool
SCM prop = scm_car (entry);
SCM val = scm_cdr (entry);
- if ((unsmob_pitch (val)
- || (prop == ly_symbol2scm ("element") && unsmob_music (val))
+ if ((Pitch::is_smob (val)
+ || (prop == ly_symbol2scm ("element") && Music::is_smob (val))
|| (prop == ly_symbol2scm ("elements") && scm_is_pair (val))
|| (prop == ly_symbol2scm ("pitch-alist") && scm_is_pair (val)))
&& scm_is_false (scm_assq (prop, mutable_property_alist_)))
SCM
Stream_event::dump (SCM self)
{
- Stream_event *ev = unsmob_stream_event (self);
+ Stream_event *ev = Stream_event::unsmob (self);
// Reversed alists look prettier.
return scm_cons (scm_reverse (ev->immutable_property_alist_),
scm_reverse (ev->mutable_property_alist_));
obj->mutable_property_alist_ = scm_reverse (scm_cdr (data));
return obj->unprotect ();
}
-
-Stream_event *
-unsmob_stream_event (SCM m)
-{
- return dynamic_cast<Stream_event *> (unsmob_prob (m));
-}