/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2006--2012 Erik Sandberg <mandolaerik@gmail.com>
+ Copyright (C) 2006--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
1, 0, 0, (SCM obj),
"Is @code{@var{obj}} a @code{Stream_event} object?")
{
- return scm_from_bool (unsmob_stream_event (obj));
+ return scm_from_bool (unsmob<Stream_event> (obj));
}
LY_DEFINE (ly_make_stream_event, "ly:make-stream-event",
"Create a stream event of class @var{cl} with the given"
" mutable property list.")
{
- LY_ASSERT_TYPE (ly_is_symbol, cl, 1);
+ LY_ASSERT_TYPE (ly_is_pair, cl, 1);
/* should be scm_list_p, but scm_list_p is expensive. */
LY_ASSERT_TYPE (scm_is_pair, proplist, 2);
- if (proplist == SCM_UNDEFINED)
+ if (SCM_UNBNDP (proplist))
proplist = SCM_EOL;
Stream_event *e = new Stream_event (cl, proplist);
}
LY_DEFINE (ly_event_property, "ly:event-property",
- 2, 0, 0, (SCM sev, SCM sym),
- "Get the property @var{sym} of stream event @var{mus}."
- " If @var{sym} is undefined, return @code{'()}.")
+ 2, 1, 0, (SCM sev, SCM sym, SCM val),
+ "Get the property @var{sym} of stream event @var{sev}."
+ " If @var{sym} is undefined, return @var{val} or"
+ " @code{'()} if @var{val} is not specified.")
{
- LY_ASSERT_TYPE (unsmob_stream_event, sev, 1);
- LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
-
- Stream_event *e = unsmob_stream_event (sev);
-
- return e->internal_get_property (sym);
+ LY_ASSERT_SMOB (Stream_event, sev, 1);
+ return ly_prob_property (sev, sym, val);
}
LY_DEFINE (ly_event_set_property_x, "ly:event-set-property!",
3, 0, 0, (SCM ev, SCM sym, SCM val),
"Set property @var{sym} in event @var{ev} to @var{val}.")
{
- LY_ASSERT_TYPE (unsmob_stream_event, ev, 1);
+ LY_ASSERT_SMOB (Stream_event, ev, 1);
LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
return ly_prob_set_property_x (ev, sym, val);
"Copy @var{m} and all sub expressions of@tie{}@var{m}.")
{
SCM copy = m;
- if (Stream_event *ev = unsmob_stream_event (m))
+ if (Stream_event *ev = unsmob<Stream_event> (m))
{
ev = ev->clone ();
copy = ev->unprotect ();