#include "music-sequence.hh"
#include "score.hh"
#include "warn.hh"
+#include "lily-imports.hh"
/*
Music is anything that has (possibly zero) duration and supports
SCM
Music::copy_mutable_properties () const
{
- return ly_music_deep_copy (mutable_property_alist_);
+ return music_deep_copy (mutable_property_alist_);
}
void
Music::get_length () const
{
SCM lst = get_property ("length");
- if (Moment::is_smob (lst))
- return *Moment::unsmob (lst);
+ if (unsmob<Moment> (lst))
+ return *unsmob<Moment> (lst);
if (ly_is_procedure (length_callback_))
{
SCM res = scm_call_1 (length_callback_, self_scm ());
- return *Moment::unsmob (res);
+ return *unsmob<Moment> (res);
}
return Moment (0);
if (ly_is_procedure (lst))
{
SCM res = scm_call_1 (lst, self_scm ());
- return *Moment::unsmob (res);
+ return *unsmob<Moment> (res);
}
Moment m;
Music::generic_to_relative_octave (Pitch last)
{
SCM elt = get_property ("element");
- Pitch *old_pit = Pitch::unsmob (get_property ("pitch"));
+ Pitch *old_pit = unsmob<Pitch> (get_property ("pitch"));
if (old_pit)
{
Pitch new_pit = *old_pit;
last = new_pit;
}
- if (Music *m = Music::unsmob (elt))
+ if (Music *m = unsmob<Music> (elt))
last = m->to_relative_octave (last);
(void) music_list_to_relative (get_property ("articulations"), last, true);
SCM callback = get_property ("to-relative-callback");
if (ly_is_procedure (callback))
{
- Pitch *p = Pitch::unsmob (scm_call_2 (callback, self_scm (),
+ Pitch *p = unsmob<Pitch> (scm_call_2 (callback, self_scm (),
last.smobbed_copy ()));
return *p;
}
{
SCM elt = get_property ("element");
- if (Music *m = Music::unsmob (elt))
+ if (Music *m = unsmob<Music> (elt))
m->compress (factor);
compress_music_list (get_property ("elements"), factor);
- Duration *d = Duration::unsmob (get_property ("duration"));
+ Duration *d = unsmob<Duration> (get_property ("duration"));
if (d)
set_property ("duration",
d->compressed (factor.main_part_).smobbed_copy ());
/*
This mutates alist. Hence, make sure that it is not shared
*/
+
void
-transpose_mutable (SCM alist, Pitch delta)
+Prob::transpose (Pitch delta)
{
- for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
+ if (to_boolean (get_property ("untransposable")))
+ return;
+
+ for (SCM s = mutable_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);
SCM new_val = val;
- if (Pitch *p = Pitch::unsmob (val))
+ if (Pitch *p = unsmob<Pitch> (val))
{
Pitch transposed = p->transposed (delta);
}
else if (scm_is_eq (prop, ly_symbol2scm ("element")))
{
- if (Music *m = Music::unsmob (val))
+ if (Prob *m = unsmob<Prob> (val))
m->transpose (delta);
}
else if (scm_is_eq (prop, ly_symbol2scm ("elements"))
}
}
-void
-Music::transpose (Pitch delta)
-{
- if (to_boolean (get_property ("untransposable")))
- return;
-
- transpose_mutable (mutable_property_alist_, delta);
-}
-
void
Music::set_spot (Input ip)
{
Input *
Music::origin () const
{
- Input *ip = Input::unsmob (get_property ("origin"));
+ Input *ip = unsmob<Input> (get_property ("origin"));
return ip ? ip : &dummy_input_global;
}
programming_error ("Not a music type");
Stream_event *e = new Stream_event
- (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), class_name),
+ (Lily::ly_make_event_class (class_name),
mutable_property_alist_);
Moment length = get_length ();
if (length.to_bool ())
SCM art_ev = SCM_EOL;
for (; scm_is_pair (art_mus); art_mus = scm_cdr (art_mus))
{
- Music *m = Music::unsmob (scm_car (art_mus));
+ Music *m = unsmob<Music> (scm_car (art_mus));
art_ev = scm_cons (m->to_event ()->unprotect (), art_ev);
}
e->set_property ("articulations", scm_reverse_x (art_ev, SCM_EOL));
Music *
make_music_by_name (SCM sym)
{
- SCM make_music_proc = ly_lily_module_constant ("make-music");
- SCM rv = scm_call_1 (make_music_proc, sym);
+ SCM rv = Lily::make_music (sym);
/* UGH. */
- Music *m = Music::unsmob (rv);
+ Music *m = unsmob<Music> (rv);
m->protect ();
return m;
}
SCM
Music::duration_length_callback (SCM m)
{
- Music *me = Music::unsmob (m);
- Duration *d = Duration::unsmob (me->get_property ("duration"));
+ Music *me = unsmob<Music> (m);
+ Duration *d = unsmob<Duration> (me->get_property ("duration"));
Moment mom;
if (d)
mom = d->get_length ();
return mom.smobbed_copy ();
}
+
+SCM
+music_deep_copy (SCM m)
+{
+ if (Music *mus = unsmob<Music> (m))
+ return mus->clone ()->unprotect ();
+ if (scm_is_pair (m))
+ {
+ SCM copy = SCM_EOL;
+ do
+ {
+ copy = scm_cons (music_deep_copy (scm_car (m)), copy);
+ m = scm_cdr (m);
+ }
+ while (scm_is_pair (m));
+ // Oh, come on, GUILE. Why do you require the second argument
+ // of scm_reverse_x to be a proper list? That makes no sense.
+ // return scm_reverse_x (copy, music_deep_copy (m));
+ SCM last_cons = copy;
+ copy = scm_reverse_x (copy, SCM_EOL);
+ scm_set_cdr_x (last_cons, music_deep_copy (m));
+ return copy;
+ }
+ return m;
+}
+
+void
+set_origin (SCM m, SCM origin)
+{
+ while (scm_is_pair (m))
+ {
+ set_origin (scm_car (m), origin);
+ m = scm_cdr (m);
+ }
+ if (Music *mus = unsmob<Music> (m))
+ mus->set_property ("origin", origin);
+}