/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2011 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 "input.hh"
+#include "music.hh"
+#include "pitch.hh"
/* TODO: Rename Stream_event -> Event */
{
}
-Stream_event::Stream_event (SCM event_class, SCM mutable_props)
+Stream_event::Stream_event (SCM event_class, SCM immutable_props)
: Prob (ly_symbol2scm ("Stream_event"),
- scm_list_1 (scm_cons (ly_symbol2scm ("class"), event_class)))
+ scm_acons (ly_symbol2scm ("class"), event_class, immutable_props))
{
- mutable_property_alist_ = mutable_props;
}
Stream_event::Stream_event (SCM class_name, Input *origin)
: Prob (ly_symbol2scm ("Stream_event"),
- scm_list_1 (scm_cons (ly_symbol2scm ("class"), class_name)))
+ scm_list_1 (scm_cons (ly_symbol2scm ("class"), class_name)))
{
if (origin)
set_spot (origin);
Input *
Stream_event::origin () const
{
- Input *i = unsmob_input (get_property ("origin"));
+ Input *i = unsmob<Input> (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
Stream_event::internal_in_event_class (SCM class_name)
{
SCM cl = get_property ("class");
- cl = scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), cl);
- 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);
MAKE_SCHEME_CALLBACK (Stream_event, dump, 1);
+void
+Stream_event::make_transposable ()
+{
+ /* This is in preparation for transposing stuff
+ that may be defined in the immutable part */
+
+ for (SCM s = immutable_property_alist_; scm_is_pair (s); s = scm_cdr (s))
+ {
+ SCM entry = scm_car (s);
+ SCM prop = scm_car (entry);
+ SCM val = scm_cdr (entry);
+
+ 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, music_deep_copy (val), mutable_property_alist_);
+ }
+}
+
SCM
Stream_event::dump (SCM self)
{
- Stream_event *ev = unsmob_stream_event (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_));
+ scm_reverse (ev->mutable_property_alist_));
}
SCM
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));
-}