/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Music::get_length () const
{
SCM lst = get_property ("length");
- if (unsmob_moment (lst))
- return *unsmob_moment (lst);
+ if (Moment::unsmob (lst))
+ return *Moment::unsmob (lst);
if (ly_is_procedure (length_callback_))
{
SCM res = scm_call_1 (length_callback_, self_scm ());
- return *unsmob_moment (res);
+ return *Moment::unsmob (res);
}
return Moment (0);
if (ly_is_procedure (lst))
{
SCM res = scm_call_1 (lst, self_scm ());
- return *unsmob_moment (res);
+ return *Moment::unsmob (res);
}
Moment m;
Music::generic_to_relative_octave (Pitch last)
{
SCM elt = get_property ("element");
- Pitch *old_pit = unsmob_pitch (get_property ("pitch"));
+ Pitch *old_pit = Pitch::unsmob (get_property ("pitch"));
if (old_pit)
{
Pitch new_pit = *old_pit;
last = new_pit;
}
- if (Music *m = unsmob_music (elt))
+ if (Music *m = Music::unsmob (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 = unsmob_pitch (scm_call_2 (callback, self_scm (),
+ Pitch *p = Pitch::unsmob (scm_call_2 (callback, self_scm (),
last.smobbed_copy ()));
return *p;
}
{
SCM elt = get_property ("element");
- if (Music *m = unsmob_music (elt))
+ if (Music *m = Music::unsmob (elt))
m->compress (factor);
compress_music_list (get_property ("elements"), factor);
- Duration *d = unsmob_duration (get_property ("duration"));
+ Duration *d = Duration::unsmob (get_property ("duration"));
if (d)
set_property ("duration",
d->compressed (factor.main_part_).smobbed_copy ());
SCM val = scm_cdr (entry);
SCM new_val = val;
- if (Pitch *p = unsmob_pitch (val))
+ if (Pitch *p = Pitch::unsmob (val))
{
Pitch transposed = p->transposed (delta);
- if (transposed.get_alteration ().abs () > Rational (1, 1))
- {
- string delta_str;
- if (delta.get_alteration ().abs () > Rational (1, 1))
- delta_str = (delta.normalized ().to_string ()
- + " " + _ ("(normalized pitch)"));
- else
- delta_str = delta.to_string ();
-
- warning (_f ("Transposing %s by %s makes alteration larger than double",
- p->to_string (),
- delta_str));
- transposed = transposed.normalized ();
- }
+
+ if (prop == ly_symbol2scm ("tonic"))
+ transposed = Pitch (-1, transposed.get_notename (),
+ transposed.get_alteration ());
new_val = transposed.smobbed_copy ();
}
else if (prop == ly_symbol2scm ("element"))
{
- if (Music *m = unsmob_music (val))
+ if (Music *m = Music::unsmob (val))
m->transpose (delta);
}
else if (prop == ly_symbol2scm ("elements")
Input *
Music::origin () const
{
- Input *ip = unsmob_input (get_property ("origin"));
+ Input *ip = Input::unsmob (get_property ("origin"));
return ip ? ip : &dummy_input_global;
}
ES TODO: This method should probably be reworked or junked.
*/
Stream_event *
-Music::to_event (Context *c) const
+Music::to_event () const
{
SCM class_name = ly_camel_case_2_lisp_identifier (get_property ("name"));
if (!internal_is_music_type (class_name))
programming_error ("Not a music type");
- Stream_event *e = new Stream_event (c->make_event_class (class_name),
- mutable_property_alist_);
+ Stream_event *e = new Stream_event
+ (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), class_name),
+ mutable_property_alist_);
Moment length = get_length ();
if (length.to_bool ())
e->set_property ("length", length.smobbed_copy ());
SCM art_ev = SCM_EOL;
for (; scm_is_pair (art_mus); art_mus = scm_cdr (art_mus))
{
- Music *m = unsmob_music (scm_car (art_mus));
- art_ev = scm_cons (m->to_event (c)->unprotect (), art_ev);
+ Music *m = Music::unsmob (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));
}
void
Music::send_to_context (Context *c)
{
- Stream_event *ev = to_event (c);
+ Stream_event *ev = to_event ();
c->event_source ()->broadcast (ev);
ev->unprotect ();
}
SCM rv = scm_call_1 (make_music_proc, sym);
/* UGH. */
- Music *m = unsmob_music (rv);
+ Music *m = Music::unsmob (rv);
m->protect ();
return m;
}
SCM
Music::duration_length_callback (SCM m)
{
- Music *me = unsmob_music (m);
- Duration *d = unsmob_duration (me->get_property ("duration"));
+ Music *me = Music::unsmob (m);
+ Duration *d = Duration::unsmob (me->get_property ("duration"));
Moment mom;
if (d)
}
Music *
-unsmob_music (SCM m)
+Music::unsmob (SCM m)
{
- return dynamic_cast<Music *> (unsmob_prob (m));
+ return dynamic_cast<Music *> (Prob::unsmob (m));
}